From 3d265b7913942958ee7ed12f5c7d7e980a07acff Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Mon, 1 Oct 2018 11:05:42 +0100 Subject: =?UTF-8?q?Revert=2050693857=20=E2=80=9CClearer=20relocation=20opt?= =?UTF-8?q?ions...=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit So version 2.4.1 has no translation changes, putting back straight after. --- CHANGELOG.md | 1 - .../web/base/report/new/fill_in_details_form.html | 5 +--- .../fixmystreet/images/change-location-arrow.png | Bin 138 -> 0 bytes .../fixmystreet/images/change-location-arrow.svg | 1 - .../fixmystreet/images/change-location-search.png | Bin 220 -> 0 bytes .../fixmystreet/images/change-location-search.svg | 1 - web/cobrands/fixmystreet/images/wrong-location.png | Bin 0 -> 316 bytes web/cobrands/sass/_base.scss | 33 +++------------------ web/cobrands/sass/_layout.scss | 4 --- 9 files changed, 5 insertions(+), 40 deletions(-) delete mode 100644 web/cobrands/fixmystreet/images/change-location-arrow.png delete mode 100644 web/cobrands/fixmystreet/images/change-location-arrow.svg delete mode 100644 web/cobrands/fixmystreet/images/change-location-search.png delete mode 100644 web/cobrands/fixmystreet/images/change-location-search.svg create mode 100644 web/cobrands/fixmystreet/images/wrong-location.png diff --git a/CHANGELOG.md b/CHANGELOG.md index b5e85417f..91468b4ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,6 @@ - Import end point can optionally return a web page #2225 - Clicking the "Report" header links on the homepage now focusses the #pc search input #2237 - - Clearer relocation options while you’re reporting a problem #2238 - Speed up fetching lists of bodies. #2248 - Improve vertical alignment of navigation menu in Internet Explorer 9–11. - Mobile menu button no longer uses -9999px text-indent hack. diff --git a/templates/web/base/report/new/fill_in_details_form.html b/templates/web/base/report/new/fill_in_details_form.html index c819d34a0..a508b9307 100644 --- a/templates/web/base/report/new/fill_in_details_form.html +++ b/templates/web/base/report/new/fill_in_details_form.html @@ -1,10 +1,7 @@

[% loc('Report your problem') %]

[% IF report.used_map %] - +

[% loc('Wrong location? Just click again on the map.') %]

[% END %] [% TRY %][% INCLUDE 'report/new/roads_message.html' %][% CATCH file %][% END %] diff --git a/web/cobrands/fixmystreet/images/change-location-arrow.png b/web/cobrands/fixmystreet/images/change-location-arrow.png deleted file mode 100644 index 6b3cf0efc..000000000 Binary files a/web/cobrands/fixmystreet/images/change-location-arrow.png and /dev/null differ diff --git a/web/cobrands/fixmystreet/images/change-location-arrow.svg b/web/cobrands/fixmystreet/images/change-location-arrow.svg deleted file mode 100644 index fb6f1c429..000000000 --- a/web/cobrands/fixmystreet/images/change-location-arrow.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/web/cobrands/fixmystreet/images/change-location-search.png b/web/cobrands/fixmystreet/images/change-location-search.png deleted file mode 100644 index 8f5ac91ba..000000000 Binary files a/web/cobrands/fixmystreet/images/change-location-search.png and /dev/null differ diff --git a/web/cobrands/fixmystreet/images/change-location-search.svg b/web/cobrands/fixmystreet/images/change-location-search.svg deleted file mode 100644 index 6b628e1eb..000000000 --- a/web/cobrands/fixmystreet/images/change-location-search.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/web/cobrands/fixmystreet/images/wrong-location.png b/web/cobrands/fixmystreet/images/wrong-location.png new file mode 100644 index 000000000..8f775f710 Binary files /dev/null and b/web/cobrands/fixmystreet/images/wrong-location.png differ 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; -- cgit v1.2.3