diff options
Diffstat (limited to 'web')
| -rw-r--r-- | web/cobrands/fixmystreet.com/base.scss | 29 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/fixmystreet.js | 6 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/images/padlock.png | bin | 0 -> 148 bytes | |||
| -rw-r--r-- | web/cobrands/fixmystreet/images/padlock.svg | 1 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/images/padlock@2.png | bin | 0 -> 243 bytes | |||
| -rw-r--r-- | web/cobrands/sass/_base.scss | 61 |
6 files changed, 67 insertions, 30 deletions
diff --git a/web/cobrands/fixmystreet.com/base.scss b/web/cobrands/fixmystreet.com/base.scss index 366ebc451..869654b87 100644 --- a/web/cobrands/fixmystreet.com/base.scss +++ b/web/cobrands/fixmystreet.com/base.scss @@ -106,35 +106,6 @@ } } -.unresponsive-council-warning { - margin: 1em -1em; - padding: 2em 2em; - background-color: mix(#fff, $primary, 70%); - - h1 { - font-size: 1.4em; - } - - p { - margin-bottom: 0.5em; - } - - a { - display: inline-block; - margin-top: 0.5em; - padding: 0.5em 1em; - background-color: #000; - color: #fff; - border-radius: 0.3em; - - &:hover, - &:focus { - text-decoration: none; - background-color: mix(#000, $primary, 70%); - } - } -} - .unresponsive-council__header { padding-bottom: 1em; border-bottom: 1px solid #ccc; diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index be6b2f391..51ed30880 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -373,6 +373,8 @@ $.extend(fixmystreet.set_up, { $.getJSON('/report/new/category_extras', args, function(data) { var $category_meta = $('#category_meta'); + $('#js-councils_text').html(data.councils_text); + $('#js-councils_text_private').html(data.councils_text_private); if ( data.category_extra ) { if ( $category_meta.length ) { $category_meta.replaceWith( data.category_extra ); @@ -866,7 +868,9 @@ fixmystreet.update_pin = function(lonlat, savePushState) { } $('#side-form, #site-logo').show(); var old_category = $("select#form_category").val(); - $('#councils_text').html(data.councils_text); + $('#js-councils_text').html(data.councils_text); + $('#js-councils_text_private').html(data.councils_text_private); + $('#js-top-message').html(data.top_message || ''); $('#form_category_row').html(data.category); if ($("select#form_category option[value=\""+old_category+"\"]").length) { $("select#form_category").val(old_category); diff --git a/web/cobrands/fixmystreet/images/padlock.png b/web/cobrands/fixmystreet/images/padlock.png Binary files differnew file mode 100644 index 000000000..d5cb6d8ef --- /dev/null +++ b/web/cobrands/fixmystreet/images/padlock.png diff --git a/web/cobrands/fixmystreet/images/padlock.svg b/web/cobrands/fixmystreet/images/padlock.svg new file mode 100644 index 000000000..78fbcdc06 --- /dev/null +++ b/web/cobrands/fixmystreet/images/padlock.svg @@ -0,0 +1 @@ +<svg width="16" height="18" viewBox="0 0 16 18" xmlns="http://www.w3.org/2000/svg"><title>Artboard</title><path d="M2.667 5.143V8H0v10h16V8h-2.667V5.143C13.333 2.3 10.947 0 8 0S2.667 2.3 2.667 5.143zm8 0V8H5.333V5.143c0-1.53 1.08-2.572 2.667-2.572 1.587 0 2.667 1.043 2.667 2.573z" fill="#000" fill-rule="evenodd" fill-opacity=".6"/></svg>
\ No newline at end of file diff --git a/web/cobrands/fixmystreet/images/padlock@2.png b/web/cobrands/fixmystreet/images/padlock@2.png Binary files differnew file mode 100644 index 000000000..368d344e3 --- /dev/null +++ b/web/cobrands/fixmystreet/images/padlock@2.png diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss index 20aeed2b6..e5d2c48dd 100644 --- a/web/cobrands/sass/_base.scss +++ b/web/cobrands/sass/_base.scss @@ -287,6 +287,38 @@ select.form-control { height: 2.2em; // roughly equal to default input height } +.form-section-heading { + font-family: inherit; + color: inherit; + font-weight: bold; + margin-bottom: 0.25em; +} + +.form-section-heading--private { + &:before { + content: ""; + display: inline-block; + width: 16px; + height: 18px; + background: transparent url(/cobrands/fixmystreet/images/padlock.png) 0 0 no-repeat; + background-size: 16px 18px; + margin-#{$right}: 0.5em; + + @media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) { + background-image: url(/cobrands/fixmystreet/images/padlock@2.png); + } + + @media all { + background-image: url(/cobrands/fixmystreet/images/padlock.svg), none; + } + } +} + +.form-section-description { + color: #666; + line-height: 1em * (22/16); +} + // grey background, full width box .form-box { margin: 0 -1em 0.25em; @@ -1878,6 +1910,35 @@ table.nicetable { } } +.box-warning { + margin: 1em -1em; + padding: 2em 2em; + background-color: mix(#fff, $primary, 70%); + + h1 { + font-size: 1.4em; + } + + p { + margin-bottom: 0.5em; + } + + a { + display: inline-block; + margin-top: 0.5em; + padding: 0.5em 1em; + background-color: #000; + color: #fff; + border-radius: 0.3em; + + &:hover, + &:focus { + text-decoration: none; + background-color: mix(#000, $primary, 70%); + } + } +} + @import "_admin"; @import "_fixedthead"; @import "_dropzone"; |
