Move more FixMyStreet-only CSS images out of shared layout styles.

4 files changed, 27 insertions, 27 deletions

diff --git a/web/cobrands/default/layout.scss b/web/cobrands/default/layout.scss
index e1af72734..0365e4539 100644
--- a/web/cobrands/default/layout.scss
+++ b/web/cobrands/default/layout.scss
@@ -12,12 +12,6 @@ body {
     background: #6688ff;
 }
 
-.nav-wrapper {
-    .nav-wrapper-2 {
-        border-top: 4px solid $primary;
-        @include border-image(none);
-    }
-}
 body.mappage {
     .nav-wrapper {
         .nav-wrapper-2 {
@@ -40,9 +34,6 @@ body.mappage {
                 }
             }
         }
-        &#mysoc-menu {
-            background: $primary;
-        }
     }
 }
 
diff --git a/web/cobrands/fixmybarangay/layout.scss b/web/cobrands/fixmybarangay/layout.scss
index 722ec14a1..2d6b91001 100644
--- a/web/cobrands/fixmybarangay/layout.scss
+++ b/web/cobrands/fixmybarangay/layout.scss
@@ -51,16 +51,9 @@ body {
 	}
 }
 
-.nav-wrapper {
-    .nav-wrapper-2 {
-        border-top: solid 4px $primary;
-        @include border-image(none);
-    }
-}
 #main-nav {
     ul {
         &#mysoc-menu {
-            background:$primary;
             padding: 1px 0.5em;
         }
         &#main-menu{
diff --git a/web/cobrands/fixmystreet/_layout.scss b/web/cobrands/fixmystreet/_layout.scss
index 2765c4ce7..c0271062e 100644
--- a/web/cobrands/fixmystreet/_layout.scss
+++ b/web/cobrands/fixmystreet/_layout.scss
@@ -10,7 +10,8 @@
 }
 
 body {
-  background: #1A1A1A url(/cobrands/fixmystreet/images/tile.jpg) 0 0 repeat;
+    background: #1A1A1A;
+    color: #fff;
 }
 
 h1 {
@@ -54,17 +55,16 @@ h1 {
   }
 }
 
-.nav-wrapper{
+.nav-wrapper {
   display: table-caption;
-  .nav-wrapper-2{
+  .nav-wrapper-2 {
     width: 100%;
     min-height: 4em;
     position: absolute;
-    border-top:4px solid #1a1a1a;
-    @include border-image(url(/cobrands/fixmystreet/images/tile-y-border.jpg) 4 0 0 0);
-    border-left:0;
-    border-right:0;
-    z-index:2;
+    border-top: 4px solid $primary;
+    border-left: 0;
+    border-right: 0;
+    z-index: 2;
   }
 }
 
@@ -151,7 +151,6 @@ h1 {
           background: $primary;
           padding:0.25em;
           margin:0.5em;
-          color:#333;
           @include border-radius(0.25em);
           &:hover {
             background:$primary/1.1;
@@ -165,12 +164,12 @@ h1 {
     &#mysoc-menu{
       padding: 0em 0.5em;
       margin-left: 0.25em;
-      background:$primary url(/cobrands/fixmystreet/images/tile-y.jpg);
+      background: $primary;
       @include border-radius(0 0 0.375em 0.375em);
       li{
         a{
           background:none;
-          color:#000;
+          color: $primary_text;
           text-transform: uppercase;
           font-size: 0.6875em;
           padding: 1.3em 0.7em 1em 0.7em;
@@ -205,6 +204,7 @@ h1 {
   margin-left: 0.5em;
   padding: 1em 1em 10em;
   background: #fff;
+  color: #222;
   @include box-shadow(0px 0px 6px 1px #000);
 }
 .ie6, .ie7, .ie8  {
diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss
index 718f43da7..a20a4b889 100644
--- a/web/cobrands/fixmystreet/layout.scss
+++ b/web/cobrands/fixmystreet/layout.scss
@@ -66,8 +66,24 @@ h3, h4 {
 @import "_colours";
 @import "_layout";
 
+// Tiled main body background
+body {
+    background: #1A1A1A url(/cobrands/fixmystreet/images/tile.jpg) 0 0 repeat;
+    color: #fff;
+}
+
 // Tiled background stripe, not plain colour
 #front-main {
     background: $primary url(/cobrands/fixmystreet/images/tile-y.jpg);
 }
+#main-nav {
+    ul#mysoc-menu {
+        background: $primary url(/cobrands/fixmystreet/images/tile-y.jpg);
+    }
+}
+.nav-wrapper {
+    .nav-wrapper-2 {
+        @include border-image(url(/cobrands/fixmystreet/images/tile-y-border.jpg) 4 0 0 0);
+    }
+}