Tidy up UK council cobrand button style overrides

Given recent changes to the button mixins, now is a good opportunity to
clear out some overcomplicated button styling from a few UK council
cobrands: Greenwich, Hart, and Oxfordshire.

All three referred to `button.green-btn` elements that don’t seem to
exist any more, and I couldn’t find a reason for the extra specificity
in the `input.green-btn` selectors either.

Oxfordshire’s buttons are drastically restyled from the FMS defaults,
so its button rules are a little complex. But I’ve tried to make the
distinction clearer between buttons we’re having to build from scratch
(.btn, .green-btn, etc) and buttons we’re simply re-colouring.

3 files changed, 23 insertions, 11 deletions

diff --git a/web/cobrands/greenwich/base.scss b/web/cobrands/greenwich/base.scss
index 909c122d8..0f990c865 100644
--- a/web/cobrands/greenwich/base.scss
+++ b/web/cobrands/greenwich/base.scss
@@ -58,7 +58,7 @@ h1, h2 {
     font-style: italic;
 }
 
-button, input[type=submit], .btn, .green-btn, button.green-btn, input.green-btn {
+button, input[type=submit], .btn, .green-btn {
     border: none;
     border-radius: 0;
     color: white;
diff --git a/web/cobrands/hart/hart.scss b/web/cobrands/hart/hart.scss
index d8f8599de..f476f034d 100644
--- a/web/cobrands/hart/hart.scss
+++ b/web/cobrands/hart/hart.scss
@@ -7,7 +7,7 @@
 @import "../sass/mixins";
 @import "_colours";
 
-.green-btn, button.green-btn, input.green-btn {
+.green-btn {
     background: #5b7189;
     border: 1px solid #8e9eb0;
     color: #fff;
@@ -18,7 +18,7 @@
     padding: 4px 8px;
     text-transform: uppercase;
 }
-.green-btn:hover, button.green-btn:hover, input.green-btn:hover {
+.green-btn:hover {
     background: #5b7189; border: 1px solid #8e9eb0;
 }
 
diff --git a/web/cobrands/oxfordshire/base.scss b/web/cobrands/oxfordshire/base.scss
index 426a56e02..e55769ac7 100644
--- a/web/cobrands/oxfordshire/base.scss
+++ b/web/cobrands/oxfordshire/base.scss
@@ -213,6 +213,22 @@ dd, p {
   background-color: mix(#fff, $primary, 85%);
 }
 
+// We want OCCLSS buttons to look like FMS buttons.
+.occlss-button--primary {
+    @include button-size();
+}
+
+// No border and slightly different padding for *all* types of button.
+.btn,
+#front-main #postcodeForm div input#sub,
+.green-btn,
+.btn-primary,
+.occlss-button--primary {
+    border: none;
+    padding: 0.7em 1em 0.85em 1em;
+}
+
+// Regular button style.
 .btn {
     @include button-variant(
         #ffffff, #ffffff, #ffffff, #000,
@@ -222,17 +238,15 @@ dd, p {
         inset 0 -4px 0 #f3f3f3,
         0 2px 4px 0 rgba(26, 26, 26, 0.2)
     );
-    border: none;
-    padding: 0.7em 1em 0.85em 1em;
 }
 
+// Override all the "primary" buttons across the site!
 #front-main #postcodeForm div input#sub,
 .green-btn,
-button.green-btn,
-input.green-btn,
 .btn-primary,
-.occlss-button--primary {
-    @include button-reset(
+.occlss-button--primary,
+.btn--primary {
+    @include button-variant(
         $color-oxfordshire-bright-blue, $color-oxfordshire-bright-blue, $color-oxfordshire-bright-blue, #fff,
         darken(#0e73d8, 15%), darken(#0e73d8, 15%), darken(#0e73d8, 15%), #fff
     );
@@ -240,8 +254,6 @@ input.green-btn,
         inset 0 -4px 0 darken(#0e73d8, 15%),
         0 2px 4px 0 rgba(26, 26, 26, 0.2)
     );
-    border: none;
-    padding: 0.7em 1em 0.85em 1em;
 }
 
 .form-txt-submit-box input[type="submit"] {