Merge remote-tracking branch 'origin/stevenage' into stevenage

3 files changed, 44 insertions, 18 deletions

diff --git a/web/cobrands/stevenage/_council_header.scss b/web/cobrands/stevenage/_council_header.scss
index f1942a818..a33d07dd4 100644
--- a/web/cobrands/stevenage/_council_header.scss
+++ b/web/cobrands/stevenage/_council_header.scss
@@ -15,6 +15,7 @@
     /*    2.stv- =BasicSetup and general styles
     --------------------------------------------------*/
 #stevenage_cc_header {
+    display: block;
     z-index: 2;
     margin: 0;
     padding: 0;
@@ -730,8 +731,14 @@
       }
     
 }
+.ie8{
+  #stv-header #stv-pageTools #stv-searchStatic{
+    width: 50%;
+  }
+}
 
-
+/*
+// Small council Header 
 body.mappage{
   #stevenage_cc_header{
     #stv-header .stv-parf {
@@ -751,4 +758,5 @@ body.mappage{
       z-index: auto;
     }
   }
-}
\ No newline at end of file
+}
+*/
\ No newline at end of file
diff --git a/web/cobrands/stevenage/_fmsbase.scss b/web/cobrands/stevenage/_fmsbase.scss
index 3221301c6..79481250d 100644
--- a/web/cobrands/stevenage/_fmsbase.scss
+++ b/web/cobrands/stevenage/_fmsbase.scss
@@ -523,7 +523,7 @@ p.label-valid {
 #user-meta {
   p {
     position: relative;
-    color: $primary_text;
+    color: #fff;
     background: $primary;
     padding:1em 6em 1em 1em;
     a {
diff --git a/web/cobrands/stevenage/_layout.scss b/web/cobrands/stevenage/_layout.scss
index 598f7bae2..5b2123280 100644
--- a/web/cobrands/stevenage/_layout.scss
+++ b/web/cobrands/stevenage/_layout.scss
@@ -60,7 +60,7 @@ h1 {
     width: 100%;
     min-height: min-intrinsic;
     position: absolute;
-    top:158px;
+    top:9.5em;
     border-top: none;
     border-left:0;
     border-right:0;
@@ -78,6 +78,10 @@ h1 {
 
 //position absolute the menu as ie doesn't like display:table
 .ie6, .ie7 {
+  #stevenage_cc_header {
+    position:absolute;
+    top:0;
+  }
   .nav-wrapper {
     position: absolute;
     top:0;
@@ -85,7 +89,7 @@ h1 {
     width:100%;
     .nav-wrapper-2 {
       // position static as well so we fix lots of the z-index issues
-      position:static;
+      //position:static;
     }
   }   
 }
@@ -151,7 +155,7 @@ h1 {
       li{
         a, span{
           padding: 0.5em 0.75em;
-          font-size: 0.9em;
+          font-size: 0.8em;
           margin: 0;
           @include border-radius(0.25em);
         }
@@ -161,9 +165,10 @@ h1 {
         a.report-a-problem-btn {
           color: $primary_text;
           background: $primary;
-          padding:0.25em;
-          margin:0.5em;
+          padding:0.5em 0.75em;
+          margin:0;
           margin-bottom: 0;
+          margin-left: 0.25em;
           color:#fff;
           @include border-radius(0.25em);
           &:hover {
@@ -224,7 +229,7 @@ h1 {
 .ie6, .ie7, .ie8  {
   .content {
     // If no box-shadow, just want a boring black border to stand it out from the map.
-    border: 1px solid #666;
+    //border: 1px solid #666;
     //take off margins so we line up properly
     margin: 0 0 0 0.5em;
   }
@@ -240,7 +245,7 @@ body.mappage {
   }
   .content {
     float:left;
-    margin-top: 6em;
+    margin-top: 9em;
   }
 /*
   #main-nav ul#main-menu li a,
@@ -254,8 +259,13 @@ body.mappage {
 */
   .nav-wrapper{
     .nav-wrapper-2{
-      position: fixed;
-      top:92px;
+      position: absolute;
+      top: 11em;
+      bottom: auto;
+      left: 0.5em;
+      width: 29em;
+      padding-top: 0.15em;
+      z-index: 0;
     }
     
   }
@@ -266,7 +276,11 @@ body.mappage {
 .ie6, .ie7 {
   body.mappage {
   #stevenage_cc_header {
-        position:static;
+        position:absolute;
+        top:0;
+      }
+      .content{
+        margin-top:6em; 
       }
     // The below is *mandatory* to allow pins/zoom to be clickable in IE6/7. Do NOT remove.
     .container {
@@ -277,7 +291,7 @@ body.mappage {
     .nav-wrapper{
       z-index:1;
       .nav-wrapper-2 {
-        position:static;
+        //position:static;
       }
     }
     #site-logo {
@@ -291,13 +305,14 @@ body.mappage {
 .ie8 {
   body.mappage {
   #stevenage_cc_header{
-        position:static;
+        position:absolute;
+        top:0;
       }
     .nav-wrapper{
       position: relative;
       z-index:0;
       .nav-wrapper-2{
-        position:static;
+        position:absolute;
       }
       
     }
@@ -739,7 +754,7 @@ textarea.form-error {
   position:absolute;
   z-index:-1;//push behind .content, .container resets z-index for this
   left:29.5em;
-  top:5em;
+  top:9em;
   width:15em;
   @include box-shadow(rgba(0, 0, 0, 0.6) 0px 0px 4px 1px);
   .sidebar-tips {
@@ -815,7 +830,7 @@ body.frontpage {
     p {
       top:-4em;
       right:0;
-      color:$primary;
+      color: #fff;
       background:none;
       @include box-shadow(rgba(0, 0, 0, 0) 0 0 0);
       a {
@@ -946,6 +961,9 @@ body.frontpage {
   }
 }
 .ie6, .ie7 {
+  #front-main {
+    margin-top: 5.5em;
+  }
   #front_stats {
     div {
       width:8em;