Merge branch 'csssss-part-i'

20 files changed, 75 insertions, 138 deletions

diff --git a/templates/web/angus/footer.html b/templates/web/angus/footer.html
index ec91aaa71..84ab05b35 100644
--- a/templates/web/angus/footer.html
+++ b/templates/web/angus/footer.html
@@ -4,7 +4,7 @@
 
         <div class="nav-wrapper">
             <div class="nav-wrapper-2">
-                [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area hide_mysoc_link=1 %]
+                [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area %]
             </div>
         </div>
     </div> <!-- .wrapper -->
diff --git a/templates/web/angus/post_header_extra.html b/templates/web/angus/post_header_extra.html
index 43ba8af92..81673aae5 100644
--- a/templates/web/angus/post_header_extra.html
+++ b/templates/web/angus/post_header_extra.html
@@ -9,6 +9,6 @@
 
 <div class="wrapper wrapper__main_menu">
   <div class="container">
-    [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area hide_mysoc_link=1 ul_class="nav-menu nav-menu--breadcrumb" omit_wrapper=1 %]
+    [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area ul_class="nav-menu nav-menu--breadcrumb" omit_wrapper=1 %]
   </div>
 </div>
diff --git a/templates/web/base/main_nav.html b/templates/web/base/main_nav.html
index 31bd61af5..b8a3165a4 100644
--- a/templates/web/base/main_nav.html
+++ b/templates/web/base/main_nav.html
@@ -20,12 +20,6 @@
     <div id="main-nav" role="navigation">
 [% END %]
 
-    [% UNLESS hide_mysoc_link %]
-        <ul class="nav-menu nav-menu--mysoc">
-            <li><a id="mysoc-logo" href="https://www.mysociety.org/">mySociety</a></li>
-        </ul>
-    [% END %]
-
     <ul class="[% ul_class %]"[% " id='" _ ul_id _ "'" IF ul_id %]>
         [% INCLUDE 'main_nav_items.html' %]
     </ul>
diff --git a/templates/web/bristol/footer.html b/templates/web/bristol/footer.html
index 52f2d50df..57814b01a 100644
--- a/templates/web/bristol/footer.html
+++ b/templates/web/bristol/footer.html
@@ -4,7 +4,7 @@
 
         <div class="nav-wrapper">
             <div class="nav-wrapper-2">
-                [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area hide_mysoc_link=1 %]
+                [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area %]
             </div>
         </div>
     </div> <!-- .wrapper -->
diff --git a/templates/web/bromley/footer.html b/templates/web/bromley/footer.html
index f9b844ce5..b5247bb9e 100644
--- a/templates/web/bromley/footer.html
+++ b/templates/web/bromley/footer.html
@@ -9,7 +9,7 @@
 
         <div class="nav-wrapper">
             <div class="nav-wrapper-2">
-                [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area hide_mysoc_link=1 hide_privacy_link=1 %]
+                [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area hide_privacy_link=1 %]
             </div>
         </div>
     </div> <!-- .wrapper -->
diff --git a/templates/web/eastherts/footer.html b/templates/web/eastherts/footer.html
index fb39c29c2..7a40acd42 100644
--- a/templates/web/eastherts/footer.html
+++ b/templates/web/eastherts/footer.html
@@ -4,7 +4,7 @@
 
         <div class="nav-wrapper">
             <div class="nav-wrapper-2">
-                [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area hide_mysoc_link=1 %]
+                [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area %]
             </div>
         </div>
     </div> <!-- .wrapper -->
diff --git a/templates/web/greenwich/footer.html b/templates/web/greenwich/footer.html
index 03dbc0330..0534054cb 100644
--- a/templates/web/greenwich/footer.html
+++ b/templates/web/greenwich/footer.html
@@ -9,7 +9,7 @@
 
         <div class="nav-wrapper">
             <div class="nav-wrapper-2">
-                [% INCLUDE "main_nav.html" body_name=c.cobrand.council_name hide_mysoc_link=1 %]
+                [% INCLUDE "main_nav.html" body_name=c.cobrand.council_name %]
             </div>
         </div>
     </div> <!-- .wrapper -->
diff --git a/templates/web/greenwich/header_logo.html b/templates/web/greenwich/header_logo.html
index 6359eba3b..cfe485af1 100644
--- a/templates/web/greenwich/header_logo.html
+++ b/templates/web/greenwich/header_logo.html
@@ -15,4 +15,4 @@
         <li><a href="/">FixMyStreet</a></li>
     </ul>
 
-    [% INCLUDE "main_nav.html" body_name=c.cobrand.council_name hide_mysoc_link=1 hide_privacy_link=1 ul_id="fms-menu-desktop" ul_class="" omit_wrapper=1 %]
+    [% INCLUDE "main_nav.html" body_name=c.cobrand.council_name hide_privacy_link=1 ul_id="fms-menu-desktop" ul_class="" omit_wrapper=1 %]
diff --git a/templates/web/hart/footer.html b/templates/web/hart/footer.html
index e759e15a2..d3dd77640 100644
--- a/templates/web/hart/footer.html
+++ b/templates/web/hart/footer.html
@@ -7,7 +7,7 @@
     <div class="nav-wrapper clearfix">
         <div class="main-menu-wrapper">
             <div class="main-menu">
-              [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area hide_mysoc_link=1 ul_class="clearfix" hide_privacy_link=1 %]
+              [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area ul_class="clearfix" hide_privacy_link=1 %]
             </div>
         </div>
         <div class="nav-wrapper-2 clearfix">
diff --git a/templates/web/oxfordshire/footer.html b/templates/web/oxfordshire/footer.html
index dd90cab01..bc9494b13 100644
--- a/templates/web/oxfordshire/footer.html
+++ b/templates/web/oxfordshire/footer.html
@@ -10,11 +10,10 @@
         <div class="nav-wrapper">
             <div class="nav-wrapper-2">
                 <div id="main-nav" role="navigation">
-                    <ul class="nav-menu nav-menu--mysoc">
+                    [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area omit_wrapper=1 hide_privacy_link=1 %]
+                    <ul class="nav-menu">
                         <li><a id="mysoc-logo" href="https://www.fixmystreet.com/about/council">Powered by <img src="/cobrands/oxfordshire/images/fms-logo-105x20.png" alt="FixMyStreet"></a></li>
                     </ul>
-
-                    [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area hide_mysoc_link=1 omit_wrapper=1 hide_privacy_link=1 %]
                 </div>
             </div>
         </div>
diff --git a/templates/web/oxfordshire/header.html b/templates/web/oxfordshire/header.html
index 452a71e88..492a29bb7 100644
--- a/templates/web/oxfordshire/header.html
+++ b/templates/web/oxfordshire/header.html
@@ -37,7 +37,7 @@
         <div id="navigation">
             <div class="menubar">
                 <div class="menu-inner">
-                    [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area hide_mysoc_link=1 hide_privacy_link=1 omit_wrapper=1 ul_class="menu" %]
+                    [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area hide_privacy_link=1 omit_wrapper=1 ul_class="menu" %]
                 </div>
             </div>
         </div>
diff --git a/templates/web/stevenage/footer.html b/templates/web/stevenage/footer.html
index e8551fecb..d225f13b8 100644
--- a/templates/web/stevenage/footer.html
+++ b/templates/web/stevenage/footer.html
@@ -89,7 +89,7 @@
 
 
             <div class="nav-wrapper-2">
-                [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area hide_mysoc_link=1 hide_privacy_link=1 %]
+                [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area hide_privacy_link=1 %]
             </div>
         </div>
     </div> <!-- .wrapper -->
diff --git a/templates/web/warwickshire/header.html b/templates/web/warwickshire/header.html
index 583606ef8..52eb4f0e8 100644
--- a/templates/web/warwickshire/header.html
+++ b/templates/web/warwickshire/header.html
@@ -172,7 +172,7 @@
         <div class="container navbar-container">
             <div class="navbar" id="mega-menu-navbar">
                 <div class="navbar-inner">
-                    [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area hide_mysoc_link=1 hide_all_reports_link=1 omit_wrapper=1 ul_class="menu nav" ul_id="mega-menu" %]
+                    [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area hide_all_reports_link=1 omit_wrapper=1 ul_class="menu nav" ul_id="mega-menu" %]
                 </div>
             </div>
         </div>
diff --git a/web/cobrands/angus/base.scss b/web/cobrands/angus/base.scss
index 31ba13a11..0d44ed205 100644
--- a/web/cobrands/angus/base.scss
+++ b/web/cobrands/angus/base.scss
@@ -36,11 +36,6 @@ label[for=pc] {
     color: $nav_fg;
 }
 
-
-.nav-menu--mysoc {
-  display: none;
-}
-
 .angus_nav, .wrapper__main_menu {
   display: none;
 }
diff --git a/web/cobrands/fiksgatami/base.scss b/web/cobrands/fiksgatami/base.scss
index 84784d552..7af473460 100644
--- a/web/cobrands/fiksgatami/base.scss
+++ b/web/cobrands/fiksgatami/base.scss
@@ -4,3 +4,10 @@
 
 @import "../sass/base";
 
+
+.nav-menu--mysoc {
+  a {
+    color: $primary_text;
+    background-color: $primary;
+  }
+}
diff --git a/web/cobrands/fiksgatami/layout.scss b/web/cobrands/fiksgatami/layout.scss
index 69e455aa5..c3c36fa12 100644
--- a/web/cobrands/fiksgatami/layout.scss
+++ b/web/cobrands/fiksgatami/layout.scss
@@ -1,2 +1,29 @@
 @import "_colours";
 @import "../sass/layout";
+
+.nav-menu--mysoc {
+  padding: 0em 0.5em;
+  margin-#{$left}: 0.25em;
+  background-color: $primary;
+  @include border-radius(0 0 0.375em 0.375em);
+  a {
+    background-color: transparent;
+    color: $primary_text;
+    text-transform: uppercase;
+    font-size: 0.6875em;
+    padding: 1.3em 0.7em 1em;
+    &:hover {
+      color: #fff;
+      background-color: transparent;
+    }
+  }
+}
+
+body.frontpage {
+  #site-logo {
+    top: 3em;
+    width: 300px;
+    height: 60px;
+    background: url($image-sprite) -2px -108px no-repeat;
+  }
+}
diff --git a/web/cobrands/fixamingata/layout.scss b/web/cobrands/fixamingata/layout.scss
index bd1cab41a..555e2641b 100644
--- a/web/cobrands/fixamingata/layout.scss
+++ b/web/cobrands/fixamingata/layout.scss
@@ -73,6 +73,14 @@ h3, h4,
     }
 }
 
+body.frontpage {
+    #site-logo {
+        width: 300px;
+        height: 55px;
+        background: url($image-sprite) -2px -115px no-repeat;
+    }
+}
+
 #front-main {
     background: $primary url(/cobrands/fixamingata/images/tile-y.jpg);
 }
@@ -115,8 +123,6 @@ h3, h4,
 
 body.fullwidthpage .container .content footer .tablewrapper { background: #fff; }
 
-body.frontpage #site-logo { top: 0em; }
-
 body.frontpage #site-header { height: 85px; }
 
-body.frontpage #user-meta { margin-top: 1.2em; }
\ No newline at end of file
+body.frontpage #user-meta { margin-top: 1.2em; }
diff --git a/web/cobrands/fixmystreet.com/layout.scss b/web/cobrands/fixmystreet.com/layout.scss
index 4b2a91c9d..87916b33a 100644
--- a/web/cobrands/fixmystreet.com/layout.scss
+++ b/web/cobrands/fixmystreet.com/layout.scss
@@ -93,11 +93,6 @@ body.mappage {
     }
 }
 
-.nav-menu--mysoc {
-    background: #515151;
-    margin-top: -4px;
-}
-
 body.twothirdswidthpage,
 body.fullwidthpage {
     #front-main {
@@ -150,55 +145,28 @@ body.fullwidthpage {
             }
         }
     }
-
-    .container {
-        .content {
-            footer {
-                .tablewrapper {
-                    background: #1a1a1a url(images/tile.jpg) 0 0 repeat;
-                }
-            }
-        }
-    }
 }
 
 body.frontpage {
-    .container {
-        background-color: transparent;
-
-        .content {
-            background-color: transparent;
-            padding: 0em 0em 1em;
-
-            > .tablewrapper {
-                margin: -4em 0em 0em;
-                padding: 1em 1em;
-                background-color: white;
-                width: auto;
-            }
-            > .form-error {
-                margin-top: -4em;
-            }
-            > .form-error + .tablewrapper {
-                margin-top: 0;
-            }
-        }
-        footer {
-            .bordered {
-                margin: 0em;
-            }
-        }
+    #site-logo {
+        top: 3em;
+        width: 300px;
+        height: 60px;
+        background: url($image-sprite) -2px -108px no-repeat;
     }
-}
 
-body.twothirdswidthpage {
-    .container {
-        .content {
-            footer {
-                .tablewrapper {
-                    border: 0px;
-                }
-            }
+    // Because fms.com includes a .fms-pro-promo that we want to look separate
+    // from #front-howto and #front-recent, we move the white background and
+    // padding from .content to the .tablewrapper, so it visually stands alone.
+    .content {
+        background-color: transparent;
+        padding: 0em 0em 1em;
+        margin-top: -3em; // overlap the bottom of #front-main
+
+        .tablewrapper {
+            @include box-sizing(border-box);
+            padding: 1.5em;
+            background-color: white;
         }
     }
 }
diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss
index ab51e73c8..70e2ecc67 100644
--- a/web/cobrands/sass/_base.scss
+++ b/web/cobrands/sass/_base.scss
@@ -544,22 +544,6 @@ ul.error {
     background-color: #ccc;
   }
 }
-.nav-menu--mysoc {
-  a {
-    color: $primary_text;
-    background-color: $primary;
-  }
-}
-#mysoc-logo {
-  background-origin: content-box;
-  background-position: $left 3px;
-  background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAHQAAAAYCAYAAAArrNkGAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAABBtJREFUaN7tmT2u1DAQx/cIPgBCQUJCICH5BuQIPkIq6hzBB0AyiAP4ABQ5ghtEm54mEtVrICUNkpmsJjBvdvyR1S7hPa2lv1aJs5PEP894xjkc/tMWY+xADhRQA8iC9I7PtD6PP9xa9aC1oCnmm9lpgtHW3WiVB03HuqYeA9DlPZbJuXj8o5wgGM5os+ixLb74MeTt+Hz+kiGXva99jEDjJV7w+5Pn3aIHNoEvB/Tu7s6iejzuQAEUQRPIgxT2KTwesX+5rkvYs7yP2KDXLN7XXCKkAUgHiii3MaQuideI9x/x2GB/gxFjVZMIoY6AmtBGJ+QJluUKgdheI1LpfveuoQMciTw7XrUAbEFzot8Re4GcnwWghv23Ezx0PiejBYiBAA0/Pz7VoOV3AKnEup1LwhyBQFsr2Jkzdjy51hZyBIuwaOuFZ6fPPaaA5jQX+hvi4fS8YUC9BBzXqJOB4INXAGpAM8oAxBEUUbYSQiCD1ZWACnZGhDJIUacGaBbY34ghAxfAdHheCxBHAs6yvp7YpP/zDOgk9WHIGhMvOZ5TrjCgfUUSptigqQqg1M7A7kHhTVvWUAF8Q/r6ZObPQy4bfMf62wycoeSFOEmoPS2sQ74mdFUC1RhuHQ25QonkKurjE6CCpzTC+9CmNwBNeiHz/oGvabnweG+9E9ZDul6GDDiD53tybsoMYIMJhhQSjy/28YVzoAgKoGRt+uvHMwUaQRHkS7N/I1AjhGuuGs+2ifsOPOwKk6TLAeUe2J4DFPtG7vnsnK3MQPngTwg0ErUZoC3CPEqyWbmDJQG1cVvbCpRPmIadm6Wy5VpAeXKkpCRqQ1F/DwBAnAlQnQHaEKDzlYGGgvQWoEJy1LOx8P8SqOLJEU2uNhbhvQC0AVn76n3/9vWHpIe++/Km/fxVL17aL3ATSYU5E2h77rbkBqA2kYFHsbS7FlAhOTrJpIXwkirYRynMAEgDiignwHSgiGozCceUg5EBqs5N2hhQX8gnpDaldoquCVQn6lmV2foLbJdkSmWkANESoNPLT98UyKMUgbnIFsqWGRMxQ0JbW1G2eCHsdmQferWlMwlPxHuLnwiFa9NefU2gQiJ0UholBixm6lGV8lAEGVFDykMr6l5e5OeA1tg5ASB8wcmVMEa4rtkLqM3VnqQuDJnBmHnhT6A2oKPNBSIFuq6hoCbzCatY91Zs/ZXspED5Ws+rDu0IbZUSEps//YmQuvbrCg8NFd8I1zBl8bd66w8galBA6Q3rmWKb3YZlpIqE0Da13pLrVjtd6flxMtP7qorvse1hjyYkRfs8yMP/8E83WMIeII2wdrobnk0gG6HOnUu7WteAqRKf39QN0yagTlhf9/lwz9fNG8yzgBrmmWa3h8Ftv0HaQLi1TYlaSGX3UvsNzdBKw+waoEEAAAAASUVORK5CYII=');
-  background-repeat: no-repeat;
-  text-indent: -999999px;
-}
-.ie7 #mysoc-logo {
-  background: url($image-sprite) -240px -38px no-repeat;
-}
 
 //defines where the table caption is (login stuff on mob, nav menu on desktop)
 .wrapper {
diff --git a/web/cobrands/sass/_layout.scss b/web/cobrands/sass/_layout.scss
index 985127361..2f5e263c4 100644
--- a/web/cobrands/sass/_layout.scss
+++ b/web/cobrands/sass/_layout.scss
@@ -130,7 +130,8 @@ h1 {
   #{$left}: -999999px;
 }
 
-#report-cta {
+#report-cta,
+.nav-menu__item--privacy {
     display: none;
 }
 
@@ -142,12 +143,8 @@ h1 {
 .nav-menu {
   float: $right;
   li {
-    display: inline;
     float: $left;
   }
-  li.nav-menu__item--privacy {
-    display: none;
-  }
   a, span {
     display: block;
     color: $nav_fg;
@@ -177,40 +174,6 @@ h1 {
     color:$primary;
   }
 }
-.nav-menu--mysoc {
-  padding: 0em 0.5em;
-  margin-#{$left}: 0.25em;
-  background-color: $primary;
-  @include border-radius(0 0 0.375em 0.375em);
-  a {
-    background-color: transparent;
-    color: $primary_text;
-    text-transform: uppercase;
-    font-size: 0.6875em;
-    padding: 1.3em 0.7em 1em;
-    &:hover {
-      color: #fff;
-      background-color: transparent;
-    }
-  }
-}
-#mysoc-logo {
-  width:84px;
-  height:16px;
-  background-size: 100px auto;
-  background-position: 50% 50%;
-  opacity: 0.8;
-  &:hover {
-    opacity: 1;
-  }
-  // IE8 does not support background-size, so increase width to show whole image
-  .ie8 & {
-    width: 100px;
-  }
-}
-.ie7 #mysoc-logo {
-    background-position: -260px -43px;
-}
 
 // .content Is the white box
 
@@ -1000,12 +963,6 @@ body.frontpage {
   #site-header{
     height:8em;
   }
-  #site-logo{
-    top:3em;
-    width: 300px;
-    height: 60px;
-    background: url($image-sprite) -2px -108px no-repeat;
-  }
 }
 //logo fix
 .iel8 {