Merge tag 'v3.1' into fiksgatami-devfiksgatami-dev

1 files changed, 29 insertions, 16 deletions

diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss
index b52b75f43..b5830ebfd 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;
@@ -310,6 +313,9 @@ legend,
         box-shadow: none;
         color: #888888;
     }
+    &[disabled] {
+        background-color: #eee;
+    }
 }
 
 select.form-control {
@@ -1966,6 +1972,15 @@ html.js #map .noscript {
   }
 }
 
+#change_asset_mobile {
+    position: absolute;
+    bottom: 3em;
+    #{$left}: 0.25em;
+    padding: 0.25em;
+    color: #fff;
+    background-color: black;
+}
+
 .olControlAttribution {
     bottom: 3.25em !important;
     #{$right}: 0.25em !important;
@@ -2181,6 +2196,10 @@ label .muted {
         margin-bottom: 0.5em;
     }
 
+    dd:last-child {
+        margin-bottom: 0;
+    }
+
     .btn, .btn-primary {
         margin: 0.5em 0 1em 0;
 
@@ -2373,26 +2392,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;
 }
@@ -2817,3 +2829,4 @@ $nicetable-hover-background: rgba($primary, 0.15) !default;
 @import "_autocomplete";
 @import "_dashboard";
 @import "_top-banner";
+@import "_search-help";