Merge branch 'fiksgatami-dev' into fiksgatami-prod

Oppgrader prod til 1.7

1 files changed, 29 insertions, 33 deletions

diff --git a/web/cobrands/stevenage/layout.scss b/web/cobrands/stevenage/layout.scss
index b6f154298..17ef6a4c3 100644
--- a/web/cobrands/stevenage/layout.scss
+++ b/web/cobrands/stevenage/layout.scss
@@ -37,42 +37,36 @@
 }
 
 // d523b431
-#main-nav {
-    ul {
-        float: none;
-        li {
-            a, span {
-                margin: 0;
-                margin-right: 2px;
-                font-family: 'PTSansRegular', "PT Sans", Verdana, Arial, sans-serif;
-            }
-        }
-        &#main-menu {
-            li {
-                a, span {
-                    padding: 0.5em 0.75em;
-                    font-size: 0.8em;
-                    margin: 0;
-                    @include border-radius(0.25em);
-                }
-                a.report-a-problem-btn {
-                    padding:0.5em 0.75em;
-                    margin:0;
-                    margin-left: 0.25em;
-                    color:#fff;
-                }
-                span {
-                    color: #fff;
-                    background-color: #066539;
-                }
-            }
-        }
+.nav-menu {
+    float: none;
+}
+.nav-menu a, .nav-menu span {
+    margin: 0;
+    margin-right: 2px;
+    font-family: 'PTSansRegular', "PT Sans", Verdana, Arial, sans-serif;
+}
+.nav-menu--main {
+    a, span {
+        padding: 0.5em 0.75em;
+        font-size: 0.8em;
+        margin: 0;
+        @include border-radius(0.25em);
+    }
+    a.report-a-problem-btn {
+        padding:0.5em 0.75em;
+        margin:0;
+        margin-left: 0.25em;
+        color:#fff;
+    }
+    span {
+        color: #fff;
+        background-color: #066539;
     }
 }
 
 // 452ce6a0 - "Added IE6/7 position change to front page header too" -
 // turned off border for ie6-8 .content - why, as box-shadow still on?
-.ie6, .ie7, .ie8  {
+.iel8 {
     .content {
         border: none;
     }
@@ -88,10 +82,10 @@ body.mappage {
         margin-top: 9em;
     }
     // 15591af7 - Stevenage Map page changes
-    #main-nav ul#main-menu li a, #main-nav ul#main-menu li span {
+    .nav-menu--main a, .nav-menu--main span {
         padding: 0.5em 0.75em;
     }
-    #main-nav ul#main-menu li a.report-a-problem-btn {
+    .nav-menu--main a.report-a-problem-btn {
         padding: 0.5em 0.75em;
         margin: 0 0 0 0.25em;
     }
@@ -228,7 +222,9 @@ body.frontpage {
     // d523b431
     #main-nav {
         float: left;
+        padding-left: 0;
     }
+
     .nav-wrapper {
         .nav-wrapper-2 {
             @include background(linear-gradient(#222, #555 30%, #555 60%, #222));