Release 5.9.0 (#315)

* Feature/fsr 488 (#275) * testing gtag * google analytics * FSR-488: Move gtag event into core.js. * FSR-488: Fix linting errors. * FSR-488: Remove stageprompt.js. * Google analytics click events * FSR-488: Refactor map ga event processing. * FSR-488: Fix linting errors. * added last tags for POC * added final tags on links we want to watch * added check for each element * refactored due to linter * Capitalising from PR feedback * linting Co-authored-by: John Shields <[email protected]> * Feature/fsr 488 fix (#276) * fix found in testing * added check for button in JS * Feature/fsr 488 (#275) * testing gtag * google analytics * FSR-488: Move gtag event into core.js. * FSR-488: Fix linting errors. * FSR-488: Remove stageprompt.js. * Google analytics click events * FSR-488: Refactor map ga event processing. * FSR-488: Fix linting errors. * added last tags for POC * added final tags on links we want to watch * added check for each element * refactored due to linter * Capitalising from PR feedback * linting Co-authored-by: John Shields <[email protected]> * Feature/fsr 488 fix (#276) * fix found in testing * added check for button in JS * Feature/fsr 528 (#277) * Update Terms and Conditions page https://eaflood.atlassian.net/browse/FSR-528 * Made changes to terms & conditions * added querry onto qualtrics url (#278) Co-authored-by: Holly Adamson <[email protected]> * Feature/fsr 493 fix (#282) * fixes found in testing * added referer to 2nd feedback link * restored custom feedback and choose another location (#284) * Feature/fsr 302 (#285) * rainfall https://eaflood.atlassian.net/browse/FSR-302 * created initial route/view/unit test * updates css and mark up * pull rainfall data * rainfall model added * update to model * Added date to view and merged work * added unit tests for rainfall * adding graph to page * pushing up broken unit tests for other Dev to fix * fixed linting * update to webpack * Graph fixes * Webpack update for bar chart / ie11 * routes renamed, unit tests added and updated, long/lat added to model * fixed time format for rainfall page * make rainfall station is list clickable * added unit test for station the mesures in hrs * Added 1DP function for rainfall * unit test fixes for rainfall * removing code comments that are no longer needed * refactored rainfall code * refactored removing uneccasry rainfall properties * further refactoring of batch data function in rainfall model * amended id field on rainfall and added unit test * updated the cache time on the rainfall station and telemetry * added rainfall csv functionality and associated unit tests * added social links and metadata plus unit test * added nearby levels link to rainfall page * added error messages for rainfall and unit tests * padded rainfall data included in csv, hide rainfall graph if data error shown * created initial route/view/unit test * updates css and mark up * pull rainfall data * rainfall model added * update to model * Added date to view and merged work * adding graph to page * added unit tests for rainfall * fixed linting * Graph fixes * update to webpack * Webpack update for bar chart / ie11 * routes renamed, unit tests added and updated, long/lat added to model * fixed time format for rainfall page * make rainfall station is list clickable * added unit test for station the mesures in hrs * Added 1DP function for rainfall * unit test fixes for rainfall * removing code comments that are no longer needed * refactored rainfall code * refactored removing uneccasry rainfall properties * further refactoring of batch data function in rainfall model * amended id field on rainfall and added unit test * updated the cache time on the rainfall station and telemetry * added rainfall csv functionality and associated unit tests * added social links and metadata plus unit test * added nearby levels link to rainfall page * added error messages for rainfall and unit tests * padded rainfall data included in csv, hide rainfall graph if data error shown * added links on live map for rainfall Co-authored-by: NikiWycherley <[email protected]> Co-authored-by: danleech-defra <[email protected]> * fixed rainfall error message display issue (#286) * Feature/fsr 535 (#287) * added data journey click to click event items * refactor due to sonarcloud * refactor due to sonarcloud take 2 * added console error fix and some more event tags * linting issue * added events to checkboxes on maps * added last one on 5DF tabs * Feature/fsr 535 fix (#289) * adding some events that have changed since phase 1 * changed google event tag on TA page * Feature/fsr 302 fix2 (#290) * multiple small fixes to fix issues found in testing see FSR-302 * added check on unit test to ensure no minute data when hourly telemetry * Feature/fsr 302 fix3 (#291) * fix to event tagging * fixed letter case problem * Feature/fsr 535 fix3 (#292) * one last Gtag change * added last gtag * Add rate limiting to station pages - feature/FSR-486 (#294) * FSR-486: Add hapi-rate-limit plugin. * FSR-486: Change rate limit envvar validation. * FSR-486: Add rate-limit plugin unit test. * FSR-486: Fix rate-limit unit test. * FSR-486: Add unit test fror status code 429. * FSR-486: Update rate-limit unit test. * FSR-486: Update readme for rate limit environment variables. * FSR-486: enable rate limiting on all routes apart from "/assets". * FSR-486: Remove redundant hapi-rate-limit plugin option. * FSR-486: Update rate-limit plugin unit tests. * FSR-486: Add config.js unit test. * FSR-486: Extend rate-limit plugin tests. * FSR-486: Change rate-limit configuration to test user only. * FSR-486: Restrict rate limiting to station pages. * FSR-486: Revert to userLimit from userPathLimit. * FSR-486: Add rate limiting content to terms-and-conditions page. * FSR-486: Text and styling changes for rate limiting content. Co-authored-by: John Shields <[email protected]> * Feature/fsr 302 fix4 (#295) * fixing nearby levels link on rainfall pages * added nearby levels rainfall test and data * fixed sonarcloud issues * added further unit test * added post unit test for nearby rainfall * Release 5.7.0 version update and notes. (#296) Co-authored-by: John Shields <[email protected]> * capitalize fix and update to flood outlook tooltip (#298) * fixed rainfall csv bug (#299) * created fix to handle capitalisation back end not with nunjucks (#301) * upgrading npm dependencies (#305) * upgrading npm dependencies * updated node version in readme * Feature/fsr 542 (#306) * Subtitle on river list page updated * Update to rainfall station tooltip * Update to linter * Fixing code smell * Fixing code smell Co-authored-by: John Shields <[email protected]> * Feature/fsr 540 fix2 (#304) * refactored capitalise in outlook tabs * edited FGS test file ref * sonarcloud refactor * Feature/fsr 529 (#307) * reject cookies button and event listener added * cookie reject added * updated tests * Feature/fsr 529 fix (#308) * reject cookies button and event listener added * cookie reject added * updated tests * reject cookies button and event listener added * cookie reject added * updated tests * fixed cookie issue * Feature/fsr 426 (#310) * privacy notice content update https://eaflood.atlassian.net/browse/FSR-426 * updateded content for Privacy page * Feature/fsr 559 (#309) * Map rainfall icons repalced * Rainfall key icon replaced * New icons for rainfall wet and dry * Updated icons stations page list * icons in list now updating, added unit test Co-authored-by: danleech-defra <[email protected]> Co-authored-by: Holly Adamson <[email protected]> * Feature/fsr 426 fix (#312) * feature/FSR-426 Fix * added changes found in review * Feature/fsr 426 fix2 (#314) * feature/FSR-426-fix2 * updated email to a href * Attemt to fix commits behind master issue. * Release 5.9.0: Preparation Co-authored-by: nikiwycherley <[email protected]> Co-authored-by: John Shields <[email protected]> Co-authored-by: hollyadamson <[email protected]> Co-authored-by: Holly Adamson <[email protected]> Co-authored-by: Lee Gordon <[email protected]> Co-authored-by: danleech-defra <[email protected]> Co-authored-by: LeeGordon83 <[email protected]>
DEFRA · May 23, 2022 · 1fe7b8c · 1fe7b8c
1 parent a9e159c
commit 1fe7b8c
Show file tree

Hide file tree

Showing 17 changed files with 213 additions and 148 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "flood-app",
-  "version": "5.8.0",
+  "version": "5.9.0",
   "description": "Flood risk app",
   "main": "index.js",
   "repository": "github:defra/flood-app",

diff --git a/release-docs/CFF-5.9.0.txt b/release-docs/CFF-5.9.0.txt
@@ -0,0 +1,38 @@
+# Check for flooding 5.9.0 Wednesday 25th May 2022
+
+# Release
+
+https://eaflood.atlassian.net/projects/FSR/versions/15906/tab/release-report-all-issues
+
+# Tickets
+
+FSR-583 - TA Area update May 2022
+
+FSR-558 - Update station list
+
+FSR-559 - Update Rainfall icons 
+
+FSR-426 - Footer - Privacy Notice
+
+# Instructions
+
+!Important for webops
+
+This release includes 2 data updates: target area and the river-station data set
+
+Steps
+
+1 - Execute LFW_{STAGE}_99_LOAD_RIVERS
+
+2 - Update LFW_{STAGE}_99_LOAD_FLOOD_ALERT_AREAS jenkins job with the following properties update for the updated database name for production:
+
+DB_NAME=floodprdg
+###### OR ########
+DB_NAME=floodprdb
+
+3 - Execute LFW_{STAGE}_99_LOAD_FLOOD_ALERT_AREAS  ##NOTE if above property update not made this job will fail.
+
+4 - Execute LFW_{stage}_04_UPDATE_FLOOD_APP_AND_SERVICE_PIPELINE
+
+Execute smoke tests and forward results
+
diff --git a/server/models/views/river-and-sea-levels.js b/server/models/views/river-and-sea-levels.js
@@ -44,6 +44,7 @@ class ViewModel {
         station.oneHourTotal = this.formatValue(station, station.one_hr_total)
         station.sixHourTotal = this.formatValue(station, station.six_hr_total)
         station.dayTotal = this.formatValue(station, station.day_total)
+        station.valueState = parseFloat(station.dayTotal) > 0 ? 'wet' : station.valueState
         station.external_name = this.formatName(station.external_name)
       }
       station.cols = this.getStationColumns(station)

diff --git a/server/src/images/map-symbols-2x.png b/server/src/images/map-symbols-2x.png
diff --git a/server/src/images/map-symbols-2x.png-old b/server/src/images/map-symbols-2x.png-old
diff --git a/server/src/js/components/map/live.js b/server/src/js/components/map/live.js
@@ -156,16 +156,7 @@ function LiveMap (mapId, options) {
         }
       } else if (props.type === 'R') {
         // Rainfall
-        state = 'rain'
-        if (props.one_hr_total) {
-          if (props.one_hr_total > 4) {
-            state = 'rainHeavy'
-          } else if (props.one_hr_total > 0.5) {
-            state = 'rainModerate'
-          } else if (props.one_hr_total > 0) {
-            state = 'rainLight'
-          }
-        }
+        state = props.day_total && props.day_total > 0 ? 'rain' : 'rainDry'
       }
       // WebGl: Feature properties must be strings or numbers
       feature.set('state', state)

diff --git a/server/src/js/components/map/styles.js b/server/src/js/components/map/styles.js
@@ -119,16 +119,10 @@ window.flood.maps.styles = {
     const isSelected = feature.get('isSelected')
     const isSymbol = resolution <= window.flood.maps.liveMaxBigZoom
     switch (state) {
-      case 'rainHeavy':
-        return isSelected ? (isSymbol ? styleCache.rainHeavySelected : styleCache.measurementAlertSelected) : (isSymbol ? styleCache.rainHeavy : styleCache.measurementAlert)
-      case 'rainModerate':
-        return isSelected ? (isSymbol ? styleCache.rainModerateSelected : styleCache.measurementSelected) : (isSymbol ? styleCache.rainModerate : styleCache.measurement)
-      case 'rainLight':
-        return isSelected ? (isSymbol ? styleCache.rainLightSelected : styleCache.measurementSelected) : (isSymbol ? styleCache.rainLight : styleCache.measurement)
-      case 'rainError':
-        return isSelected ? (isSymbol ? styleCache.rainErrorSelected : styleCache.measurementErrorSelected) : (isSymbol ? styleCache.rainError : styleCache.measurementError)
       case 'rain':
         return isSelected ? (isSymbol ? styleCache.rainSelected : styleCache.measurementSelected) : (isSymbol ? styleCache.rain : styleCache.measurement)
+      case 'rainDry':
+        return isSelected ? (isSymbol ? styleCache.rainDrySelected : styleCache.measurementNoneSelected) : (isSymbol ? styleCache.rainDry : styleCache.measurementNone)
     }
   },
 
@@ -461,23 +455,19 @@ const styleCache = {
   groundError: createIconStyle({ offset: [0, 1200], zIndex: 1 }),
   groundErrorSelected: createIconStyle({ offset: [100, 1200], zIndex: 10 }),
   // Rainfall
-  rain: createIconStyle({ offset: [0, 1600], zIndex: 3 }),
-  rainSelected: createIconStyle({ offset: [100, 1600], zIndex: 10 }),
-  rainHeavy: createIconStyle({ offset: [0, 1300], zIndex: 3 }),
-  rainHeavySelected: createIconStyle({ offset: [100, 1300], zIndex: 10 }),
-  rainModerate: createIconStyle({ offset: [0, 1400], zIndex: 3 }),
-  rainModerateSelected: createIconStyle({ offset: [100, 1400], zIndex: 10 }),
-  rainLight: createIconStyle({ offset: [0, 1500], zIndex: 3 }),
-  rainLightSelected: createIconStyle({ offset: [100, 1500], zIndex: 10 }),
-  rainError: createIconStyle({ offset: [0, 1700], zIndex: 3 }),
-  rainErrorSelected: createIconStyle({ offset: [100, 1700], zIndex: 10 }),
+  rain: createIconStyle({ offset: [0, 1300], zIndex: 3 }),
+  rainSelected: createIconStyle({ offset: [100, 1300], zIndex: 10 }),
+  rainDry: createIconStyle({ offset: [0, 1400], zIndex: 3 }),
+  rainDrySelected: createIconStyle({ offset: [100, 1400], zIndex: 10 }),
   // Measurements
-  measurement: createIconStyle({ offset: [0, 1900], zIndex: 2 }),
-  measurementSelected: createIconStyle({ offset: [100, 1900], zIndex: 10 }),
-  measurementAlert: createIconStyle({ offset: [0, 1800], zIndex: 3 }),
-  measurementAlertSelected: createIconStyle({ offset: [100, 1800], zIndex: 10 }),
-  measurementError: createIconStyle({ offset: [0, 2000], zIndex: 1 }),
-  measurementErrorSelected: createIconStyle({ offset: [100, 2000], zIndex: 10 }),
+  measurementAlert: createIconStyle({ offset: [0, 1600], zIndex: 3 }),
+  measurementAlertSelected: createIconStyle({ offset: [100, 1600], zIndex: 10 }),
+  measurement: createIconStyle({ offset: [0, 1700], zIndex: 2 }),
+  measurementSelected: createIconStyle({ offset: [100, 1700], zIndex: 10 }),
+  measurementError: createIconStyle({ offset: [0, 1800], zIndex: 1 }),
+  measurementErrorSelected: createIconStyle({ offset: [100, 1800], zIndex: 10 }),
+  measurementNone: createIconStyle({ offset: [0, 1900], zIndex: 1 }),
+  measurementNoneSelected: createIconStyle({ offset: [100, 1900], zIndex: 10 }),
   text: createTextStyle(),
   textLarge: createTextStyle({ font: 'Bold 16px GDS Transport, Arial, sans-serif', offsetY: -13, radius: 3 })
 }
diff --git a/server/src/js/core.js b/server/src/js/core.js
@@ -124,11 +124,14 @@ Array.prototype.forEach.call(jsElements, function (element) {
 if (cookieButtons) {
   const settingsButton = document.getElementById('cookie-settings')
   const acceptButton = document.createElement('button')
+  const rejectButton = document.createElement('button')
+
+  // Accept button
   acceptButton.className = 'defra-cookie-banner__button-accept'
   acceptButton.innerText = 'Accept analytics cookies'
   cookieButtons.insertBefore(acceptButton, cookieButtons.childNodes[0])
 
-  // First button in banner
+  // First button in banner (Accept)
   acceptButton.addEventListener('click', function (e) {
     e.preventDefault()
     window.flood.utils.setCookie('set_cookie_usage', 'true', 30)
@@ -138,12 +141,27 @@ if (cookieButtons) {
 
     document.getElementById('cookie-message').style.display = 'none'
     document.getElementById('cookie-confirmation-type').innerText = 'accepted'
+    document.getElementById('cookie-confirmation').style.display = ''
   })
 
-  // Second button in banner
-  settingsButton.addEventListener('click', function (e) {
+  // Reject Button
+  rejectButton.className = 'defra-cookie-banner__button-reject'
+  rejectButton.innerText = 'Reject analytics cookies'
+  cookieButtons.insertBefore(rejectButton, cookieButtons.childNodes[1])
+
+  // Second button in banner (Reject)
+  rejectButton.addEventListener('click', function (e) {
     e.preventDefault()
     window.flood.utils.setCookie('seen_cookie_message', 'true', 30)
+
+    document.getElementById('cookie-message').style.display = 'none'
+    document.getElementById('cookie-confirmation-type').innerText = 'rejected'
+    document.getElementById('cookie-confirmation').style.display = ''
+  })
+
+  // Third button in banner (Settings)
+  settingsButton.addEventListener('click', function (e) {
+    e.preventDefault()
     window.location.href = settingsButton.getAttribute('href')
   })
 

diff --git a/server/src/sass/components/_cookies.scss b/server/src/sass/components/_cookies.scss
@@ -22,12 +22,6 @@
 .defra-cookie-banner__confirmation {
   @extend .defra-cookie-banner__message;
   padding:5px 0px;
-  p {
-    @include mq ($from: tablet) {
-      max-width: 85%;
-      margin-bottom:0px;
-    }
-  }
 }
 
 .defra-cookie-banner__button-accept,
@@ -54,12 +48,8 @@
 }
 
 .defra-cookie-banner__button-hide {
-  @extend .defra-button-text;
-  @include mq ($from: tablet) {
-    position:absolute;
-    top:5px;
-    right:0px;
-  }
+  @extend .govuk-button;
+  margin-bottom: 10px;
 }
 
 @include govuk-media-query($media-type: print) {

diff --git a/server/src/sass/components/_flood-list.scss b/server/src/sass/components/_flood-list.scss
@@ -146,9 +146,14 @@
     &--C-error &__title:after {
         background-image: svg-url('<svg width="32" height="32" viewBox="0 0 32 32" style="fill-rule:evenodd;clip-rule:evenodd;"><circle cx="16" cy="16" r="12.5" style="fill:#fff;stroke:#fff;stroke-width:1px;"/><circle cx="16" cy="16" r="12" style="fill:#fff;"/><path d="M16,4C22.623,4 28,9.377 28,16C28,22.623 22.623,28 16,28C9.377,28 4,22.623 4,16C4,9.377 9.377,4 16,4ZM16,6C21.519,6 26,10.481 26,16C26,21.519 21.519,26 16,26C10.481,26 6,21.519 6,16C6,10.481 10.481,6 16,6Z" style="fill:#b1b4b6;"/><path d="M10.697,11.475C11.09,11.864 11.583,12.207 12.464,12.207C14.256,12.207 14.175,10.743 16,10.743C17.825,10.743 17.71,12.207 19.536,12.207C20.362,12.207 20.776,11.907 21.303,11.475" style="fill:none;stroke:#b1b4b6;stroke-width:1.5px;"/><path d="M10.697,16C11.09,16.389 11.583,16.732 12.464,16.732C14.256,16.732 14.175,15.268 16,15.268C17.825,15.268 17.71,16.732 19.536,16.732C20.362,16.732 20.776,16.432 21.303,16" style="fill:none;stroke:#b1b4b6;stroke-width:1.5px;"/><path d="M10.697,20.525C11.09,20.914 11.583,21.257 12.464,21.257C14.256,21.257 14.175,19.793 16,19.793C17.825,19.793 17.71,21.257 19.536,21.257C20.362,21.257 20.776,20.957 21.303,20.525" style="fill:none;stroke:#b1b4b6;stroke-width:1.5px;"/></svg>');
     }
+    // New rainfall icons wet and dry
     &--R &__title:after {
         background-image: svg-url('<svg width="32" height="32" viewBox="0 0 32 32" style="fill-rule:evenodd;clip-rule:evenodd;"><circle cx="16" cy="16" r="12.5" style="fill:#fff;stroke:#fff;stroke-width:1px;"/><circle cx="16" cy="16" r="12" style="fill:#fff;"/><path d="M16,4C22.623,4 28,9.377 28,16C28,22.623 22.623,28 16,28C9.377,28 4,22.623 4,16C4,9.377 9.377,4 16,4ZM16,6C21.519,6 26,10.481 26,16C26,21.519 21.519,26 16,26C10.481,26 6,21.519 6,16C6,10.481 10.481,6 16,6Z" style="fill:#5694ca;"/><path d="M11.428,13.797C11.62,13.797 11.979,13.829 11.979,13.8C11.979,11.868 13.547,10.3 15.479,10.3C16.966,10.3 18.238,11.23 18.744,12.539C19.071,12.383 19.436,12.295 19.822,12.295C21.203,12.295 22.324,13.417 22.324,14.798C22.324,16.179 21.203,17.3 19.822,17.3L11.428,17.3C10.461,17.3 9.676,16.515 9.676,15.548C9.676,14.582 10.461,13.797 11.428,13.797Z" style="fill:#5694ca;"/></svg>');
     }
+    &--R-wet &__title:after {
+        background-image: svg-url('<svg width="32" height="32" viewBox="0 0 32 32"><circle cx="16" cy="16" r="12.5" style="fill:#5694CA;stroke:#fff;stroke-width:1px;"/><path d="M11.428,13.832C11.62,13.832 11.979,13.863 11.979,13.835C11.979,11.903 13.547,10.335 15.479,10.335C16.966,10.335 18.238,11.264 18.744,12.574C19.071,12.418 19.436,12.33 19.822,12.33C21.203,12.33 22.324,13.451 22.324,14.833C22.324,16.214 21.203,17.335 19.822,17.335L11.428,17.335C10.461,17.335 9.676,16.55 9.676,15.583C9.676,14.616 10.461,13.832 11.428,13.832Z" style="fill:#fff;"/><path d="M12.5,19.665L12.5,21.665" style="fill:none;stroke:#fff;stroke-width:1.5px;"/><path d="M16,19.665L16,21.665" style="fill:none;stroke:#fff;stroke-width:1.5px;"/><path d="M19.5,19.665L19.5,21.665" style="fill:none;stroke:#fff;stroke-width:1.5px;"/></svg>');
+    }
+    // Current icons to be removed
     &--R-heavy &__title:after {
         background-image: svg-url('<svg width="32" height="32" viewBox="0 0 32 32"><circle cx="16" cy="16" r="12.5" style="fill:#003078;stroke:#fff;stroke-width:1px;"/><path d="M11.428,13.832C11.62,13.832 11.979,13.863 11.979,13.835C11.979,11.903 13.547,10.335 15.479,10.335C16.966,10.335 18.238,11.264 18.744,12.574C19.071,12.418 19.436,12.33 19.822,12.33C21.203,12.33 22.324,13.451 22.324,14.833C22.324,16.214 21.203,17.335 19.822,17.335L11.428,17.335C10.461,17.335 9.676,16.55 9.676,15.583C9.676,14.616 10.461,13.832 11.428,13.832Z" style="fill:#fff;"/><path d="M12.5,19.665L12.5,21.665" style="fill:none;stroke:#fff;stroke-width:1.5px;"/><path d="M16,19.665L16,21.665" style="fill:none;stroke:#fff;stroke-width:1.5px;"/><path d="M19.5,19.665L19.5,21.665" style="fill:none;stroke:#fff;stroke-width:1.5px;"/></svg>');
     }

diff --git a/server/src/sass/components/map/_map-key.scss b/server/src/sass/components/map/_map-key.scss
@@ -114,7 +114,7 @@
     background-image: svg-url('<svg width="32" height="32" viewBox="0 0 32 32"><circle cx="16" cy="16" r="12.5" style="fill:#5694ca;stroke:#fff;stroke-width:1px;"/><path d="M8.5,14.55C9.431,14.167 9.68,13.25 11.126,13.25C12.951,13.25 12.836,14.713 14.661,14.713C16.453,14.713 16.371,13.25 18.197,13.25C20.022,13.25 19.907,14.713 21.732,14.713C22.558,14.713 22.973,14.413 23.5,13.982" style="fill:none;stroke:#fff;stroke-width:1.5px;stroke-linecap:round;stroke-linejoin:miter;"/><rect x="15.5" y="10.25" width="1" height="11.5" style="fill:#fff;"/><rect x="10.5" y="10.25" width="11" height="1" style="fill:#fff;"/></svg>');
   }
   &--rainfall {
-    background-image: svg-url('<svg width="32" height="32" viewBox="0 0 32 32"><circle cx="16" cy="16" r="12.5" style="fill:#5694ca;stroke:#fff;stroke-width:1px;"/><path d="M11.428,13.832C11.62,13.832 11.979,13.863 11.979,13.835C11.979,11.903 13.547,10.335 15.479,10.335C16.966,10.335 18.238,11.264 18.744,12.574C19.071,12.418 19.436,12.33 19.822,12.33C21.203,12.33 22.324,13.451 22.324,14.833C22.324,16.214 21.203,17.335 19.822,17.335L11.428,17.335C10.461,17.335 9.676,16.55 9.676,15.583C9.676,14.616 10.461,13.832 11.428,13.832Z" style="fill:#fff;"/><path d="M14.25,19.665L14.25,21.665" style="fill:none;stroke:#fff;stroke-width:1.5px;stroke-linecap:round;stroke-linejoin:miter;"/><path d="M17.75,19.665L17.75,21.665" style="fill:none;stroke:#fff;stroke-width:1.5px;stroke-linecap:round;stroke-linejoin:miter;"/></svg>');
+    background-image: svg-url('<svg width="32" height="32" viewBox="0 0 32 32"><circle cx="16" cy="16" r="12.5" style="fill:#5694ca;stroke:#fff;stroke-width:1px;"/><path d="M11.428,13.832c0.192,0 0.551,0.031 0.551,0.003c-0,-1.932 1.568,-3.5 3.5,-3.5c1.487,0 2.759,0.929 3.265,2.239c0.327,-0.156 0.692,-0.244 1.078,-0.244c1.381,-0 2.502,1.121 2.502,2.503c0,1.381 -1.121,2.502 -2.502,2.502l-8.394,0c-0.967,0 -1.752,-0.785 -1.752,-1.752c0,-0.967 0.785,-1.751 1.752,-1.751Z" style="fill:#fff;fill-rule:nonzero;"/><g><path d="M12.5,19.665l0,2" style="fill:none;fill-rule:nonzero;stroke:#fff;stroke-width:1.5px;stroke-linecap:round;"/><path d="M16,19.665l0,2" style="fill:none;fill-rule:nonzero;stroke:#fff;stroke-width:1.5px;stroke-linecap:round;"/><path d="M19.5,19.665l0,2" style="fill:none;fill-rule:nonzero;stroke:#fff;stroke-width:1.5px;stroke-linecap:round;"/></g></svg>');
   }
   // Outlook
   &--high {

diff --git a/server/views/partials/cookie-banner.html b/server/views/partials/cookie-banner.html
@@ -15,7 +15,7 @@ <h2 class="govuk-heading-m">Cookies on Check for flooding</h2>
     <div class="defra-cookie-banner__confirmation" id="cookie-confirmation" style="display:none">
       <p>You’ve <span id="cookie-confirmation-type">accepted</span> analytics cookies. You can <a href="/cookies">change your cookie settings</a> at any time.</p>
       <button class="defra-cookie-banner__button-hide" id="cookie-hide" data-module="govuk-button">
-        Hide
+        Hide this message
       </button>
     </div>
   </div>