diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ccd3034c..b8312543a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,10 +8,32 @@ :wrench: **Fixes** +- Remove the boolean `showNav`, `showSearch` and `transactional` options from the header component. Respective parts of the header are now shown if values for `primaryLinks`, `search` or `transactionalService` options are provided. Additionally, the `searchAction` option is renamed `search.action` and the `searchInputName` option is renamed `search.name`. Finally, the label, button and placeholder text for the search input can be updated using the new `search.visuallyHiddenLabel`, `search.visuallyHiddenButton` and `search.placeholder` options. ([PR 996](https://github.com/nhsuk/nhsuk-frontend/pull/996)) - Fix navigation items not flowing into the overflow drop-down menu on desktop ([PR 1062](https://github.com/nhsuk/nhsuk-frontend/pull/1062)) - Update header styles so that `.nhsuk-header__search-no-nav` class is no longer needed when header contains a search field but no navigation ([PR 1046](https://github.com/nhsuk/nhsuk-frontend/pull/1046)) - Update navigation list item padding to vertically align navigation items with width container ([PR 1033](https://github.com/nhsuk/nhsuk-frontend/pull/1033)) +:boom: **Breaking changes** + +- The NHS logo in the header has been updated so that it can have higher contrast when focused. ([PR 1047]([https://github.com/nhsuk/nhsuk-frontend/pull/1047])) + + Previously the logo used the following SVG: + + ```svg + + ``` + + This has been updated to use the following SVG: + + ```svg + + ``` + ## 9.0.1 - 9 October 2024 :wrench: **Fixes** diff --git a/app/_templates/page.njk b/app/_templates/page.njk index 082d1d0e5..20186d6ab 100644 --- a/app/_templates/page.njk +++ b/app/_templates/page.njk @@ -38,11 +38,8 @@ }) }} {{ header({ - "showNav": "false", - "showSearch": "false", "homeHref": baseUrl - }) - }} + }) }} {% endblock %} diff --git a/app/components/all.njk b/app/components/all.njk index 4155ce37a..07bf58089 100644 --- a/app/components/all.njk +++ b/app/components/all.njk @@ -36,8 +36,7 @@ }) }} {{ header({ - "showNav": "true", - "showSearch": "true", + "search": true, "primaryLinks": [ { "url" : "https://www.nhs.uk/conditions", diff --git a/app/components/header/header-logo.njk b/app/components/header/header-logo.njk index 800210b56..aa44f63fd 100644 --- a/app/components/header/header-logo.njk +++ b/app/components/header/header-logo.njk @@ -5,10 +5,6 @@ {% block body %} - {{ header({ - "showNav": "false", - "showSearch": "false" - }) - }} + {{ header() }} {% endblock %} diff --git a/app/components/header/header-navigation.njk b/app/components/header/header-navigation.njk index fb3652aa1..609ab5842 100644 --- a/app/components/header/header-navigation.njk +++ b/app/components/header/header-navigation.njk @@ -6,8 +6,6 @@ {% block body %} {{ header({ - "showNav": "true", - "showSearch": "false", "primaryLinks": [ { "url" : "https://www.nhs.uk/conditions", diff --git a/app/components/header/header-org-white-nav.njk b/app/components/header/header-org-white-nav.njk index c0d27af32..7c70723b5 100644 --- a/app/components/header/header-org-white-nav.njk +++ b/app/components/header/header-org-white-nav.njk @@ -6,8 +6,6 @@ {% block body %} {{ header({ - "showNav": "true", - "showSearch": "true", "classes": "nhsuk-header--white nhsuk-header--white-nav", "organisation": { "name": "Anytown Anyplace", @@ -35,7 +33,10 @@ 'url' : '#', 'label' : 'Our research' } - ] + ], + "search": { + "visuallyHiddenLabel": "Search the Anytown Anyplace Anywhere website" + } }) }} diff --git a/app/components/header/header-org-white.njk b/app/components/header/header-org-white.njk index 50c155ce0..e80591c12 100644 --- a/app/components/header/header-org-white.njk +++ b/app/components/header/header-org-white.njk @@ -6,8 +6,6 @@ {% block body %} {{ header({ - "showNav": "true", - "showSearch": "true", "classes": "nhsuk-header--white", "organisation": { "name": "Anytown Anyplace", @@ -35,7 +33,10 @@ 'url' : '#', 'label' : 'Our research' } - ] + ], + "search": { + "visuallyHiddenLabel": "Search the Anytown Anyplace Anywhere website" + } }) }} diff --git a/app/components/header/header-org.njk b/app/components/header/header-org.njk index 134cca172..125acaf40 100644 --- a/app/components/header/header-org.njk +++ b/app/components/header/header-org.njk @@ -6,8 +6,6 @@ {% block body %} {{ header({ - "showNav": "true", - "showSearch": "true", "organisation": { "name": "Anytown Anyplace", "split": "Anywhere", @@ -34,7 +32,10 @@ 'url' : '#', 'label' : 'Our research' } - ] + ], + "search": { + "visuallyHiddenLabel": "Search the Anytown Anyplace Anywhere website" + } }) }} diff --git a/app/components/header/header-search.njk b/app/components/header/header-search.njk index 3eace51f0..e8be4c320 100644 --- a/app/components/header/header-search.njk +++ b/app/components/header/header-search.njk @@ -6,35 +6,7 @@ {% block body %} {{ header({ - "showNav": "false", - "showSearch": "true", - "primaryLinks": [ - { - "url" : "https://www.nhs.uk/conditions", - "label" : "Health A-Z" - }, - { - 'url' : 'https://www.nhs.uk/live-well/', - 'label' : 'Live Well' - }, - { - 'url' : 'https://www.nhs.uk/mental-health/', - 'label' : 'Mental health' - }, - { - 'url' : 'https://www.nhs.uk/conditions/social-care-and-support/', - 'label' : 'Care and support' - }, - { - 'url' : 'https://www.nhs.uk/pregnancy/', - 'label' : 'Pregnancy' - }, - { - 'url' : 'https://www.nhs.uk/nhs-services/', - 'label' : 'NHS services' - } - ] - }) - }} + "search": true + }) }} {% endblock %} diff --git a/app/components/header/header-service-name-with-nav.njk b/app/components/header/header-service-name-with-nav.njk index d4680c3e6..0ea14124f 100644 --- a/app/components/header/header-service-name-with-nav.njk +++ b/app/components/header/header-service-name-with-nav.njk @@ -9,8 +9,9 @@ "service": { "name": "Digital service manual" }, - "showNav": "true", - "showSearch": "true", + "search": { + "visuallyHiddenLabel": "Search the NHS digital service manual" + }, "primaryLinks": [ { "url" : "#", diff --git a/app/components/header/header-service-name.njk b/app/components/header/header-service-name.njk index 8c5149e50..a5c1a6559 100644 --- a/app/components/header/header-service-name.njk +++ b/app/components/header/header-service-name.njk @@ -6,10 +6,9 @@ {% block body %} {{ header({ - "service": { - "name": "Prototype kit" - } - }) - }} + "service": { + "name": "Prototype kit" + } + }) }} {% endblock %} diff --git a/app/components/header/header-transactional-service-name.njk b/app/components/header/header-transactional-service-name.njk index 13038875d..ed53ebc4b 100644 --- a/app/components/header/header-transactional-service-name.njk +++ b/app/components/header/header-transactional-service-name.njk @@ -6,12 +6,9 @@ {% block body %} {{ header({ - "transactionalService": { - "name": "Find your NHS number" - }, - "showNav": "false", - "showSearch": "false" - }) - }} + "transactionalService": { + "name": "Find your NHS number" + } + }) }} {% endblock %} diff --git a/app/components/header/index.njk b/app/components/header/index.njk index 3754df755..857b22385 100644 --- a/app/components/header/index.njk +++ b/app/components/header/index.njk @@ -6,35 +6,33 @@ {% block body %} {{ header({ - "showNav": "true", - "showSearch": "true", - "primaryLinks": [ - { - "url" : "https://www.nhs.uk/conditions", - "label" : "Health A-Z" - }, - { - 'url' : 'https://www.nhs.uk/live-well/', - 'label' : 'Live Well' - }, - { - 'url' : 'https://www.nhs.uk/mental-health/', - 'label' : 'Mental health' - }, - { - 'url' : 'https://www.nhs.uk/conditions/social-care-and-support/', - 'label' : 'Care and support' - }, - { - 'url' : 'https://www.nhs.uk/pregnancy/', - 'label' : 'Pregnancy' - }, - { - 'url' : 'https://www.nhs.uk/nhs-services/', - 'label' : 'NHS services' - } - ] - }) - }} + "search": true, + "primaryLinks": [ + { + "url" : "https://www.nhs.uk/conditions", + "label" : "Health A-Z" + }, + { + 'url' : 'https://www.nhs.uk/live-well/', + 'label' : 'Live Well' + }, + { + 'url' : 'https://www.nhs.uk/mental-health/', + 'label' : 'Mental health' + }, + { + 'url' : 'https://www.nhs.uk/conditions/social-care-and-support/', + 'label' : 'Care and support' + }, + { + 'url' : 'https://www.nhs.uk/pregnancy/', + 'label' : 'Pregnancy' + }, + { + 'url' : 'https://www.nhs.uk/nhs-services/', + 'label' : 'NHS services' + } + ] + }) }} {% endblock %} diff --git a/packages/components/header/README.md b/packages/components/header/README.md index 2952f86d8..86b633ded 100644 --- a/packages/components/header/README.md +++ b/packages/components/header/README.md @@ -22,7 +22,7 @@ compiled JavaScript for all components `nhsuk.min.js` or the individual componen
@@ -47,10 +47,9 @@ compiled JavaScript for all components `nhsuk.min.js` or the individual componen
  • Health A-Z -
    • -
  • +
  • - -
    • +
    +
    +
    -{% endif -%} - {# close nhsuk-header__container #} +{%- endif %} + -{% if showNav == "true" and params.primaryLinks %} +{%- if params.primaryLinks and params.primaryLinks.length > 0 %}
    -{% endif -%} +{%- endif %} diff --git a/packages/core/styles/_icons.scss b/packages/core/styles/_icons.scss index a05fa7ceb..c96788a7e 100644 --- a/packages/core/styles/_icons.scss +++ b/packages/core/styles/_icons.scss @@ -12,7 +12,9 @@ // Default icon colours .nhsuk-icon__search { - fill: $color_nhsuk-blue; + fill: currentColor; + height: 28px; + width: 28px; } .nhsuk-icon__chevron-left { @@ -48,19 +50,11 @@ } .nhsuk-icon__chevron-down { - fill: $color_nhsuk-white; - height: 24px; - position: absolute; - right: 4px; + fill: currentColor; + height: nhsuk-spacing(4); + margin-right: -(nhsuk-spacing(1)); transform: rotate(90deg); - width: 24px; -} - -.nhsuk-icon__chevron-up { - fill: $color_nhsuk-blue; - path { - fill: $color_nhsuk-white; - } + width: nhsuk-spacing(4); } .nhsuk-icon__emdash { diff --git a/packages/core/tools/_links.scss b/packages/core/tools/_links.scss index 678151d3c..83473f624 100644 --- a/packages/core/tools/_links.scss +++ b/packages/core/tools/_links.scss @@ -71,6 +71,34 @@ } } +// +// Header link styling (accounts for different header colour variants) +// +// Usage: @include nhsuk-link-style-header; +// + +@mixin nhsuk-link-style-header { + color: inherit; + + &:link, + &:visited, + &:hover, + &:active { + color: inherit; + } + + &:focus { + background-color: $nhsuk-focus-color; + box-shadow: + 0 0 0 $nhsuk-focus-width $nhsuk-focus-color, + 0 $nhsuk-focus-width 0 $nhsuk-focus-width $nhsuk-focus-text-color; + color: $nhsuk-focus-text-color; + outline: $nhsuk-focus-width solid transparent; + outline-offset: $nhsuk-focus-width; + text-decoration: none; + } +} + // // Default link hover only styling // diff --git a/packages/core/tools/_mixins.scss b/packages/core/tools/_mixins.scss index bc903f864..2026c52f4 100644 --- a/packages/core/tools/_mixins.scss +++ b/packages/core/tools/_mixins.scss @@ -271,18 +271,3 @@ margin-right: -$nhsuk-gutter-half; } } - -/// NHS logo size helper -/// -/// Saves duplicating the code for when using the logo as a link. -/// Used in the header and footer. - -@mixin nhsuk-logo-size { - height: 40px; - width: 100px; -} - -@mixin nhsuk-logo-size-small { - height: 32px; - width: 80px; -} diff --git a/packages/nhsuk.scss b/packages/nhsuk.scss index d9f67d6d3..dbd553303 100644 --- a/packages/nhsuk.scss +++ b/packages/nhsuk.scss @@ -17,8 +17,6 @@ @import "components/footer/footer"; @import "components/header/header"; @import "components/header/header-organisation"; -@import "components/header/header-service"; -@import "components/header/header-transactional"; @import "components/header/header-white"; @import "components/hero/hero"; @import "components/hint/hint"; diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_default_0_document_0_iPhone_5_SE.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_default_0_document_0_iPhone_5_SE.png index 7d5406cbf..5b088427b 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_default_0_document_0_iPhone_5_SE.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_default_0_document_0_iPhone_5_SE.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_default_0_document_1_iPhone_6-8.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_default_0_document_1_iPhone_6-8.png index f17ffa8ce..d5f598a7b 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_default_0_document_1_iPhone_6-8.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_default_0_document_1_iPhone_6-8.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_default_0_document_2_iPad.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_default_0_document_2_iPad.png index 61a48015b..5c633b192 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_default_0_document_2_iPad.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_default_0_document_2_iPad.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_default_0_document_3_Surface_iPad_Pro.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_default_0_document_3_Surface_iPad_Pro.png index 47606c687..c9d177bcf 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_default_0_document_3_Surface_iPad_Pro.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_default_0_document_3_Surface_iPad_Pro.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_organisational_0_document_0_iPhone_5_SE.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_organisational_0_document_0_iPhone_5_SE.png index 644b19416..6f2a6a371 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_organisational_0_document_0_iPhone_5_SE.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_organisational_0_document_0_iPhone_5_SE.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_organisational_0_document_1_iPhone_6-8.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_organisational_0_document_1_iPhone_6-8.png index 05d00e87b..eb0a05d14 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_organisational_0_document_1_iPhone_6-8.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_organisational_0_document_1_iPhone_6-8.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_organisational_0_document_2_iPad.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_organisational_0_document_2_iPad.png index 3d9f476d2..b1a81dc3b 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_organisational_0_document_2_iPad.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_organisational_0_document_2_iPad.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_organisational_0_document_3_Surface_iPad_Pro.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_organisational_0_document_3_Surface_iPad_Pro.png index fe0faefff..8b5e040b8 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_organisational_0_document_3_Surface_iPad_Pro.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_organisational_0_document_3_Surface_iPad_Pro.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_organisational_with_white_header_0_document_0_iPhone_5_SE.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_organisational_with_white_header_0_document_0_iPhone_5_SE.png index 23fc0a4f8..0d80eb3e3 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_organisational_with_white_header_0_document_0_iPhone_5_SE.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_organisational_with_white_header_0_document_0_iPhone_5_SE.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_organisational_with_white_header_0_document_1_iPhone_6-8.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_organisational_with_white_header_0_document_1_iPhone_6-8.png index 0aca0bb07..b24655f9e 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_organisational_with_white_header_0_document_1_iPhone_6-8.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_organisational_with_white_header_0_document_1_iPhone_6-8.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_organisational_with_white_header_0_document_2_iPad.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_organisational_with_white_header_0_document_2_iPad.png index 88d80f2b6..14f6e71e5 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_organisational_with_white_header_0_document_2_iPad.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_organisational_with_white_header_0_document_2_iPad.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_organisational_with_white_header_0_document_3_Surface_iPad_Pro.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_organisational_with_white_header_0_document_3_Surface_iPad_Pro.png index fab53d83d..d753346e0 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_organisational_with_white_header_0_document_3_Surface_iPad_Pro.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_organisational_with_white_header_0_document_3_Surface_iPad_Pro.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_organisational_with_white_header_and_navigation_0_document_0_iPhone_5_SE.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_organisational_with_white_header_and_navigation_0_document_0_iPhone_5_SE.png index 81b56ca59..c25bd8649 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_organisational_with_white_header_and_navigation_0_document_0_iPhone_5_SE.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_organisational_with_white_header_and_navigation_0_document_0_iPhone_5_SE.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_organisational_with_white_header_and_navigation_0_document_1_iPhone_6-8.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_organisational_with_white_header_and_navigation_0_document_1_iPhone_6-8.png index 29e7bfad4..220fed125 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_organisational_with_white_header_and_navigation_0_document_1_iPhone_6-8.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_organisational_with_white_header_and_navigation_0_document_1_iPhone_6-8.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_organisational_with_white_header_and_navigation_0_document_2_iPad.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_organisational_with_white_header_and_navigation_0_document_2_iPad.png index 8d9ec6a77..440624946 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_organisational_with_white_header_and_navigation_0_document_2_iPad.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_organisational_with_white_header_and_navigation_0_document_2_iPad.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_organisational_with_white_header_and_navigation_0_document_3_Surface_iPad_Pro.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_organisational_with_white_header_and_navigation_0_document_3_Surface_iPad_Pro.png index c6b80ada9..7b97f66bb 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_organisational_with_white_header_and_navigation_0_document_3_Surface_iPad_Pro.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_organisational_with_white_header_and_navigation_0_document_3_Surface_iPad_Pro.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_transactional_with_service_name_0_document_0_iPhone_5_SE.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_transactional_with_service_name_0_document_0_iPhone_5_SE.png index 1283e46d2..f5c51d098 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_transactional_with_service_name_0_document_0_iPhone_5_SE.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_transactional_with_service_name_0_document_0_iPhone_5_SE.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_transactional_with_service_name_0_document_1_iPhone_6-8.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_transactional_with_service_name_0_document_1_iPhone_6-8.png index b2b74b1ab..55d31c570 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_transactional_with_service_name_0_document_1_iPhone_6-8.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_transactional_with_service_name_0_document_1_iPhone_6-8.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_transactional_with_service_name_0_document_2_iPad.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_transactional_with_service_name_0_document_2_iPad.png index 786607e4e..8f6d42885 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_transactional_with_service_name_0_document_2_iPad.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_transactional_with_service_name_0_document_2_iPad.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_transactional_with_service_name_0_document_3_Surface_iPad_Pro.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_transactional_with_service_name_0_document_3_Surface_iPad_Pro.png index 635688929..71ebc584d 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_transactional_with_service_name_0_document_3_Surface_iPad_Pro.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_transactional_with_service_name_0_document_3_Surface_iPad_Pro.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_a_service_name_0_document_0_iPhone_5_SE.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_a_service_name_0_document_0_iPhone_5_SE.png index dca720deb..fbe742f7b 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_a_service_name_0_document_0_iPhone_5_SE.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_a_service_name_0_document_0_iPhone_5_SE.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_a_service_name_0_document_1_iPhone_6-8.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_a_service_name_0_document_1_iPhone_6-8.png index 5ef226f45..367d209c7 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_a_service_name_0_document_1_iPhone_6-8.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_a_service_name_0_document_1_iPhone_6-8.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_a_service_name_0_document_2_iPad.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_a_service_name_0_document_2_iPad.png index 38504fbc1..c1b53c417 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_a_service_name_0_document_2_iPad.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_a_service_name_0_document_2_iPad.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_a_service_name_0_document_3_Surface_iPad_Pro.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_a_service_name_0_document_3_Surface_iPad_Pro.png index bc9740d29..fea3f70be 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_a_service_name_0_document_3_Surface_iPad_Pro.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_a_service_name_0_document_3_Surface_iPad_Pro.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_a_service_name_search_and_navigation_0_document_0_iPhone_5_SE.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_a_service_name_search_and_navigation_0_document_0_iPhone_5_SE.png index 18af38e91..0fe448daa 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_a_service_name_search_and_navigation_0_document_0_iPhone_5_SE.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_a_service_name_search_and_navigation_0_document_0_iPhone_5_SE.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_a_service_name_search_and_navigation_0_document_1_iPhone_6-8.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_a_service_name_search_and_navigation_0_document_1_iPhone_6-8.png index eb1fc74d0..b2c548778 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_a_service_name_search_and_navigation_0_document_1_iPhone_6-8.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_a_service_name_search_and_navigation_0_document_1_iPhone_6-8.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_a_service_name_search_and_navigation_0_document_2_iPad.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_a_service_name_search_and_navigation_0_document_2_iPad.png index 49d6dc12b..d69bd7b86 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_a_service_name_search_and_navigation_0_document_2_iPad.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_a_service_name_search_and_navigation_0_document_2_iPad.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_a_service_name_search_and_navigation_0_document_3_Surface_iPad_Pro.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_a_service_name_search_and_navigation_0_document_3_Surface_iPad_Pro.png index 2bdfc81d5..30e108b92 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_a_service_name_search_and_navigation_0_document_3_Surface_iPad_Pro.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_a_service_name_search_and_navigation_0_document_3_Surface_iPad_Pro.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_logo_only_0_document_0_iPhone_5_SE.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_logo_only_0_document_0_iPhone_5_SE.png index 307a5f6bd..2d83ab820 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_logo_only_0_document_0_iPhone_5_SE.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_logo_only_0_document_0_iPhone_5_SE.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_logo_only_0_document_1_iPhone_6-8.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_logo_only_0_document_1_iPhone_6-8.png index 5eacc911e..3ef0b8e92 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_logo_only_0_document_1_iPhone_6-8.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_logo_only_0_document_1_iPhone_6-8.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_logo_only_0_document_2_iPad.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_logo_only_0_document_2_iPad.png index 28fbdd8af..90d53c525 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_logo_only_0_document_2_iPad.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_logo_only_0_document_2_iPad.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_logo_only_0_document_3_Surface_iPad_Pro.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_logo_only_0_document_3_Surface_iPad_Pro.png index 92b9f2c6f..b9e792a2a 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_logo_only_0_document_3_Surface_iPad_Pro.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_logo_only_0_document_3_Surface_iPad_Pro.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_navigation_0_document_0_iPhone_5_SE.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_navigation_0_document_0_iPhone_5_SE.png index 27d54e7b3..adceb6f0b 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_navigation_0_document_0_iPhone_5_SE.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_navigation_0_document_0_iPhone_5_SE.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_navigation_0_document_1_iPhone_6-8.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_navigation_0_document_1_iPhone_6-8.png index 0755570f7..2c765e287 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_navigation_0_document_1_iPhone_6-8.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_navigation_0_document_1_iPhone_6-8.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_navigation_0_document_2_iPad.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_navigation_0_document_2_iPad.png index 742312838..28ba02d2c 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_navigation_0_document_2_iPad.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_navigation_0_document_2_iPad.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_navigation_0_document_3_Surface_iPad_Pro.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_navigation_0_document_3_Surface_iPad_Pro.png index c1a323bf2..825cafb2f 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_navigation_0_document_3_Surface_iPad_Pro.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_navigation_0_document_3_Surface_iPad_Pro.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_navigation_open_0_document_0_iPhone_5_SE.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_navigation_open_0_document_0_iPhone_5_SE.png index e9e7ddb6e..1770bbcd2 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_navigation_open_0_document_0_iPhone_5_SE.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_navigation_open_0_document_0_iPhone_5_SE.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_navigation_open_0_document_1_iPhone_6-8.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_navigation_open_0_document_1_iPhone_6-8.png index 3903a421a..00dd09690 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_navigation_open_0_document_1_iPhone_6-8.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_navigation_open_0_document_1_iPhone_6-8.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_navigation_open_0_document_2_iPad.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_navigation_open_0_document_2_iPad.png index 40aa0c7da..4566a4d6e 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_navigation_open_0_document_2_iPad.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_navigation_open_0_document_2_iPad.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_search_0_document_0_iPhone_5_SE.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_search_0_document_0_iPhone_5_SE.png index b722b454c..ec9714418 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_search_0_document_0_iPhone_5_SE.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_search_0_document_0_iPhone_5_SE.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_search_0_document_1_iPhone_6-8.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_search_0_document_1_iPhone_6-8.png index a13032848..4cf974af4 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_search_0_document_1_iPhone_6-8.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_search_0_document_1_iPhone_6-8.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_search_0_document_2_iPad.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_search_0_document_2_iPad.png index 91a784393..197d4d141 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_search_0_document_2_iPad.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_search_0_document_2_iPad.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_search_0_document_3_Surface_iPad_Pro.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_search_0_document_3_Surface_iPad_Pro.png index 3069f4bbb..9aa08bb1b 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_search_0_document_3_Surface_iPad_Pro.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Header_with_search_0_document_3_Surface_iPad_Pro.png differ