Merge branch 'version-2.4.1'v2.4.1

2 files changed, 4 insertions, 33 deletions

diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss
index 587ff59f3..6d5884abd 100644
--- a/web/cobrands/sass/_base.scss
+++ b/web/cobrands/sass/_base.scss
@@ -382,35 +382,10 @@ select.form-control {
 
 .change_location {
     color: #666;
-    margin: 0;
-
-    // No need for this element on mobile, where they can't click the map,
-    // and there's already a "Report" button in the header that leads to
-    // the homepage search form. But we'll want to unhide in layout.scss.
-    display: none;
-
-    li {
-      list-style: none;
-      padding-#{$left}: 24px;
-      margin: 0.3em 0 0 0;
-      background-size: 14px 14px;
-      background-repeat: no-repeat;
-      background-position: flip(0 50%, 100% 50%);
-    }
-}
-
-.change_location__map {
-  @include svg-background-image('/cobrands/fixmystreet/images/change-location-arrow');
-}
-
-.change_location__search {
-  @include svg-background-image('/cobrands/fixmystreet/images/change-location-search');
-}
-
-// Space between the .change_location list and any
-// top_message.html announcements inserted via ajax.
-#js-top-message > :first-child {
-  margin-top: 1.5em;
+    padding-#{$left}: 20px;
+    background: transparent url(/cobrands/fixmystreet/images/wrong-location.png) $left 50% no-repeat;
+    border-#{$left}: solid 4px transparent;
+    margin-top: -0.5em;
 }
 
 .form-txt-submit-box {
diff --git a/web/cobrands/sass/_layout.scss b/web/cobrands/sass/_layout.scss
index 7a6f7ba02..e1dbd695b 100644
--- a/web/cobrands/sass/_layout.scss
+++ b/web/cobrands/sass/_layout.scss
@@ -354,10 +354,6 @@ body.mappage.admin {
   }
 }
 
-.change_location {
-  display: block;
-}
-
 .category_meta_message {
   padding-top: 0.5em;
   font-size: 0.9em;