Merge pull request #57 from ac-bristol/master

fixed ie 7-8 breaks between li's and tidied oldie code
mrjasonweaver · Aug 10, 2013 · 43dc9ae · 43dc9ae
2 parents 4c3c58a + 0ed3ca1
commit 43dc9ae
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 25 deletions.
diff --git a/css/flexnav.css b/css/flexnav.css
@@ -156,7 +156,7 @@
     top: 0;
     right: auto;
     max-width: 1080px; }
-  .oldie .flexnav li {
+  .oldie .flexnav li { 
     position: relative;
     list-style: none;
     float: left;
@@ -177,6 +177,7 @@
     border-bottom: none;
     overflow: visible; }
   .oldie .flexnav li > ul {
+    background:#acaca1;
     position: absolute;
     top: auto;
     left: 0;
@@ -185,6 +186,9 @@
     overflow: visible; }
   .oldie .flexnav li ul li ul {
     top: 0; }
+   .oldie .flexnav li ul li {
+    padding-bottom: 0;
+    margin-bottom: 0;}
   .oldie .flexnav li ul li a {
     border-bottom: none; }
   .oldie .flexnav li ul.open {

diff --git a/sass/flexnav.scss b/sass/flexnav.scss
@@ -144,11 +144,9 @@ $fourth_level: #cbcbc9;
 	}
 	.flexnav {
 		overflow: visible;
-
-    &.opacity {
-      opacity: 1;
-    }
-
+		&.opacity {
+		  opacity: 1;
+		}
 		&.one-page {
 			top: 0;
 			right: auto;
@@ -191,7 +189,6 @@ $fourth_level: #cbcbc9;
 			opacity: 1;
 			visibility: visible;
 			z-index: 1;
-
 			li {
 				overflow: visible;
 				max-height: 100px;
@@ -213,7 +210,6 @@ $fourth_level: #cbcbc9;
 	}
 	.flexnav {
 		overflow: visible;
-
 		&.one-page {
 			top: 0;
 			right: auto;
@@ -227,13 +223,12 @@ $fourth_level: #cbcbc9;
 			background-color: #a6a6a2;	
 			width: 20%;
 			min-height: 50px;
-      overflow: visible;
+			overflow: visible;
 		}
 		li:hover > ul { 
 			display: block;
-      width: 100%;
-      overflow: visible;
-
+			width: 100%;
+			overflow: visible;
 			li {
 				width: 100%;
 				float: none;
@@ -242,15 +237,16 @@ $fourth_level: #cbcbc9;
 		li a {
 			border-left: 1px solid #acaca1;
 			border-bottom: none;
-      overflow: visible;	
+			overflow: visible;	
 		}
 		li > ul {
+			background:#acaca1;
 			position: absolute; 
 			top: auto;
 			left: 0;
-      display: none;
+			display: none;
 			z-index: 1;
-      overflow: visible;
+			overflow: visible;
 		}
 		li ul li ul { 
 			top: 0;		
@@ -260,19 +256,17 @@ $fourth_level: #cbcbc9;
 		}
 		li ul.open {
 			display: block;
-      width: 100%;
-      overflow: visible;
-
-      li {
-        width: 100%;
-      }
-
+			width: 100%;
+			overflow: visible;
+			li {
+				width: 100%;
+			}
 			ul.open {
 				margin-left: 100%;
 				top: 0;
-  			display: block;
-        width: 100%;
-        overflow: visible;
+  				display: block;
+				width: 100%;
+				overflow: visible;
 			}
 		}
 		ul li:hover ul {