diff options
| -rw-r--r-- | locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po | 12 | ||||
| -rw-r--r-- | web/cobrands/fixamingata/_colours.scss | 4 | ||||
| -rw-r--r-- | web/cobrands/fixamingata/base.scss | 8 | ||||
| -rw-r--r-- | web/cobrands/fixamingata/images/locate-me.png | bin | 0 -> 1348 bytes | |||
| -rw-r--r-- | web/cobrands/fixamingata/images/locate-me@2.png | bin | 0 -> 3185 bytes | |||
| -rw-r--r-- | web/cobrands/fixamingata/layout.scss | 29 |
6 files changed, 39 insertions, 14 deletions
diff --git a/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po index fd83e31ad..e8d400c69 100644 --- a/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" "POT-Creation-Date: 2018-12-19 17:14+0000\n" -"PO-Revision-Date: 2019-04-25 10:44+0200\n" +"PO-Revision-Date: 2019-05-22 10:26+0200\n" "Last-Translator: Joe Siltberg <joe@fixamingata.se>, 2019\n" "Language-Team: Swedish (Sweden) (https://www.transifex.com/mysociety/teams/12067/sv_SE/)\n" "Language: sv_SE\n" @@ -151,7 +151,7 @@ msgstr "(ignorerad om typen är \"Sträng\")" #: templates/web/base/around/intro.html:2 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" -msgstr "(ex.v. graffiti, skräp, trasiga gatustenar eller belysning)" +msgstr "till exempel graffiti, skräp, trasiga gatustenar eller belysning" #: templates/web/base/reports/index.html:82 msgid "(no longer exists)" @@ -1322,12 +1322,12 @@ msgstr "Skriv in ett Zürich-gatunamn" #: perllib/FixMyStreet/Cobrand/UK.pm:16 msgid "Enter a nearby UK postcode, or street name and area" -msgstr "Ange ett postnummer eller gatunamn och ort" +msgstr "Ange gatunamn och ort eller ett postnummer" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21 msgid "Enter a nearby postcode, or street name and area" -msgstr "Ange ett postnummer eller gatunamn och ort" +msgstr "Ange gatunamn och ort eller ett postnummer" #: templates/web/base/around/postcode_form.html:7 #: templates/web/base/around/postcode_form.html:8 @@ -5376,7 +5376,7 @@ msgstr "använde inte kartan" #: templates/web/base/alert/index.html:34 #: templates/web/base/around/postcode_form.html:13 msgid "e.g. ‘%s’ or ‘%s’" -msgstr "ex.v. '%s' eller '%s'" +msgstr "exempelvis ‘%s’ eller ‘%s’" #: templates/web/base/report/new/form_title.html:2 msgid "e.g. ‘10 inch pothole on Example St, near post box’" @@ -5431,7 +5431,7 @@ msgstr "eller <a href=\"%s\">logga in</a>" #: templates/web/base/alert/index.html:40 #: templates/web/base/around/postcode_form.html:27 msgid "or locate me automatically" -msgstr "eller <strong>hitta min position automatiskt</strong>." +msgstr "eller <strong>hitta min position automatiskt</strong>" #: templates/web/base/admin/report_edit.html:49 #: templates/web/base/admin/report_edit.html:51 diff --git a/web/cobrands/fixamingata/_colours.scss b/web/cobrands/fixamingata/_colours.scss index b609a7a44..dbdd92e5b 100644 --- a/web/cobrands/fixamingata/_colours.scss +++ b/web/cobrands/fixamingata/_colours.scss @@ -11,8 +11,10 @@ $base_fg: $primary_text; $nav_background_colour: #eee; $nav_colour: $primary_text; -$nav_hover_background_colour: #444; +$nav_hover_background_colour: #20bbdf; $header-top-border: false; $col_click_map: #00BD08; + +$high-dpi-screen: '-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi'; diff --git a/web/cobrands/fixamingata/base.scss b/web/cobrands/fixamingata/base.scss index e0f5f6dfc..a708483bc 100644 --- a/web/cobrands/fixamingata/base.scss +++ b/web/cobrands/fixamingata/base.scss @@ -32,14 +32,8 @@ } } -#front-main { - a#geolocate_link { - font-size: 0.9em; - } -} - .description_tips { h4 { - margin: 1em 0 0.5em; /* Jon added some margin-top here! */ + margin: 1em 0 0.5em; } } diff --git a/web/cobrands/fixamingata/images/locate-me.png b/web/cobrands/fixamingata/images/locate-me.png Binary files differnew file mode 100644 index 000000000..47a0eef20 --- /dev/null +++ b/web/cobrands/fixamingata/images/locate-me.png diff --git a/web/cobrands/fixamingata/images/locate-me@2.png b/web/cobrands/fixamingata/images/locate-me@2.png Binary files differnew file mode 100644 index 000000000..df920fadb --- /dev/null +++ b/web/cobrands/fixamingata/images/locate-me@2.png diff --git a/web/cobrands/fixamingata/layout.scss b/web/cobrands/fixamingata/layout.scss index 909212171..6cf0dd47e 100644 --- a/web/cobrands/fixamingata/layout.scss +++ b/web/cobrands/fixamingata/layout.scss @@ -121,3 +121,32 @@ body.mappage { #postcodeForm { margin-left: -1em !important; margin-right: -1em !important; } .content footer .tablewrapper { background: #fff; } + +#front-main { + a#geolocate_link { + background: url(images/locate-me.png) $left 0 no-repeat; + height: 34px; + padding-#{$left}: 24px; + margin-top: 0.25em; + font-size: 1em; + @media ($high-dpi-screen) { + background-image: url(images/locate-me@2.png); + background-size: 22px 34px; + } + &:hover { + text-decoration:underline; + background: url(images/locate-me.png) $left 0 no-repeat; + + @media ($high-dpi-screen) { + background-image: url(images/locate-me@2.png); + background-size: 22px 34px; + } + } + } +} + +.nav-menu--main { + a { + border-radius: 5px; + } +} |
