updates to navigation

alisonailea · Feb 25, 2014 · 01f5c36 · 01f5c36
1 parent ff147ea
commit 01f5c36
Show file tree

Hide file tree

Showing 21 changed files with 706 additions and 18 deletions.
diff --git a/.sass-cache/00623f8ee66fed4c267ab4a858be3390d29804a2/Icons.scssc b/.sass-cache/00623f8ee66fed4c267ab4a858be3390d29804a2/Icons.scssc
diff --git a/.sass-cache/00623f8ee66fed4c267ab4a858be3390d29804a2/Layout.scssc b/.sass-cache/00623f8ee66fed4c267ab4a858be3390d29804a2/Layout.scssc
diff --git a/.sass-cache/00623f8ee66fed4c267ab4a858be3390d29804a2/Styles.scssc b/.sass-cache/00623f8ee66fed4c267ab4a858be3390d29804a2/Styles.scssc
diff --git a/.sass-cache/00623f8ee66fed4c267ab4a858be3390d29804a2/Typography.scssc b/.sass-cache/00623f8ee66fed4c267ab4a858be3390d29804a2/Typography.scssc
diff --git a/.sass-cache/00623f8ee66fed4c267ab4a858be3390d29804a2/Variables.scssc b/.sass-cache/00623f8ee66fed4c267ab4a858be3390d29804a2/Variables.scssc
diff --git a/.sass-cache/187faeaa86ecc3109d5ed963446a44b4716e5030/_flex-box.scssc b/.sass-cache/187faeaa86ecc3109d5ed963446a44b4716e5030/_flex-box.scssc
diff --git a/.sass-cache/2ff381e4e70e82b57c158c89cf4d0665c27169c4/app.scssc b/.sass-cache/2ff381e4e70e82b57c158c89cf4d0665c27169c4/app.scssc
diff --git a/.sass-cache/5f7b8ae78d2c50e6cda14f4e5db64d22b5a9abaf/_prefixer.scssc b/.sass-cache/5f7b8ae78d2c50e6cda14f4e5db64d22b5a9abaf/_prefixer.scssc
diff --git a/.sass-cache/839b5745161609a2364547ef6da043ec5c0245d0/_flexbox.scssc b/.sass-cache/839b5745161609a2364547ef6da043ec5c0245d0/_flexbox.scssc
diff --git a/.sass-cache/839b5745161609a2364547ef6da043ec5c0245d0/all.scssc b/.sass-cache/839b5745161609a2364547ef6da043ec5c0245d0/all.scssc
diff --git a/.sass-cache/9b59d8219ef839a9a3f59701b88f5916f3aa887f/_bourbon.scssc b/.sass-cache/9b59d8219ef839a9a3f59701b88f5916f3aa887f/_bourbon.scssc
diff --git a/.sass-cache/b527f58e624de26befd74d10792fe3f452a5ac38/Layout.scssc b/.sass-cache/b527f58e624de26befd74d10792fe3f452a5ac38/Layout.scssc
diff --git a/.sass-cache/b527f58e624de26befd74d10792fe3f452a5ac38/Styles.scssc b/.sass-cache/b527f58e624de26befd74d10792fe3f452a5ac38/Styles.scssc
diff --git a/public/app/app.css b/public/app/app.css
diff --git a/public/css/all.css b/public/css/all.css
@@ -0,0 +1,24 @@
+/*
+Errno::ENOENT: No such file or directory - styleLayout/all.scss
+
+Backtrace:
+/Library/Ruby/Gems/1.8/gems/sass-3.3.0.alpha.149/bin/../lib/sass/plugin/compiler.rb:302:in `read'
+/Library/Ruby/Gems/1.8/gems/sass-3.3.0.alpha.149/bin/../lib/sass/plugin/compiler.rb:302:in `update_stylesheet'
+/Library/Ruby/Gems/1.8/gems/sass-3.3.0.alpha.149/bin/../lib/sass/plugin/compiler.rb:182:in `update_stylesheets'
+/Library/Ruby/Gems/1.8/gems/sass-3.3.0.alpha.149/bin/../lib/sass/plugin/compiler.rb:179:in `each'
+/Library/Ruby/Gems/1.8/gems/sass-3.3.0.alpha.149/bin/../lib/sass/plugin/compiler.rb:179:in `update_stylesheets'
+/Library/Ruby/Gems/1.8/gems/sass-3.3.0.alpha.149/bin/../lib/sass/plugin/compiler.rb:214:in `watch'
+/Library/Ruby/Gems/1.8/gems/sass-3.3.0.alpha.149/bin/../lib/sass/plugin.rb:107:in `send'
+/Library/Ruby/Gems/1.8/gems/sass-3.3.0.alpha.149/bin/../lib/sass/plugin.rb:107:in `method_missing'
+/Library/Ruby/Gems/1.8/gems/sass-3.3.0.alpha.149/bin/../lib/sass/exec.rb:482:in `watch_or_update'
+/Library/Ruby/Gems/1.8/gems/sass-3.3.0.alpha.149/bin/../lib/sass/exec.rb:324:in `process_result'
+/Library/Ruby/Gems/1.8/gems/sass-3.3.0.alpha.149/bin/../lib/sass/exec.rb:41:in `parse'
+/Library/Ruby/Gems/1.8/gems/sass-3.3.0.alpha.149/bin/../lib/sass/exec.rb:21:in `parse!'
+/Library/Ruby/Gems/1.8/gems/sass-3.3.0.alpha.149/bin/scss:9
+/usr/bin/scss:19:in `load'
+/usr/bin/scss:19
+*/
+body:before {
+  white-space: pre;
+  font-family: monospace;
+  content: "Errno::ENOENT: No such file or directory - styleLayout/all.scss"; }
diff --git a/public/css/app.css b/public/css/app.css
diff --git a/public/css/app.css.map b/public/css/app.css.map
diff --git a/public/js/controllers.js b/public/js/controllers.js
@@ -116,6 +116,13 @@ angular.module('myApp.controllers', []).
       /* write logic to add to order JSON here */
     };
 
+    // var headerDivs = document.getElementById('header');
+    // headerDivs.click(activateNav());
+    // var activateNav = function(){
+    //   var nav = this.getAttribute('data-nav');
+    //   document.getElementsByTagName()
+    // }
+
   }).
   /* Logic specific to the Home page. */
   controller('HomeCtrl', function ($scope) {

diff --git a/styleLayout/global/Layout.scss b/styleLayout/global/Layout.scss
@@ -45,8 +45,7 @@ h2 {
     width: 100%; /* needed for Firefox */
     min-height: 620px;
     & > div {
-       @include flex(1);
-        width: 100%; 
+       width: 100%; 
     }
 }
 
@@ -55,7 +54,7 @@ h2 {
     @include flex-direction(row);
     @include align-items(stretch);
     @include justify-content(space-between);
-    max-height: 8%;
+    height: 8%;
 
     & > div {
         @include flex(1);
@@ -72,7 +71,9 @@ h2 {
             padding: 0 15px;   
         }
         &:active, &:hover{
-            color: red;
+            ul {
+                visibility: visible;
+            }
         }
     }
     & > div:first-child > div{
@@ -87,7 +88,16 @@ h2 {
     }
 }
 
+ul.nav{
+    position: absolute;
+    top: 8%;
+    left: 0;
+    width: 100%;
+    height: 100%;
+}
+
 .app-content{
+    @include flex(1);
     @include display(flex); 
     @include flex-direction(column);
     @include align-items(center);

diff --git a/styleLayout/global/Styles.scss b/styleLayout/global/Styles.scss
@@ -35,6 +35,9 @@ body {
        text-align: right;
        font-size: 18px;
     }
+    ul{
+        background: rgba($background-dark, .7);
+    }
 }
 
 .app-content{

diff --git a/views/index.html b/views/index.html
@@ -8,15 +8,15 @@
 		<meta name="description" content="">
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <link rel="stylesheet" href="css/normalize.css">
-        <!-- <link rel="stylesheet" href="//code.jquery.com/mobile/1.4.0/jquery.mobile-1.4.0.min.css"> -->
+        <link rel="stylesheet" href="//code.jquery.com/mobile/1.4.0/jquery.mobile-1.4.0.min.css">
 		<link rel="stylesheet" href="css/app.css">
 	</head>
 	<body>
 		<div ng-controller="AppCtrl" class="app">
 			<div class="header Grid">
 				<div class="order Grid-cell">
 		       		<div class="order"><span class="icon-text2"></span></div>
-					<ul>
+					<ul class="nav">
 						<li><h3>Your Order</h3></li>
 					    <li ng-repeat='item in orderItems'>
 			       			{{item.name}} {{item.cost}} {{item.quantity}}
@@ -32,7 +32,7 @@
 					<div class="pageName">
 						<span ng-class="getIcon()"></span> {{pageName}}
 					</div>
-					<ul class="menu">
+					<ul class="nav">
 		 				<li ng-repeat='link in linkList'><a href="{{link.location}}">{{link.name}}</a></li>
 						<li ng-if="pageName !== Home"><span class="icon-home"></span><a href="home">Home</a></li>
 						<li><a href="reviewOrder">Place Your Order</a></li>