diff --git a/app/assets/stylesheets/components/broadcast-message.scss b/app/assets/stylesheets/components/broadcast-message.scss index 4251922b0..d9e51f85f 100644 --- a/app/assets/stylesheets/components/broadcast-message.scss +++ b/app/assets/stylesheets/components/broadcast-message.scss @@ -1,20 +1,21 @@ -.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; - 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; + &-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; position: absolute; top: 0; diff --git a/requirements-app.txt b/requirements-app.txt index 555515483..01532ed9c 100644 --- a/requirements-app.txt +++ b/requirements-app.txt @@ -24,7 +24,7 @@ Shapely==1.7.1 awscli-cwlogs>=1.4,<1.5 itsdangerous==1.1.0 -git+https://github.com/alphagov/notifications-utils.git@42.2.1#egg=notifications-utils==42.2.1 +git+https://github.com/alphagov/notifications-utils.git@42.2.2#egg=notifications-utils==42.2.2 git+https://github.com/alphagov/govuk-frontend-jinja.git@v0.5.1-alpha#egg=govuk-frontend-jinja==0.5.1-alpha # gds-metrics requires prometheseus 0.2.0, override that requirement as later versions bring significant performance gains diff --git a/requirements.txt b/requirements.txt index a29cf753b..25fad9075 100644 --- a/requirements.txt +++ b/requirements.txt @@ -26,7 +26,7 @@ Shapely==1.7.1 awscli-cwlogs>=1.4,<1.5 itsdangerous==1.1.0 -git+https://github.com/alphagov/notifications-utils.git@42.2.1#egg=notifications-utils==42.2.1 +git+https://github.com/alphagov/notifications-utils.git@42.2.2#egg=notifications-utils==42.2.2 git+https://github.com/alphagov/govuk-frontend-jinja.git@v0.5.1-alpha#egg=govuk-frontend-jinja==0.5.1-alpha # gds-metrics requires prometheseus 0.2.0, override that requirement as later versions bring significant performance gains @@ -34,10 +34,10 @@ prometheus-client==0.8.0 gds-metrics==0.2.4 ## The following requirements were added by pip freeze: -awscli==1.18.154 +awscli==1.18.157 bleach==3.1.4 boto3==1.10.38 -botocore==1.18.13 +botocore==1.18.16 cachetools==4.1.0 certifi==2020.6.20 chardet==3.0.4 diff --git a/tests/app/main/views/test_broadcast.py b/tests/app/main/views/test_broadcast.py index 3ee54a40f..bba981f2f 100644 --- a/tests/app/main/views/test_broadcast.py +++ b/tests/app/main/views/test_broadcast.py @@ -968,9 +968,16 @@ def test_preview_broadcast_message_page( 'Scotland', ] + assert normalize_spaces( + page.select_one('h2.broadcast-message-heading').text + ) == ( + 'Emergency alert' + ) + assert normalize_spaces( page.select_one('.broadcast-message-wrapper').text ) == ( + 'Emergency alert ' 'This is a test' ) diff --git a/tests/app/main/views/test_templates.py b/tests/app/main/views/test_templates.py index afd12d037..8dc5daeb1 100644 --- a/tests/app/main/views/test_templates.py +++ b/tests/app/main/views/test_templates.py @@ -784,6 +784,7 @@ def test_view_broadcast_template( ) == ( normalize_spaces(page.select_one('.broadcast-message-wrapper').text) ) == ( + 'Emergency alert ' 'This is a test' )