Merge remote-tracking branch 'origin/issues/commercial/1835-geolocation-button-styling'

2 files changed, 17 insertions, 32 deletions

diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss
index b52b75f43..f86af2386 100644
--- a/web/cobrands/sass/_base.scss
+++ b/web/cobrands/sass/_base.scss
@@ -11,6 +11,9 @@ $link-visited-color: $link-color !default;
 $link-text-decoration: none !default;
 $link-hover-text-decoration: underline !default;
 
+$primary_link_decoration: underline !default;
+$primary_link_hover_decoration: $primary_link_decoration !default;
+
 $itemlist_item_background: #f6f6f6 !default;
 $itemlist_item_background_hover: #e6e6e6 !default;
 $col_big_numbers: #666 !default;
@@ -2373,26 +2376,19 @@ label .muted {
       }
     }
   }
-  a#geolocate_link {
-    @include inline-block;
-    vertical-align:top;
-    background:#1a1a1a;
-    color:#C8C8C8;
-    padding:0.5em;
-    font-family: $meta-font;
-    font-size: 0.8125em;
-    @include border-radius(0 0 0.25em 0.25em);
+  a {
+    text-decoration: $primary_link_decoration;
     &:hover {
-      text-decoration:none;
-      background:#2a2a2a;
+      text-decoration: $primary_link_hover_decoration;
     }
   }
-  a#geolocate_link.loading {
-      background: #1a1a1a url("/cobrands/fixmystreet/images/spinner-black.gif") flip(100%,0) 50% no-repeat;
-      border-#{$right}: solid 0.5em #1a1a1a;
-      padding-#{$right}: 1.5em;
-  }
 }
+
+a#geolocate_link {
+  display: inline-block;
+  padding: 0.5em;
+}
+
 .no-js #geolocate_link {
     display: none !important;
 }
diff --git a/web/cobrands/sass/_layout.scss b/web/cobrands/sass/_layout.scss
index 02ded6fc1..8b3406d9d 100644
--- a/web/cobrands/sass/_layout.scss
+++ b/web/cobrands/sass/_layout.scss
@@ -13,6 +13,9 @@ $header-top-border: $header-top-border-width solid $primary !default;
 
 $container-max-width: 60em !default;
 
+$primary_link_color: null !default;
+$primary_link_hover_color: null !default;
+
 .internal-link-fixed-header {
     display: block;
     position: relative;
@@ -854,25 +857,11 @@ textarea.form-error {
     }
   }
   a {
-    color: inherit;
-    text-decoration: underline;
-    &:hover {
-      text-decoration: none;
-    }
-  }
-  a#geolocate_link {
-    color: inherit;
-    background:none;
-    text-decoration: none;
-    padding-bottom: 0;
+    color: $primary_link_color;
     &:hover {
-      text-decoration:underline;
-      background:none;
+      color: $primary_link_hover_color;
     }
   }
-  a#geolocate_link.loading {
-      border-#{$right}: none;
-  }
 }
 
 #front-howto {