Reduce complexity of footer CSS.

6 files changed, 89 insertions, 104 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/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;
   }
 }