Merge branch '2107-foot-the-bill'

12 files changed, 114 insertions, 136 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a9bc195ad..5a2678c42 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 ## Releases
 
 * Unreleased
+    - Front end improvements:
+        - Simplify footer CSS. #2107
     - Bugfixes:
         - Don't remove automated fields when editing contacts #2163
         - Remove small border to left of Fixed banner. #2156
diff --git a/templates/web/fixmystreet.com/about/faq-en-gb.html b/templates/web/fixmystreet.com/about/faq-en-gb.html
index 78b8065c3..939fd4260 100755
--- a/templates/web/fixmystreet.com/about/faq-en-gb.html
+++ b/templates/web/fixmystreet.com/about/faq-en-gb.html
@@ -48,7 +48,6 @@ FAQs answer your question first, because that saves your time and ours.
 <a href="https://itunes.apple.com/gb/app/fixmystreet/id297456545">app for iOS</a>
 and an
 <a href="https://play.google.com/store/apps/details?id=org.mysociety.FixMyStreet">Android app</a>.
-A volunteer has also written an <a href="http://store.ovi.com/content/107557">Nokia Ovi app</a>.
 <p>If your phone isn't supported, try accessing FixMyStreet via your mobile
 browser – it should work well.
 </dd>
diff --git a/templates/web/greenwich/about/faq-en-gb.html b/templates/web/greenwich/about/faq-en-gb.html
index f143581d6..dc628dbe9 100644
--- a/templates/web/greenwich/about/faq-en-gb.html
+++ b/templates/web/greenwich/about/faq-en-gb.html
@@ -64,8 +64,6 @@ by a user of the site.</dd>
 			<a href="https://itunes.apple.com/gb/app/fixmystreet/id297456545">FixMyStreet app for iPhone</a>		
 	    <li>
 			<a href="https://play.google.com/store/apps/details?id=org.mysociety.FixMyStreet">FixMyStreet app for Android</a>
-	    <li><em>Nokia:</em> A volunteer, Thomas Forth, has written an app available from the
-			<a href="http://store.ovi.com/content/107557">Ovi Store</a>.
 	</ul>
     </dd>
 
diff --git a/templates/web/hart/about/faq-en-gb.html b/templates/web/hart/about/faq-en-gb.html
index 0379b0745..522d7f3b2 100755
--- a/templates/web/hart/about/faq-en-gb.html
+++ b/templates/web/hart/about/faq-en-gb.html
@@ -62,8 +62,6 @@ by a user of the site.</dd>
 			<a href="https://itunes.apple.com/gb/app/fixmystreet/id297456545">FixMyStreet app for iPhone</a>		
 	    <li>
 			<a href="https://play.google.com/store/apps/details?id=org.mysociety.FixMyStreet">FixMyStreet app for Android</a>
-	    <li><em>Nokia:</em> A volunteer, Thomas Forth, has written an app available from the
-			<a href="http://store.ovi.com/content/107557">Ovi Store</a>.
 	</ul>
     </dd>
 
diff --git a/templates/web/stevenage/about/faq-en-gb.html b/templates/web/stevenage/about/faq-en-gb.html
index 43284a463..a92a80cb3 100644
--- a/templates/web/stevenage/about/faq-en-gb.html
+++ b/templates/web/stevenage/about/faq-en-gb.html
@@ -56,8 +56,6 @@ by a user of the site.</dd>
             <a href="https://itunes.apple.com/gb/app/fixmystreet/id297456545">FixMyStreet app for iPhone</a>
         <li>
             <a href="https://play.google.com/store/apps/details?id=org.mysociety.FixMyStreet">FixMyStreet app for Android</a>
-        <li><em>Nokia:</em> A volunteer, Thomas Forth, has written an app available from the
-            <a href="http://store.ovi.com/content/107557">Ovi Store</a>.
     </ul>
     </dd>
 
diff --git a/templates/web/stevenage/footer.html b/templates/web/stevenage/footer.html
index d276094c1..149ad171b 100644
--- a/templates/web/stevenage/footer.html
+++ b/templates/web/stevenage/footer.html
@@ -1,30 +1,6 @@
                     [% IF pagefooter %]
                     <footer role="contentinfo">
-                        <div class="tablewrapper bordered">
-                            <div id="footer-mobileapps">
-                                <h4>Mobile apps</h4>
-
-                                <ul>
-                                    <li><a class="m-app-iphone" href="http://itunes.apple.com/gb/app/fixmystreet/id297456545">iPhone</a></li>
-                                    <li><a class="m-app-droid" href="https://market.android.com/details?id=com.android.fixmystreet">Android</a></li>
-                                    <li><a class="m-app-nokia" href="http://store.ovi.com/content/107557">Nokia</a></li>
-                                </ul>
-                            </div>
-
-                            <div id="footer-help">
-                                <ul>
-                                    <li>
-                                        <h4>[% loc('Are you a developer?') %]</h4>
-                                        <p>[% loc('Would you like to contribute to FixMyStreet? Our code is open source and <a href="http://github.com/mysociety/fixmystreet">available on GitHub</a>.') %]</p>
-                                    </li>
-                                    <li>
-                                        <h4>[% loc('Are you from a council?') %]</h4>
-                                        <p>[% loc('Would you like better integration with FixMyStreet? <a href="https://www.fixmystreet.com/pro/">Find out about FixMyStreet Pro</a>.') %]</p>
-                                    </li>
-                                </ul>
-                            </div>
-                        </div>
-                        <p><a href="/privacy">Privacy and cookies</a></p>
+                        [% INCLUDE 'front/footer-marketing.html' %]
                     </footer>
                     [% END %]
                 </div><!-- .content role=main -->
diff --git a/templates/web/stevenage/front/footer-marketing.html b/templates/web/stevenage/front/footer-marketing.html
new file mode 100644
index 000000000..942c747f9
--- /dev/null
+++ b/templates/web/stevenage/front/footer-marketing.html
@@ -0,0 +1,24 @@
+<div class="tablewrapper bordered">
+    <div id="footer-mobileapps">
+        <h4>Mobile apps</h4>
+
+        <ul>
+            <li><a class="m-app-iphone" href="http://itunes.apple.com/gb/app/fixmystreet/id297456545">iPhone</a></li>
+            <li><a class="m-app-droid" href="https://market.android.com/details?id=com.android.fixmystreet">Android</a></li>
+        </ul>
+    </div>
+
+    <div id="footer-help">
+        <ul>
+            <li>
+                <h4>[% loc('Are you a developer?') %]</h4>
+                <p>[% loc('Would you like to contribute to FixMyStreet? Our code is open source and <a href="http://github.com/mysociety/fixmystreet">available on GitHub</a>.') %]</p>
+            </li>
+            <li>
+                <h4>[% loc('Are you from a council?') %]</h4>
+                <p>[% loc('Would you like better integration with FixMyStreet? <a href="https://www.fixmystreet.com/pro/">Find out about FixMyStreet Pro</a>.') %]</p>
+            </li>
+        </ul>
+    </div>
+</div>
+<p><a href="/privacy">Privacy and cookies</a></p>
diff --git a/web/cobrands/bromley/layout.scss b/web/cobrands/bromley/layout.scss
index b54af6df2..ded53367f 100644
--- a/web/cobrands/bromley/layout.scss
+++ b/web/cobrands/bromley/layout.scss
@@ -66,8 +66,7 @@ h1.main {
 
 // Because we've changed the page background, the footer looks a bit rubbish
 footer,
-body.twothirdswidthpage .container .content footer .tablewrapper,
-body.fullwidthpage .container .content footer .tablewrapper {
+.content footer .tablewrapper {
   background-color: $bromley_blue;
 }
 
diff --git a/web/cobrands/fixamingata/layout.scss b/web/cobrands/fixamingata/layout.scss
index e02093b24..3e0a999a3 100644
--- a/web/cobrands/fixamingata/layout.scss
+++ b/web/cobrands/fixamingata/layout.scss
@@ -119,4 +119,4 @@ body.mappage {
 
 #postcodeForm { margin-left: -1em !important; margin-right: -1em !important; }
 
-body.fullwidthpage .container .content footer .tablewrapper { background: #fff; }
+.content footer .tablewrapper { background: #fff; }
diff --git a/web/cobrands/greenwich/layout.scss b/web/cobrands/greenwich/layout.scss
index c2b50088c..6c59dc123 100644
--- a/web/cobrands/greenwich/layout.scss
+++ b/web/cobrands/greenwich/layout.scss
@@ -198,64 +198,62 @@ body.twothirdswidthpage .content .sticky-sidebar {
     }
 }
 
-body.fullwidthpage, body.twothirdswidthpage {
-    .container .content footer {
-        a.platform-logo {
-            background-color: $greenwich_dark_grey;
-            background-position: center center;
-            background-size: 13em 1.5em;
-            width: 14em;
-            height: 3em;
-            border-radius: 1.5em;
-        }
+.content footer {
+    a.platform-logo {
+        background-color: $greenwich_dark_grey;
+        background-position: center center;
+        background-size: 13em 1.5em;
+        width: 14em;
+        height: 3em;
+        border-radius: 1.5em;
+    }
 
-        .tablewrapper {
-            padding: 0;
-            margin: 1em 0;
+    .tablewrapper {
+        padding: 0;
+        margin: 1em 0;
 
-            div {
-                text-align: center;
+        div {
+            text-align: center;
 
-                p {
-                    margin: 0;
-                    padding: 0;
-                    line-height: 3em;
-                }
+            p {
+                margin: 0;
+                padding: 0;
+                line-height: 3em;
             }
         }
+    }
 
-        .footer-nav {
-            padding: 0;
-            margin: 1em 0;
+    .footer-nav {
+        padding: 0;
+        margin: 1em 0;
 
-            ul {
-                margin: 0;
-                padding: 0;
-                text-align: center;
+        ul {
+            margin: 0;
+            padding: 0;
+            text-align: center;
 
-                li {
-                    display: inline;
-                    padding: 0 4px 0 7px;
-                    font-size: 0.8em;
-                    border-left: solid 1px $greenwich_dark_grey;
+            li {
+                display: inline;
+                padding: 0 4px 0 7px;
+                font-size: 0.8em;
+                border-left: solid 1px $greenwich_dark_grey;
 
-                    &:first-child {
-                        border-left: none;
-                    }
+                &:first-child {
+                    border-left: none;
+                }
 
-                    a, a:link, a:visited {
-                        color: $primary_text;
-                    }
+                a, a:link, a:visited {
+                    color: $primary_text;
                 }
             }
         }
+    }
 
-        hr {
-            padding: 0;
-            margin: 0 -24px;
-            border-bottom: solid 8px $greenwich_red;
-            border-top: solid 48px $greenwich_dark_grey;
-            height: 0;
-        }
+    hr {
+        padding: 0;
+        margin: 0 -24px;
+        border-bottom: solid 8px $greenwich_red;
+        border-top: solid 48px $greenwich_dark_grey;
+        height: 0;
     }
 }
diff --git a/web/cobrands/rutland/layout.scss b/web/cobrands/rutland/layout.scss
index 168d31fba..a432107dd 100755
--- a/web/cobrands/rutland/layout.scss
+++ b/web/cobrands/rutland/layout.scss
@@ -15,10 +15,6 @@ body.frontpage #site-logo {
 }
 
 
-body.fullwidthpage, body.twothirdswidthpage {
-    .container .content footer {
-        a.platform-logo {
-            background-image: url(/cobrands/fixmystreet/images/fms-platform-logo-dark.svg);
-        }
-    }
+a.platform-logo {
+    background-image: url(/cobrands/fixmystreet/images/fms-platform-logo-dark.svg);
 }
diff --git a/web/cobrands/sass/_layout.scss b/web/cobrands/sass/_layout.scss
index 28a96c73d..222c18768 100644
--- a/web/cobrands/sass/_layout.scss
+++ b/web/cobrands/sass/_layout.scss
@@ -379,60 +379,47 @@ body.mappage.admin {
   }
 }
 
-body.twothirdswidthpage,
-body.fullwidthpage {
-    .container {
-        .content {
-            footer {
-                margin-top: 0em;
-                margin-bottom: -1em;
-                .tablewrapper {
-                    padding-top: 2em;
-                    padding-bottom: 3em;
-                    background: $base_bg;
-                    color: $base_fg;
-                    a:link,
-                    a:visited {
-                        color: $primary;
-                    }
-                    #footer-mobileapps {
-                        a {
-                            padding-#{$left}: 0.5em;
-                        }
-                    }
-                    h4 {
-                        font-weight: normal;
-                        padding-bottom: 0.5em;
-                    }
-                }
-
-                a.platform-logo {
-                    vertical-align: baseline;
-                    display: inline-block;
-                    background-position: top left;
-                    background-repeat: no-repeat;
-                    background-size: auto 1.5em;
-                    background-image: url(/cobrands/fixmystreet/images/fms-platform-logo.svg);
-                    text-indent: -1000%;
-                    height: 1.7em;
-                    width: 16em;
-                    padding-#{$right}: 0.25em;
-                }
+// Only want to capture footers that are inside .content
+// (like the one in base)
+.content {
+    footer {
+        margin-top: 0em;
+        margin-bottom: -1em;
+        .tablewrapper {
+            padding-top: 2em;
+            padding-bottom: 3em;
+            background: $base_bg;
+            color: $base_fg;
+            a:link,
+            a:visited {
+                color: $primary;
+            }
+            h4 {
+                font-weight: normal;
+                padding-bottom: 0.5em;
             }
         }
     }
-
 }
-.ie8 {
-  body.twothirdswidthpage,
-  body.fullwidthpage {
-    .container .content footer a.platform-logo {
-      color: #ffffff;
-      background: none;
-      text-indent: 0px;
-      height: auto;
+
+a.platform-logo {
+    vertical-align: baseline;
+    display: inline-block;
+    background-position: top left;
+    background-repeat: no-repeat;
+    background-size: auto 1.5em;
+    background-image: url(/cobrands/fixmystreet/images/fms-platform-logo.svg);
+    text-indent: -1000%;
+    height: 1.7em;
+    width: 16em;
+    padding-#{$right}: 0.25em;
+
+    .ie8 & {
+        color: #ffffff;
+        background: none;
+        text-indent: 0px;
+        height: auto;
     }
-  }
 }
 
 // two thirds width page, also has option for a sidebar which can be sticky or not
@@ -535,7 +522,10 @@ body.authpage {
     margin-top:0;
   }
   p {
-	  border-bottom:none;
+    border-bottom:none;
+  }
+  a {
+    padding-#{$left}: 0.5em;
   }
 }