diff --git a/app/root/_footer.kit b/app/root/_footer.kit index 609d5f8..84777ec 100644 --- a/app/root/_footer.kit +++ b/app/root/_footer.kit @@ -1,5 +1,6 @@ + diff --git a/app/root/_nav.kit b/app/root/_nav.kit index 3c3f200..f9c6138 100644 --- a/app/root/_nav.kit +++ b/app/root/_nav.kit @@ -1,9 +1,9 @@ -
+
- flash_on - + local_pizza +
@@ -19,12 +19,7 @@ Sign in - Sign up - - - - - + Sign out
diff --git a/app/root/root.styl b/app/root/root.styl index 7b019be..5f0b8cb 100644 --- a/app/root/root.styl +++ b/app/root/root.styl @@ -14,7 +14,7 @@ Table of Contents: display: flex justify-content: space-between color: white - position: fixed + // position: fixed top: 0 height: navh = 4.5em width: 100% @@ -28,7 +28,8 @@ Table of Contents: align-items: center * {display: inline} i - font-size: 6rem + font-size: 3.5rem + margin: 0 .15em 0 .1em h4 font-size: 2.6rem font-weight: 500 @@ -57,7 +58,7 @@ Table of Contents: .tabs height: auto .tab - min-width: 80px // temporary + // min-width: 80px // temporary height: navh line-height: navh .indicator diff --git a/assets/css/main.css b/assets/css/main.css index 21f8d3c..ad11d42 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -28,7 +28,6 @@ ul.tabs .tab a:hover { display: flex; justify-content: space-between; color: #fff; - position: fixed; top: 0; height: 4.5em; width: 100%; @@ -44,7 +43,8 @@ ul.tabs .tab a:hover { display: inline; } .nav-main .left-nav i { - font-size: 6rem; + font-size: 3.5rem; + margin: 0 0.15em 0 0.1em; } .nav-main .left-nav h4 { font-size: 2.6rem; @@ -78,7 +78,6 @@ ul.tabs .tab a:hover { height: auto; } .nav-main .tabs .tab { - min-width: 80px; height: 4.5em; line-height: 4.5em; } diff --git a/assets/js/bundle.js b/assets/js/bundle.js index 15eff6c..c785237 100644 --- a/assets/js/bundle.js +++ b/assets/js/bundle.js @@ -94,20 +94,20 @@ app.controller('404Ctrl', ['$scope', function ($scope) { }]); -app.controller('FoodCtrl', ['$scope', function ($scope) { - $scope.page.title = 'Food'; - $scope.page.id = 'food'; +app.controller('CategoryCtrl', ['$scope', function ($scope) { + $scope.page.title = 'Categories'; + $scope.page.id = 'cat'; $scope.page.yourVar = "globalStuff"; - + $scope.var2 = "localStuff"; }]); -app.controller('CategoryCtrl', ['$scope', function ($scope) { - $scope.page.title = 'Categories'; - $scope.page.id = 'cat'; +app.controller('FoodCtrl', ['$scope', function ($scope) { + $scope.page.title = 'Food'; + $scope.page.id = 'food'; $scope.page.yourVar = "globalStuff"; - + $scope.var2 = "localStuff"; }]); diff --git a/index.html b/index.html index efb6fb2..e6ba902 100644 --- a/index.html +++ b/index.html @@ -30,12 +30,12 @@ -
+
- flash_on - + local_pizza +
@@ -51,12 +51,7 @@ Sign in - Sign up - - - - - + Sign out
@@ -109,10 +104,11 @@ }); +