diff --git a/app/assets/stylesheets/components/area-list.scss b/app/assets/stylesheets/components/area-list.scss index 298330909..25bb283d0 100644 --- a/app/assets/stylesheets/components/area-list.scss +++ b/app/assets/stylesheets/components/area-list.scss @@ -1,7 +1,7 @@ .area-list { display: inline-block; - + &-item { display: inline-block; @@ -74,3 +74,48 @@ } } + +#map { + z-index: 50; + margin-bottom: govuk-spacing(4); +} + +.area-key { + + display: inline-block; + position: relative; + margin-right: govuk-spacing(3); + margin-bottom: govuk-spacing(5); + height: govuk-spacing(7); + padding-left: govuk-spacing(8); + line-height: govuk-spacing(7); + + &:before { + content: ""; + display: block; + position: absolute; + top: 0; + left: 0; + width: govuk-spacing(7); + height: govuk-spacing(7); + box-sizing: border-box; + margin-right: govuk-spacing(1); + } + + &--certain { + &:before { + border: 4px solid rgba($white, 0.1); + background: rgba($govuk-blue, 0.6); + box-shadow: inset 0 0 0 2px $black; + } + } + + &--likely { + &:before { + padding: 1px; + border: 2px solid $govuk-blue; + background: rgba($govuk-blue, 0.2); + } + } + +} diff --git a/app/templates/views/broadcast/partials/area-map-javascripts.html b/app/templates/views/broadcast/partials/area-map-javascripts.html index 5d1fcb37e..6111f6be2 100644 --- a/app/templates/views/broadcast/partials/area-map-javascripts.html +++ b/app/templates/views/broadcast/partials/area-map-javascripts.html @@ -5,10 +5,10 @@ {% for polygon in broadcast_message.simple_polygons.bleed.as_coordinate_pairs_lat_long %} polygons.push( L.polygon({{polygon}}, { - opacity: 0.5, - color: '#2B8CC4', // $light-blue - fillColor: '#2B8CC4', // $light-blue - fillOpacity: 0.2, + opacity: 0.8, + color: '#005ea5', // $light-blue + fillColor: '#005ea5', // $light-blue + fillOpacity: 0.15, weight: 2 }) ); @@ -17,10 +17,10 @@ {% for polygon in broadcast_message.simple_polygons.as_coordinate_pairs_lat_long %} polygons.push( L.polygon({{polygon}}, { - opacity: 0.1, - color: '#2B8CC4', // $black - fillColor: '#2B8CC4', // $light-blue - fillOpacity: 0.4, + opacity: 0.3, + color: '#005ea5', // $black + fillColor: '#005ea5', // $light-blue + fillOpacity: 0.3, weight: 1 }) ); diff --git a/app/templates/views/broadcast/partials/area-map-stylesheets.html b/app/templates/views/broadcast/partials/area-map-stylesheets.html index cb1333424..e007724a1 100644 --- a/app/templates/views/broadcast/partials/area-map-stylesheets.html +++ b/app/templates/views/broadcast/partials/area-map-stylesheets.html @@ -1,8 +1 @@ - diff --git a/app/templates/views/broadcast/preview-areas.html b/app/templates/views/broadcast/preview-areas.html index acc5dc2fa..83a231876 100644 --- a/app/templates/views/broadcast/preview-areas.html +++ b/app/templates/views/broadcast/preview-areas.html @@ -1,6 +1,6 @@ {% from "components/button/macro.njk" import govukButton %} {% from "components/page-header.html" import page_header %} -{% from "components/page-footer.html" import sticky_page_footer %} +{% from "components/page-footer.html" import page_footer %} {% extends "withnav_template.html" %} @@ -52,8 +52,16 @@ {% if broadcast_message.areas %}
+