From 364e92ed79ab449a759f09706fd1d2996960eab9 Mon Sep 17 00:00:00 2001 From: Paul Robert Lloyd Date: Fri, 23 Aug 2024 11:22:45 +0100 Subject: [PATCH] Combine service and transactionalService header options and remove header layout switches --- ...-name.njk => header-service-name-long.njk} | 6 +- .../header/header-service-name-with-nav.njk | 2 +- app/pages/examples.njk | 2 +- packages/components/header/README.md | 189 +++++++++--------- .../header/_header-organisation.scss | 44 +--- .../components/header/_header-service.scss | 59 ------ .../header/_header-transactional.scss | 61 ------ packages/components/header/_header-white.scss | 81 +++----- packages/components/header/_header.scss | 173 +++++----------- packages/components/header/template.njk | 185 +++++------------ packages/nhsuk.scss | 2 - tests/backstop/backstop.js | 8 +- 12 files changed, 236 insertions(+), 576 deletions(-) rename app/components/header/{header-transactional-service-name.njk => header-service-name-long.njk} (63%) delete mode 100644 packages/components/header/_header-service.scss delete mode 100644 packages/components/header/_header-transactional.scss diff --git a/app/components/header/header-transactional-service-name.njk b/app/components/header/header-service-name-long.njk similarity index 63% rename from app/components/header/header-transactional-service-name.njk rename to app/components/header/header-service-name-long.njk index 13038875d..63cad5a15 100644 --- a/app/components/header/header-transactional-service-name.njk +++ b/app/components/header/header-service-name-long.njk @@ -1,13 +1,13 @@ {% set html_style = 'background-color: #f0f4f5;' %} -{% set title = 'Header transactional with service name' %} +{% set title = 'Header transactional with a long service name' %} {% from 'components/header/macro.njk' import header %} {% extends 'layout.njk' %} {% block body %} {{ header({ - "transactionalService": { - "name": "Find your NHS number" + "service": { + "name": "Find your really long service name in England" }, "showNav": "false", "showSearch": "false" diff --git a/app/components/header/header-service-name-with-nav.njk b/app/components/header/header-service-name-with-nav.njk index d4680c3e6..c269feeac 100644 --- a/app/components/header/header-service-name-with-nav.njk +++ b/app/components/header/header-service-name-with-nav.njk @@ -7,7 +7,7 @@ {{ header({ "service": { - "name": "Digital service manual" + "name": "Find your really long service name in England" }, "showNav": "true", "showSearch": "true", diff --git a/app/pages/examples.njk b/app/pages/examples.njk index d384727bd..39a27c17c 100644 --- a/app/pages/examples.njk +++ b/app/pages/examples.njk @@ -79,8 +79,8 @@
  • Header with search
  • Header with logo only
  • Header with a service name
    • +
  • Header with a long service name
  • Header with a service name, search and navigation
    • -
  • Header transactional with service name
  • Header organisational
  • Header organisational with white header
  • Header organisational with white header and navigation
    • diff --git a/packages/components/header/README.md b/packages/components/header/README.md index 2952f86d8..0a16f4bc0 100644 --- a/packages/components/header/README.md +++ b/packages/components/header/README.md @@ -25,18 +25,16 @@ compiled JavaScript for all components `nhsuk.min.js` or the individual componen -
    -
    -
    - -
    +
    +
    +
    @@ -267,18 +265,16 @@ compiled JavaScript for all components `nhsuk.min.js` or the individual componen
    -
    -
    -
    - -
    +
    +
    +
    @@ -332,7 +328,7 @@ compiled JavaScript for all components `nhsuk.min.js` or the individual componen ```HTML diff --git a/packages/nhsuk.scss b/packages/nhsuk.scss index 9c347aadc..ea31d1453 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/backstop.js b/tests/backstop/backstop.js index e97bc8bdc..c0e7d982d 100644 --- a/tests/backstop/backstop.js +++ b/tests/backstop/backstop.js @@ -241,12 +241,12 @@ module.exports = { url: `${TEST_URL}/header/header-service-name.html`, }, { - label: 'Header with a service name, search and navigation', - url: `${TEST_URL}/header/header-service-name-with-nav.html`, + label: 'Header with a long service name', + url: `${TEST_URL}/header/header-service-name-long.html`, }, { - label: 'Header transactional with service name', - url: `${TEST_URL}/header/header-transactional-service-name.html`, + label: 'Header with a service name, search and navigation', + url: `${TEST_URL}/header/header-service-name-with-nav.html`, }, { label: 'Header organisational',