diff --git a/app/assets/images/exclamation.svg b/app/assets/images/exclamation.svg index 5998192ad..e530210e1 100644 --- a/app/assets/images/exclamation.svg +++ b/app/assets/images/exclamation.svg @@ -1,26 +1,26 @@ - - - - - + + - - + + + + + - - - - - - - - - + + + diff --git a/app/assets/stylesheets/components/area-list.scss b/app/assets/stylesheets/components/area-list.scss index 66769111b..1397d6b06 100644 --- a/app/assets/stylesheets/components/area-list.scss +++ b/app/assets/stylesheets/components/area-list.scss @@ -64,7 +64,10 @@ &--unremoveable { padding-right: govuk-spacing(2); background: $light-blue-25; - margin-right: govuk-spacing(3); + color: mix($black, $govuk-blue, 66%); + border-color: $light-blue-25; + margin: 0 govuk-spacing(1) govuk-spacing(2) 0; + font-weight: bold; } } @@ -75,17 +78,17 @@ } -#map { +#area-list-map { z-index: 50; margin-bottom: govuk-spacing(4); } -.area-key { +.area-list-key { display: inline-block; position: relative; margin-right: govuk-spacing(3); - margin-bottom: govuk-spacing(5); + margin-bottom: govuk-spacing(4); height: govuk-spacing(7); padding-left: govuk-spacing(8); line-height: govuk-spacing(7); @@ -129,3 +132,21 @@ } } + +.area-list-map-details { + + .govuk-details__summary { + display: block; + padding-top: govuk-spacing(1); + padding-bottom: govuk-spacing(1); + margin-top: 1px; + } + + .govuk-details__text { + padding: 0; + border: none; + border-bottom: 1px solid $border-colour; + margin-top: -1px; + } + +} diff --git a/app/assets/stylesheets/components/broadcast-message.scss b/app/assets/stylesheets/components/broadcast-message.scss index 4ccf1a423..d9e51f85f 100644 --- a/app/assets/stylesheets/components/broadcast-message.scss +++ b/app/assets/stylesheets/components/broadcast-message.scss @@ -1,33 +1,37 @@ -.broadcast-message-wrapper { +.broadcast-message { - position: relative; - width: 100%; - max-width: 464px; - box-sizing: border-box; - padding: govuk-spacing(9) govuk-spacing(3) govuk-spacing(3) govuk-spacing(3); - background: $panel-colour; - border: 2px solid $black; - border-radius: 5px; - white-space: normal; - margin: govuk-spacing(2) 0 govuk-spacing(4) 0; - clear: both; - word-wrap: break-word; + &-wrapper { + position: relative; + width: 100%; + max-width: 464px; + box-sizing: border-box; + padding: govuk-spacing(9) govuk-spacing(3) govuk-spacing(3) govuk-spacing(3); + background: $panel-colour; + box-shadow: inset 0 -1px 0 0 rgba(0, 0, 0, 0.05); + border-radius: 5px; + white-space: normal; + margin: govuk-spacing(2) 0 govuk-spacing(4) 0; + clear: both; + word-wrap: break-word; + } - &:before { - content: "Emergency alert"; + &-heading { display: block; - border-bottom: 2px solid $black; position: absolute; - top: govuk-spacing(2); + top: 0; left: 0; - padding: 2px govuk-spacing(3) govuk-spacing(2) 45px; + padding: govuk-spacing(2) + 1px govuk-spacing(3) (govuk-spacing(2) - 1px) 46px; width: 100%; box-sizing: border-box; font-weight: bold; - background: file-url('exclamation.svg'); - background-size: 20px; + background: $grey-1 file-url('exclamation.svg'); + color: $white; + background-size: 22px; background-repeat: no-repeat; - background-position: govuk-spacing(3) 3px; + background-position: govuk-spacing(3) 11px; + border-top-right-radius: 5px; + border-top-left-radius: 5px; + box-shadow: inset 0 -1px 0 0 rgba(0, 0, 0, 0.1); } } diff --git a/app/templates/views/broadcast/macros/area-map.html b/app/templates/views/broadcast/macros/area-map.html index 32b0ce8ee..196f4c447 100644 --- a/app/templates/views/broadcast/macros/area-map.html +++ b/app/templates/views/broadcast/macros/area-map.html @@ -1,7 +1,7 @@ {% macro map(broadcast_message) %} -
+