fixed up the nav

dmd-web-and-mobile · Nov 17, 2016 · 539d236 · 539d236
1 parent b92e869
commit 539d236
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 38 deletions.
diff --git a/app/root/_footer.kit b/app/root/_footer.kit
@@ -1,5 +1,6 @@
+<!-- Footer goes here -->
 <footer>
-  <a href="competitions.html">Competitions</a>
-  <h4>Flash</h4>
-  <a href="community.html">Community</a>
+  <a href="competitions.html">Contact</a>
+  <h4>F2E</h4>
+  <a href="community.html">Legal Crap</a>
 </footer>
diff --git a/app/root/_nav.kit b/app/root/_nav.kit
@@ -1,9 +1,9 @@
-<div class="nav-main signedIn">
+<div class="nav-main">
 
   <div class="left-nav">
     <!-- Logo -->
-    <i class="material-icons">flash_on</i>
-    <h4 class="logo">Flash</h4>
+    <i class="material-icons">local_pizza</i>
+    <h4 class="logo">F2E</h4>
   </div>
 
 
@@ -19,12 +19,7 @@
 
     <!-- Sign in/up Buttons -->
     <a class="waves-effect waves-light btn blue">Sign in</a>
-    <a class="waves-effect waves-light btn">Sign up</a>
-
-    <!-- Profile Pic -->
-    <a data-activates="slide-out" class="profile-btn">
-      <img class="z-depth-2" src="assets/img/gabe.jpg" width="80"/>
-    </a>
+    <a class="waves-effect waves-light btn">Sign out</a>
   </div>
 
 </div>

diff --git 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
@@ -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
@@ -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
@@ -30,12 +30,12 @@
 <body>
 
 
-<div class="nav-main signedIn">
+<div class="nav-main">
 
   <div class="left-nav">
     <!-- Logo -->
-    <i class="material-icons">flash_on</i>
-    <h4 class="logo">Flash</h4>
+    <i class="material-icons">local_pizza</i>
+    <h4 class="logo">F2E</h4>
   </div>
 
 
@@ -51,12 +51,7 @@ <h4 class="logo">Flash</h4>
 
     <!-- Sign in/up Buttons -->
     <a class="waves-effect waves-light btn blue">Sign in</a>
-    <a class="waves-effect waves-light btn">Sign up</a>
-
-    <!-- Profile Pic -->
-    <a data-activates="slide-out" class="profile-btn">
-      <img class="z-depth-2" src="assets/img/gabe.jpg" width="80"/>
-    </a>
+    <a class="waves-effect waves-light btn">Sign out</a>
   </div>
 
 </div>
@@ -109,10 +104,11 @@ <h4 class="logo">Flash</h4>
   });
 </script>
 <ng-view></ng-view>
+<!-- Footer goes here -->
 <footer>
-  <a href="competitions.html">Competitions</a>
-  <h4>Flash</h4>
-  <a href="community.html">Community</a>
+  <a href="competitions.html">Contact</a>
+  <h4>F2E</h4>
+  <a href="community.html">Legal Crap</a>
 </footer>