From abb289ef4d042db0832101e31d9d4299b537bfa6 Mon Sep 17 00:00:00 2001 From: Sara Wilcox <45792959+sarawilcox@users.noreply.github.com> Date: Mon, 11 Aug 2025 15:51:34 +0000 Subject: [PATCH 01/30] Update care card examples --- .../components/breadcrumbs/default/index.njk | 6 +++--- .../emergency/index.njk | 5 ++--- .../two-colons/index.njk | 13 +++++++------ .../urgent/index.njk | 12 ++++++------ 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/app/views/design-system/components/breadcrumbs/default/index.njk b/app/views/design-system/components/breadcrumbs/default/index.njk index d6bbe55c2..2a2545874 100644 --- a/app/views/design-system/components/breadcrumbs/default/index.njk +++ b/app/views/design-system/components/breadcrumbs/default/index.njk @@ -4,13 +4,13 @@ items: [ { href: "#", - text: "Level one" + text: "Home" }, { href: "#", - text: "Level two" + text: "NHS services" } ], href: "#", - text: "Level three" + text: "Hospitals" }) }} diff --git a/app/views/design-system/patterns/help-users-decide-when-and-where-to-get-care/emergency/index.njk b/app/views/design-system/patterns/help-users-decide-when-and-where-to-get-care/emergency/index.njk index 3857125f0..c692fa4f5 100644 --- a/app/views/design-system/patterns/help-users-decide-when-and-where-to-get-care/emergency/index.njk +++ b/app/views/design-system/patterns/help-users-decide-when-and-where-to-get-care/emergency/index.njk @@ -5,10 +5,9 @@ heading: "Call 999 or go to A&E now if:", descriptionHtml: " -

A mental health emergency should be taken as seriously as a medical emergency.

Find your nearest A&E

" }) }} diff --git a/app/views/design-system/patterns/help-users-decide-when-and-where-to-get-care/two-colons/index.njk b/app/views/design-system/patterns/help-users-decide-when-and-where-to-get-care/two-colons/index.njk index cce9fbe10..4c3d26f0a 100644 --- a/app/views/design-system/patterns/help-users-decide-when-and-where-to-get-care/two-colons/index.njk +++ b/app/views/design-system/patterns/help-users-decide-when-and-where-to-get-care/two-colons/index.njk @@ -2,14 +2,15 @@ {{ card({ type: "emergency", - heading: "Call 999 if:", + heading: "Call 999 or go to A&E if:", descriptionHtml: " -

You have sudden chest pain that:

+

You've been exposed to very cold temperatures and:

-

You could be having a heart attack. Call 999 immediately as you need immediate treatment in hospital.

+

Find your nearest A&E

" }) }} diff --git a/app/views/design-system/patterns/help-users-decide-when-and-where-to-get-care/urgent/index.njk b/app/views/design-system/patterns/help-users-decide-when-and-where-to-get-care/urgent/index.njk index fee12f7ed..5f056d146 100644 --- a/app/views/design-system/patterns/help-users-decide-when-and-where-to-get-care/urgent/index.njk +++ b/app/views/design-system/patterns/help-users-decide-when-and-where-to-get-care/urgent/index.njk @@ -2,14 +2,14 @@ {{ card({ type: "urgent", - heading: "Ask for an urgent GP appointment if:", + heading: "Ask for an urgent GP appointment or get help from NHS 111 if you have:", descriptionHtml: " -

In these situations, your GP can prescribe medicine to prevent complications. You need to take it within 24 hours of the spots coming out.

+

These can be signs of a more serious eye problem.

+

You can call 111 or get help from 111 online.

" }) }} From 9cb27681be871db0d47cbf0f734ffc0aad67327c Mon Sep 17 00:00:00 2001 From: anandamaryon1 <159916913+anandamaryon1@users.noreply.github.com> Date: Tue, 12 Aug 2025 15:12:35 +0100 Subject: [PATCH 02/30] add breadcrumbs reverse example and content tweaks --- .../components/breadcrumbs/index.njk | 28 ++++++++----------- .../components/breadcrumbs/reverse/index.njk | 6 ++-- 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/app/views/design-system/components/breadcrumbs/index.njk b/app/views/design-system/components/breadcrumbs/index.njk index d06e5964d..8b498fb8c 100644 --- a/app/views/design-system/components/breadcrumbs/index.njk +++ b/app/views/design-system/components/breadcrumbs/index.njk @@ -25,22 +25,12 @@

WCAG 2.2: Make sure that users can successfully interact with breadcrumbs.

-

There are 2 versions of the breadcrumbs: the default version and the reverse version.

- {{ designExample({ group: "components", item: "breadcrumbs", type: "default" }) }} -

Use the reverse version on dark backgrounds.

- -{{ designExample({ - group: "components", - item: "breadcrumbs", - type: "reverse" -}) }} -

When to use breadcrumbs

Use breadcrumbs to give users context and let them move back or up a level if they can't find what they want on the page.

@@ -64,12 +54,18 @@

You don't need to show the current page in the breadcrumb because this information is in the H1.

On mobile, we replace the full breadcrumb trail with a "Back to [parent]" link.

- -

Accessibility

-

We use aria-label="breadcrumb" as a label in the nav element to let people who use +

We use aria-label="breadcrumb" as a label in the nav element to let people who use screen readers know what it is.

-

We add aria-hidden="true" to the svg icons - to hide them from people who use screen readers.

+ + +

Use the nhsuk-breadcrumb--reverse modifier class to show white links and arrows on dark backgrounds – for example, in headers, custom components, and patterns with darker backgrounds.

+

Make sure all users can see the breadcrumbs – the background colour must have a contrast ratio of at least 4.5:1 with white to meet WCAG 2.2 success criterion 1.4.3 Contrast (minimum), level AA.

+ +{{ designExample({ + group: "components", + item: "breadcrumbs", + type: "reverse" +}) }}

Research

We tested breadcrumbs on pages with lots of content about conditions or medicines. They helped people understand @@ -77,6 +73,6 @@ back to where they came from or to get back home.

We took out the breadcrumb links when we tested our pages in transactional journeys (in more than 3 labs). We thought that having extra links would distract users and that fewer people would complete the journey. As we expected, we - found that users didn't miss the links because they were focused on the task.

+ found that users did miss the links because they were focused on the task.

{% endblock %} diff --git a/app/views/design-system/components/breadcrumbs/reverse/index.njk b/app/views/design-system/components/breadcrumbs/reverse/index.njk index 6a2119478..f12f912a7 100644 --- a/app/views/design-system/components/breadcrumbs/reverse/index.njk +++ b/app/views/design-system/components/breadcrumbs/reverse/index.njk @@ -9,13 +9,13 @@ background: blue items: [ { href: "#", - text: "Level one" + text: "Home" }, { href: "#", - text: "Level two" + text: "NHS services" } ], href: "#", - text: "Level three" + text: "Hospitals" }) }} From aeffac83555586f1db50800ea5055066c2f8a6f9 Mon Sep 17 00:00:00 2001 From: anandamaryon1 <159916913+anandamaryon1@users.noreply.github.com> Date: Tue, 12 Aug 2025 15:48:22 +0100 Subject: [PATCH 03/30] add action-link to emergency care card example. needs style fixes in frontend. --- .../emergency/index.njk | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/app/views/design-system/patterns/help-users-decide-when-and-where-to-get-care/emergency/index.njk b/app/views/design-system/patterns/help-users-decide-when-and-where-to-get-care/emergency/index.njk index c692fa4f5..4aaf92025 100644 --- a/app/views/design-system/patterns/help-users-decide-when-and-where-to-get-care/emergency/index.njk +++ b/app/views/design-system/patterns/help-users-decide-when-and-where-to-get-care/emergency/index.njk @@ -1,13 +1,19 @@ {% from 'card/macro.njk' import card %} +{% from 'action-link/macro.njk' import actionLink %} -{{ card({ +{% call card({ type: "emergency", - heading: "Call 999 or go to A&E now if:", - descriptionHtml: " + heading: "Call 999 or go to A&E now if:" +}) %} + -

Find your nearest A&E

- " + +{{ actionLink({ + "text": "Find your nearest A&E", + "href": "#" }) }} + +{% endcall %} From 386ab26d8a2953e8af80cb047de0a25430e8d689 Mon Sep 17 00:00:00 2001 From: anandamaryon1 <159916913+anandamaryon1@users.noreply.github.com> Date: Tue, 12 Aug 2025 15:59:15 +0100 Subject: [PATCH 04/30] update address example in fieldset component to match latest govuk example --- .../components/fieldset/default/index.njk | 25 ++++++++----------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/app/views/design-system/components/fieldset/default/index.njk b/app/views/design-system/components/fieldset/default/index.njk index a4d1e0b91..69e3e0c35 100644 --- a/app/views/design-system/components/fieldset/default/index.njk +++ b/app/views/design-system/components/fieldset/default/index.njk @@ -11,18 +11,20 @@ {{ input({ label: { - html: 'Building and street line 1 of 2' + text: "Address line 1" }, id: "address-line-1", - name: "address-line-1" + name: "addressLine1", + autocomplete: "address-line1" }) }} {{ input({ label: { - html: 'Building and street line 2 of 2' + text: "Address line 2 (optional)" }, id: "address-line-2", - name: "address-line-2" + name: "addressLine2", + autocomplete: "address-line2" }) }} {{ input({ @@ -31,16 +33,8 @@ }, classes: "nhsuk-u-width-two-thirds", id: "address-town", - name: "address-town" - }) }} - - {{ input({ - label: { - text: "County" - }, - classes: "nhsuk-u-width-two-thirds", - id: "address-county", - name: "address-county" + name: "addressTown", + autocomplete: "address-level2" }) }} {{ input({ @@ -49,7 +43,8 @@ }, classes: "nhsuk-input--width-10", id: "address-postcode", - name: "address-postcode" + name: "addressPostcode", + autocomplete: "postal-code" }) }} {% endcall %} From 3769fe060d046c6fc4514f2b3afa6714bb8f7343 Mon Sep 17 00:00:00 2001 From: anandamaryon1 <159916913+anandamaryon1@users.noreply.github.com> Date: Tue, 12 Aug 2025 16:42:26 +0100 Subject: [PATCH 05/30] update text input examples to use page heading labels and fix ids names and spellcheck attribute --- .../components/text-input/default/index.njk | 8 +++++--- .../text-input/error-and-prefix-and-suffix/index.njk | 9 +++++---- .../components/text-input/error/index.njk | 4 ++-- .../components/text-input/fixed-width/index.njk | 12 ++++++------ .../components/text-input/fluid-width/index.njk | 10 +++++----- .../components/text-input/hint-text/index.njk | 2 +- .../components/text-input/number/index.njk | 9 +++++---- .../text-input/prefix-and-suffix/index.njk | 7 ++++--- .../components/text-input/prefix/index.njk | 7 ++++--- .../components/text-input/suffix/index.njk | 7 ++++--- 10 files changed, 41 insertions(+), 34 deletions(-) diff --git a/app/views/design-system/components/text-input/default/index.njk b/app/views/design-system/components/text-input/default/index.njk index b81c43575..2b66e8031 100644 --- a/app/views/design-system/components/text-input/default/index.njk +++ b/app/views/design-system/components/text-input/default/index.njk @@ -2,8 +2,10 @@ {{ input({ label: { - text: "Full name" + text: "What is your full name?", + classes: "nhsuk-label--l", + isPageHeading: true }, - id: "example", - name: "example" + id: "full-name", + name: "fullName" }) }} diff --git a/app/views/design-system/components/text-input/error-and-prefix-and-suffix/index.njk b/app/views/design-system/components/text-input/error-and-prefix-and-suffix/index.njk index 0c119b301..5058a8c21 100644 --- a/app/views/design-system/components/text-input/error-and-prefix-and-suffix/index.njk +++ b/app/views/design-system/components/text-input/error-and-prefix-and-suffix/index.njk @@ -4,12 +4,13 @@ label: { text: "Cost per item, in pounds" }, - id: "example", - name: "example", + id: "cost-pounds", + name: "costPounds", prefix: "£", suffix: "per item", - classes: "nhsuk-input--width-5", errorMessage: { text: "Enter a cost per item, in pounds" - } + }, + classes: "nhsuk-input--width-5", + spellcheck: false }) }} diff --git a/app/views/design-system/components/text-input/error/index.njk b/app/views/design-system/components/text-input/error/index.njk index 5f205482d..d861f2c3d 100644 --- a/app/views/design-system/components/text-input/error/index.njk +++ b/app/views/design-system/components/text-input/error/index.njk @@ -4,8 +4,8 @@ label: { text: "Full name" }, - id: "example", - name: "example", + id: "full-name", + name: "fullName", classes: "nhsuk-input--width-10", errorMessage: { text: "Enter your full name" diff --git a/app/views/design-system/components/text-input/fixed-width/index.njk b/app/views/design-system/components/text-input/fixed-width/index.njk index 06b47755e..4457439e4 100644 --- a/app/views/design-system/components/text-input/fixed-width/index.njk +++ b/app/views/design-system/components/text-input/fixed-width/index.njk @@ -5,7 +5,7 @@ text: "20 character width" }, id: "input-width-20", - name: "test-width-20", + name: "inputWidth20", classes: "nhsuk-input--width-20" }) }} {{ input({ @@ -13,7 +13,7 @@ text: "10 character width" }, id: "input-width-10", - name: "test-width-10", + name: "inputWidth10", classes: "nhsuk-input--width-10" }) }} {{ input({ @@ -21,7 +21,7 @@ text: "5 character width" }, id: "input-width-5", - name: "test-width-5", + name: "inputWidth5", classes: "nhsuk-input--width-5" }) }} {{ input({ @@ -29,7 +29,7 @@ text: "4 character width" }, id: "input-width-4", - name: "test-width-4", + name: "inputWidth4", classes: "nhsuk-input--width-4" }) }} {{ input({ @@ -37,7 +37,7 @@ text: "3 character width" }, id: "input-width-3", - name: "test-width-3", + name: "inputWidth3", classes: "nhsuk-input--width-3" }) }} {{ input({ @@ -45,6 +45,6 @@ text: "2 character width" }, id: "input-width-2", - name: "test-width-2", + name: "inputWidth2", classes: "nhsuk-input--width-2" }) }} diff --git a/app/views/design-system/components/text-input/fluid-width/index.njk b/app/views/design-system/components/text-input/fluid-width/index.njk index 7ac2907e9..7e3bc7863 100644 --- a/app/views/design-system/components/text-input/fluid-width/index.njk +++ b/app/views/design-system/components/text-input/fluid-width/index.njk @@ -15,7 +15,7 @@ }, classes: "nhsuk-u-width-three-quarters", id: "three-quarters", - name: "three-quarters" + name: "threeQuarters" }) }} {{ input({ @@ -24,7 +24,7 @@ }, classes: "nhsuk-u-width-two-thirds", id: "two-thirds", - name: "two-thirds" + name: "twoThirds" }) }} {{ input({ @@ -33,7 +33,7 @@ }, classes: "nhsuk-u-width-one-half", id: "one-half", - name: "one-half" + name: "oneHalf" }) }} {{ input({ @@ -42,7 +42,7 @@ }, classes: "nhsuk-u-width-one-third", id: "one-third", - name: "one-third" + name: "oneThird" }) }} {{ input({ @@ -51,5 +51,5 @@ }, classes: "nhsuk-u-width-one-quarter", id: "one-quarter", - name: "one-quarter" + name: "oneQuarter" }) }} diff --git a/app/views/design-system/components/text-input/hint-text/index.njk b/app/views/design-system/components/text-input/hint-text/index.njk index b2e6012a0..ba5242b62 100644 --- a/app/views/design-system/components/text-input/hint-text/index.njk +++ b/app/views/design-system/components/text-input/hint-text/index.njk @@ -8,6 +8,6 @@ text: "For example, LS1 1AB" }, id: "example-with-hint-text", - name: "example-with-hint-text", + name: "exampleWithHintText", classes: "nhsuk-input--width-10" }) }} diff --git a/app/views/design-system/components/text-input/number/index.njk b/app/views/design-system/components/text-input/number/index.njk index 8c9a10163..73f6b9f19 100644 --- a/app/views/design-system/components/text-input/number/index.njk +++ b/app/views/design-system/components/text-input/number/index.njk @@ -4,13 +4,14 @@ label: { text: "What is your NHS number?", classes: "nhsuk-label--l", - isPageHeading: "true" + isPageHeading: true }, hint: { text: "Your NHS number is a 10 digit number that you find on any letter the NHS has sent you, for example, 485 777 3456" }, - id: "example-with-hint-text", - name: "example-with-hint-text", + id: "nhs-number", + name: "nhsNumber", classes: "nhsuk-input--width-10", - inputmode: "numeric" + inputmode: "numeric", + spellcheck: false }) }} diff --git a/app/views/design-system/components/text-input/prefix-and-suffix/index.njk b/app/views/design-system/components/text-input/prefix-and-suffix/index.njk index 0fb4aa61f..dfe5f1d7d 100644 --- a/app/views/design-system/components/text-input/prefix-and-suffix/index.njk +++ b/app/views/design-system/components/text-input/prefix-and-suffix/index.njk @@ -4,9 +4,10 @@ label: { text: "Cost per item, in pounds" }, - id: "example", - name: "example", + id: "cost-per-item", + name: "costPerItem", prefix: "£", suffix: "per item", - classes: "nhsuk-input--width-5" + classes: "nhsuk-input--width-5", + spellcheck: false }) }} diff --git a/app/views/design-system/components/text-input/prefix/index.njk b/app/views/design-system/components/text-input/prefix/index.njk index 096f87db8..b5b0598f0 100644 --- a/app/views/design-system/components/text-input/prefix/index.njk +++ b/app/views/design-system/components/text-input/prefix/index.njk @@ -4,8 +4,9 @@ label: { text: "Cost in pounds" }, - id: "example", - name: "example", + id: "cost-pounds", + name: "costPounds", prefix: "£", - classes: "nhsuk-input--width-5" + classes: "nhsuk-input--width-5", + spellcheck: false }) }} diff --git a/app/views/design-system/components/text-input/suffix/index.njk b/app/views/design-system/components/text-input/suffix/index.njk index 8513162bb..951f65021 100644 --- a/app/views/design-system/components/text-input/suffix/index.njk +++ b/app/views/design-system/components/text-input/suffix/index.njk @@ -4,8 +4,9 @@ label: { text: "Weight in kilograms" }, - id: "example", - name: "example", + id: "weight", + name: "weight", suffix: "kg", - classes: "nhsuk-input--width-5" + classes: "nhsuk-input--width-5", + spellcheck: false }) }} From 5f55c4c7243baa8d5b80ec8724a494af535960b8 Mon Sep 17 00:00:00 2001 From: anandamaryon1 <159916913+anandamaryon1@users.noreply.github.com> Date: Tue, 12 Aug 2025 16:44:37 +0100 Subject: [PATCH 06/30] tweak breadcrumb research content to clarify --- app/views/design-system/components/breadcrumbs/index.njk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/views/design-system/components/breadcrumbs/index.njk b/app/views/design-system/components/breadcrumbs/index.njk index 8b498fb8c..d2a67eea2 100644 --- a/app/views/design-system/components/breadcrumbs/index.njk +++ b/app/views/design-system/components/breadcrumbs/index.njk @@ -71,8 +71,6 @@

We tested breadcrumbs on pages with lots of content about conditions or medicines. They helped people understand their place on the website. People noticed them and appreciated the context they gave. People also used them to get back to where they came from or to get back home.

-

We took out the breadcrumb links when we tested our pages in transactional journeys (in more than 3 labs). We thought - that having extra links would distract users and that fewer people would complete the journey. As we expected, we - found that users did miss the links because they were focused on the task.

+

We took out the breadcrumb links when we tested our pages in transactional journeys (in more than 3 labs). We thought that having breadcrumb links would distract users from completing the journey. We found that they did not need the breadcrumbs because they were focused on the task.

{% endblock %} From d0547e40f9b395e03619246dfd8708357aa2d2ae Mon Sep 17 00:00:00 2001 From: Sara Wilcox <45792959+sarawilcox@users.noreply.github.com> Date: Wed, 13 Aug 2025 15:36:21 +0000 Subject: [PATCH 07/30] Update inset text and care cards --- .../design-system/components/breadcrumbs/index.njk | 12 ++++++------ .../components/inset-text/default/index.njk | 2 +- .../index.njk | 2 +- .../urgent/index.njk | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/views/design-system/components/breadcrumbs/index.njk b/app/views/design-system/components/breadcrumbs/index.njk index d2a67eea2..489616d54 100644 --- a/app/views/design-system/components/breadcrumbs/index.njk +++ b/app/views/design-system/components/breadcrumbs/index.njk @@ -32,14 +32,14 @@ }) }}

When to use breadcrumbs

-

Use breadcrumbs to give users context and let them move back or up a level if they can't find what they want on the +

Use breadcrumbs to give users context and let them move back or up a level if they cannot find what they want on the page.

When not to use breadcrumbs

-

Don't use breadcrumbs in transactional journeys as they can get in the way of the user completing the task.

+

Do not use breadcrumbs in transactional journeys as they can get in the way of the user completing the task.

How to use breadcrumbs

-

If the full breadcrumb trail doesn't fit the screen size, it can wrap onto 2 lines, but don't break a breadcrumb if +

If the full breadcrumb trail doesn't fit the screen size, it can wrap onto 2 lines, but do not break a breadcrumb if it doesn't fit the line.

@@ -52,14 +52,14 @@ href="https://www.w3.org/WAI/WCAG22/Understanding/target-size-minimum.html">WCAG 2.2 success criterion 2.5.8 Target Size (W3C).

-

You don't need to show the current page in the breadcrumb because this information is in the H1.

+

You do not need to show the current page in the breadcrumb because this information is in the H1.

On mobile, we replace the full breadcrumb trail with a "Back to [parent]" link.

We use aria-label="breadcrumb" as a label in the nav element to let people who use screen readers know what it is.

-

Use the nhsuk-breadcrumb--reverse modifier class to show white links and arrows on dark backgrounds – for example, in headers, custom components, and patterns with darker backgrounds.

-

Make sure all users can see the breadcrumbs – the background colour must have a contrast ratio of at least 4.5:1 with white to meet WCAG 2.2 success criterion 1.4.3 Contrast (minimum), level AA.

+

Use the nhsuk-breadcrumb--reverse modifier class to show white links and arrows on dark backgrounds, for example, in headers, custom components, and patterns with darker backgrounds.

+

Make sure all users can see the breadcrumbs. The background colour must have a contrast ratio of at least 4.5:1 with white to meet WCAG 2.2 success criterion 1.4.3 Contrast (minimum), level AA.

{{ designExample({ group: "components", diff --git a/app/views/design-system/components/inset-text/default/index.njk b/app/views/design-system/components/inset-text/default/index.njk index 38b3d2f8e..998737d4a 100644 --- a/app/views/design-system/components/inset-text/default/index.njk +++ b/app/views/design-system/components/inset-text/default/index.njk @@ -1,7 +1,7 @@ {% from 'inset-text/macro.njk' import insetText %} {% set insetTextHtml %} -

You can report any suspected side effect to the UK safety scheme.

+

You can report any suspected side effect using the Yellow Card safety scheme.

{% endset %} {{ insetText({ diff --git a/app/views/design-system/patterns/help-users-decide-when-and-where-to-get-care/index.njk b/app/views/design-system/patterns/help-users-decide-when-and-where-to-get-care/index.njk index 3ad20a058..194696077 100644 --- a/app/views/design-system/patterns/help-users-decide-when-and-where-to-get-care/index.njk +++ b/app/views/design-system/patterns/help-users-decide-when-and-where-to-get-care/index.njk @@ -3,7 +3,7 @@ {% set pageSection = "Design system" %} {% set subSection = "Patterns" %} {% set theme = "Help users to" %} -{% set dateUpdated = "November 2021" %} +{% set dateUpdated = "August 2025" %} {% set backlog_issue_id = "8" %} {% extends "layouts/app-layout.njk" %} diff --git a/app/views/design-system/patterns/help-users-decide-when-and-where-to-get-care/urgent/index.njk b/app/views/design-system/patterns/help-users-decide-when-and-where-to-get-care/urgent/index.njk index 5f056d146..19b3fdb4a 100644 --- a/app/views/design-system/patterns/help-users-decide-when-and-where-to-get-care/urgent/index.njk +++ b/app/views/design-system/patterns/help-users-decide-when-and-where-to-get-care/urgent/index.njk @@ -10,6 +10,6 @@
  • very red eyes
  • These can be signs of a more serious eye problem.

    -

    You can call 111 or get help from 111 online.

    +

    You can call 111 or get help from 111 online.

    " }) }} From 5bdf4bf857212fdd9623cd533a4b06bb38b6519b Mon Sep 17 00:00:00 2001 From: anandamaryon1 <159916913+anandamaryon1@users.noreply.github.com> Date: Wed, 3 Sep 2025 16:47:01 +0100 Subject: [PATCH 08/30] apply reverse action link style to emergency care card example --- .../emergency/index.njk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/design-system/patterns/help-users-decide-when-and-where-to-get-care/emergency/index.njk b/app/views/design-system/patterns/help-users-decide-when-and-where-to-get-care/emergency/index.njk index 4aaf92025..db4a67074 100644 --- a/app/views/design-system/patterns/help-users-decide-when-and-where-to-get-care/emergency/index.njk +++ b/app/views/design-system/patterns/help-users-decide-when-and-where-to-get-care/emergency/index.njk @@ -12,8 +12,9 @@ {{ actionLink({ - "text": "Find your nearest A&E", - "href": "#" + text: "Find your nearest A&E", + href: "#", + classes: "nhsuk-action-link--reverse" }) }} {% endcall %} From 8b8164d0b86467c5875b7984f15809a2c070d830 Mon Sep 17 00:00:00 2001 From: Sara Wilcox <45792959+sarawilcox@users.noreply.github.com> Date: Thu, 11 Sep 2025 11:55:26 +0000 Subject: [PATCH 09/30] Amend coded examples question re being contacted --- .../write-the-supporting-content-for-your-form.njk | 2 +- .../components/checkboxes/conditional/index.njk | 2 +- .../design-system/components/checkboxes/default/index.njk | 2 +- .../components/checkboxes/error-messages/index.njk | 4 ++-- .../design-system/components/checkboxes/hint/index.njk | 2 +- app/views/design-system/components/checkboxes/index.njk | 2 +- .../components/error-summary/link-options/index.njk | 6 +++--- .../design-system/components/hint-text/checkboxes/index.njk | 2 +- .../design-system/components/radios/conditional/index.njk | 4 ++-- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/views/content/how-to-write-good-questions-for-forms/write-the-supporting-content-for-your-form.njk b/app/views/content/how-to-write-good-questions-for-forms/write-the-supporting-content-for-your-form.njk index 4f1225b68..5eaf23b33 100644 --- a/app/views/content/how-to-write-good-questions-for-forms/write-the-supporting-content-for-your-form.njk +++ b/app/views/content/how-to-write-good-questions-for-forms/write-the-supporting-content-for-your-form.njk @@ -42,7 +42,7 @@ name: "contact", fieldset: { legend: { - text: "How would you like to be contacted?", + text: "How do you want to be contacted about this?", classes: "nhsuk-fieldset__legend--m" } }, diff --git a/app/views/design-system/components/checkboxes/conditional/index.njk b/app/views/design-system/components/checkboxes/conditional/index.njk index 954fdf744..a683c12f8 100644 --- a/app/views/design-system/components/checkboxes/conditional/index.njk +++ b/app/views/design-system/components/checkboxes/conditional/index.njk @@ -39,7 +39,7 @@ name: "contact", fieldset: { legend: { - text: "How would you prefer to be contacted?", + text: "How do you want to be contacted about this?", classes: "nhsuk-fieldset__legend--l", isPageHeading: "true" } diff --git a/app/views/design-system/components/checkboxes/default/index.njk b/app/views/design-system/components/checkboxes/default/index.njk index a6a016beb..6c050e9ed 100644 --- a/app/views/design-system/components/checkboxes/default/index.njk +++ b/app/views/design-system/components/checkboxes/default/index.njk @@ -5,7 +5,7 @@ name: "example", fieldset: { legend: { - text: "How would you like to be contacted?", + text: "How do you want to be contacted about this?", classes: "nhsuk-fieldset__legend--l", isPageHeading: true } diff --git a/app/views/design-system/components/checkboxes/error-messages/index.njk b/app/views/design-system/components/checkboxes/error-messages/index.njk index 6a77e2997..c5c8cca29 100644 --- a/app/views/design-system/components/checkboxes/error-messages/index.njk +++ b/app/views/design-system/components/checkboxes/error-messages/index.njk @@ -5,7 +5,7 @@ name: "contact", fieldset: { legend: { - text: "How would you like to be contacted?", + text: "How do you want to be contacted about this?", classes: "nhsuk-fieldset__legend--l", isPageHeading: true } @@ -14,7 +14,7 @@ text: "Select all options that are relevant to you" }, errorMessage: { - text: "Select how you like to be contacted" + text: "Select how you want to be contacted" }, items: [ { diff --git a/app/views/design-system/components/checkboxes/hint/index.njk b/app/views/design-system/components/checkboxes/hint/index.njk index 20307ed9b..0f5ca3ad3 100644 --- a/app/views/design-system/components/checkboxes/hint/index.njk +++ b/app/views/design-system/components/checkboxes/hint/index.njk @@ -5,7 +5,7 @@ name: "contact", fieldset: { legend: { - text: "How would you like to be contacted?", + text: "How do you want to be contacted about this?", classes: "nhsuk-fieldset__legend--l", isPageHeading: true } diff --git a/app/views/design-system/components/checkboxes/index.njk b/app/views/design-system/components/checkboxes/index.njk index d72e5b24d..0354c0de0 100644 --- a/app/views/design-system/components/checkboxes/index.njk +++ b/app/views/design-system/components/checkboxes/index.njk @@ -40,7 +40,7 @@

    Do not use the checkboxes component if users can only choose 1 option from a selection. In this case, use a radio.

    How to use checkboxes

    -

    Group checkboxes together in a <fieldset> with a <legend> that describes them. You can see an example at the top of this page. The legend is usually a question, like "How would you like to be contacted?".

    +

    Group checkboxes together in a <fieldset> with a <legend> that describes them. You can see an example at the top of this page. The legend is usually a question, like "How do you want to be contacted about this?".

    If you're asking just 1 question per page as we recommend, you can set the contents of the <legend> as the page heading. This is good practice as it means screen reader users will only hear the contents once.

    Read more on the GOV.UK Design System about making labels and legends headings.

    diff --git a/app/views/design-system/components/error-summary/link-options/index.njk b/app/views/design-system/components/error-summary/link-options/index.njk index bd16ea18f..626ef5cb0 100644 --- a/app/views/design-system/components/error-summary/link-options/index.njk +++ b/app/views/design-system/components/error-summary/link-options/index.njk @@ -5,7 +5,7 @@ titleText: "There is a problem", errorList: [ { - text: "Select how you like to be contacted", + text: "Select how you want to be contacted", href: "#contact" } ] @@ -16,7 +16,7 @@ name: "contact", fieldset: { legend: { - text: "How would you like to be contacted?", + text: "How do you want to be contacted about this?", classes: "nhsuk-fieldset__legend--l", isPageHeading: true } @@ -25,7 +25,7 @@ text: "Select all options that are relevant to you" }, errorMessage: { - text: "Select how you like to be contacted" + text: "Select how you want to be contacted" }, items: [ { diff --git a/app/views/design-system/components/hint-text/checkboxes/index.njk b/app/views/design-system/components/hint-text/checkboxes/index.njk index 20307ed9b..6d12195b2 100644 --- a/app/views/design-system/components/hint-text/checkboxes/index.njk +++ b/app/views/design-system/components/hint-text/checkboxes/index.njk @@ -5,7 +5,7 @@ name: "contact", fieldset: { legend: { - text: "How would you like to be contacted?", + text: "How do you want to be contacted about this?, classes: "nhsuk-fieldset__legend--l", isPageHeading: true } diff --git a/app/views/design-system/components/radios/conditional/index.njk b/app/views/design-system/components/radios/conditional/index.njk index 070598885..5f657ba18 100644 --- a/app/views/design-system/components/radios/conditional/index.njk +++ b/app/views/design-system/components/radios/conditional/index.njk @@ -39,13 +39,13 @@ name: "contact", fieldset: { legend: { - text: "How would you prefer to be contacted?", + text: "How do you want to be contacted about this?", classes: "nhsuk-fieldset__legend--l", isPageHeading: "true" } }, hint: { - text: "Select one option" + text: "Select 1 option" }, items: [ { From 2f2fd8160307392823ec2189d10598b59eedeb1f Mon Sep 17 00:00:00 2001 From: Colin Rotherham Date: Thu, 11 Sep 2025 13:51:45 +0100 Subject: [PATCH 10/30] Update reverse back link and action link content --- .../components/action-link/index.njk | 21 +++++++++--------- .../components/back-link/index.njk | 22 +++++++++---------- 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/app/views/design-system/components/action-link/index.njk b/app/views/design-system/components/action-link/index.njk index 244034d47..d95125117 100644 --- a/app/views/design-system/components/action-link/index.njk +++ b/app/views/design-system/components/action-link/index.njk @@ -13,8 +13,6 @@ {% endblock %} {% block bodyContent %} -

    There are 2 versions of the action link: the default version and the reverse version.

    -
    Version 10 @@ -30,14 +28,6 @@ type: "default" }) }} -

    Use the reverse version on dark backgrounds.

    - - {{ designExample({ - group: "components", - item: "action-link", - type: "reverse" - }) }} -

    When to use action links

    Use action links to signpost the start of a digital service.

    @@ -49,6 +39,17 @@

    Keep the words on the action link short. Start with a verb, for example: "Book an appointment" or "Apply for an EHIC card".

    Action links usually sit in a block of text. You can also put one in a care card. (Find out more about helping users decide when and where to get care, with care cards.)

    You can have more than one action link on a page but avoid putting them near each other.

    +

    The link colour and background colour contrast ratio is 5.76:1, which passes AAA guidelines at that font size.

    + + +

    Use the nhsuk-action-link--reverse modifier class to show white links and arrows on dark backgrounds – for example, in custom components and patterns with darker backgrounds.

    +

    Make sure all users can see the action link – the background colour must have a contrast ratio of at least 4.5:1 with white to meet WCAG 2.2 success criterion 1.4.3 Contrast (minimum), level AA.

    + + {{ designExample({ + group: "components", + item: "action-link", + type: "reverse" + }) }}

    Accessibility

    The link colour and background colour contrast ratio is 5.76:1, which passes AAA guidelines at that font size.

    diff --git a/app/views/design-system/components/back-link/index.njk b/app/views/design-system/components/back-link/index.njk index e4a97becd..1f87b8134 100644 --- a/app/views/design-system/components/back-link/index.njk +++ b/app/views/design-system/components/back-link/index.njk @@ -25,22 +25,12 @@

    WCAG 2.2: Make sure that users can successfully avoid re-entering information they've previously given when they go back to a page and interact with back links.

    -

    There are 2 versions of the back link: the default version and the reverse version.

    - {{ designExample({ group: "components", item: "back-link", type: "default" }) }} -

    Use the reverse version on dark backgrounds.

    - -{{ designExample({ - group: "components", - item: "back-link", - type: "reverse" -}) }} -

    When to use a back link

    We only use back links on transactional services or multi-page forms.

    The GOV.UK design system recommends @@ -82,7 +72,6 @@ href="https://www.w3.org/WAI/WCAG22/Understanding/target-size-minimum.html">WCAG 2.2 success criterion 2.5.8 Target Size (W3C).

    -

    You can render the back link as a button element if necessary in order to post form data back to the previous page.

    @@ -93,8 +82,17 @@ type: "button" }) }} + +

    Use the nhsuk-back-link--reverse modifier class to show white links and arrows on dark backgrounds – for example, in headers, custom components, and patterns with darker backgrounds.

    +

    Make sure all users can see the back link – the background colour must have a contrast ratio of at least 4.5:1 with white to meet WCAG 2.2 success criterion 1.4.3 Contrast (minimum), level AA.

    + +{{ designExample({ + group: "components", + item: "back-link", + type: "reverse" +}) }} +

    Research

    During testing, NHS 111 online found that some users wanted to change their answers, so they introduced a back link and labelled it to "Change my previous answer".

    - {% endblock %} From 7557facb119de47fdf8b5088ab5b8c9bf94abab1 Mon Sep 17 00:00:00 2001 From: Colin Rotherham Date: Thu, 11 Sep 2025 14:06:51 +0100 Subject: [PATCH 11/30] Fix error 404 page for design examples --- app.js | 7 ++++++- lib/file-helper.js | 14 ++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/app.js b/app.js index 05799897e..8440c2aee 100755 --- a/app.js +++ b/app.js @@ -101,9 +101,14 @@ env.addFilter('highlight', filters.highlight) env.addFilter('markdown', filters.markdown) // Render standalone design examples -app.get('/design-example/:group/:item/:type', (req, res) => { +app.get('/design-example/:group/:item/:type', (req, res, next) => { const { group, item, type } = req.params + // Continue to 404 page + if (!fileHelper.hasNunjucksPath({ group, item, type })) { + return next() + } + // Get the given example as HTML. const exampleHtml = fileHelper.getHTMLCode({ group, diff --git a/lib/file-helper.js b/lib/file-helper.js index 96bb0305e..390156e91 100644 --- a/lib/file-helper.js +++ b/lib/file-helper.js @@ -83,6 +83,15 @@ function getNunjucksParams(item) { return params } +/** + * Check Nunjucks path for an example exists + * + * @param {FileOptions} options + */ +function hasNunjucksPath({ group, item, type }) { + return existsSync(getNunjucksPath({ group, item, type })) +} + /** * Get Nunjucks path for an example * @@ -151,6 +160,10 @@ function getFrontmatter({ group, item, type }) { // Path to Nunjucks example template const path = getNunjucksPath({ group, item, type }) + if (!existsSync(path)) { + return frontmatter + } + try { frontmatter = matter(getFileContents(path)) } catch { @@ -187,6 +200,7 @@ function getAssetPath(pathname = '') { module.exports = { getNunjucksParams, + hasNunjucksPath, getNunjucksPath, getNunjucksCode, getHTMLCode, From cbc892d4bdaa99edd59287b9679c9c79d1f1eacd Mon Sep 17 00:00:00 2001 From: Colin Rotherham Date: Thu, 11 Sep 2025 14:08:33 +0100 Subject: [PATCH 12/30] Move and redirect checkboxes hint text example --- app.js | 6 ++++++ .../components/checkboxes/{hint => hint-text}/index.njk | 0 app/views/design-system/components/checkboxes/index.njk | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) rename app/views/design-system/components/checkboxes/{hint => hint-text}/index.njk (100%) diff --git a/app.js b/app.js index 8440c2aee..782f194fd 100755 --- a/app.js +++ b/app.js @@ -235,6 +235,12 @@ app.get( } ) +// Redirects for design system examples + +app.get('/design-example/components/checkboxes/hint', (req, res) => { + res.redirect('/design-example/components/checkboxes/hint-text') +}) + // Redirects for design system patterns app.get( diff --git a/app/views/design-system/components/checkboxes/hint/index.njk b/app/views/design-system/components/checkboxes/hint-text/index.njk similarity index 100% rename from app/views/design-system/components/checkboxes/hint/index.njk rename to app/views/design-system/components/checkboxes/hint-text/index.njk diff --git a/app/views/design-system/components/checkboxes/index.njk b/app/views/design-system/components/checkboxes/index.njk index 0354c0de0..d789d3fa9 100644 --- a/app/views/design-system/components/checkboxes/index.njk +++ b/app/views/design-system/components/checkboxes/index.njk @@ -51,7 +51,7 @@ {{ designExample({ group: "components", item: "checkboxes", - type: "hint" + type: "hint-text" }) }}

    Checkbox items with hints

    From 846712ae8a3e6ff06453dce32ad44c72d0565aaa Mon Sep 17 00:00:00 2001 From: Colin Rotherham Date: Thu, 11 Sep 2025 14:34:51 +0100 Subject: [PATCH 13/30] Fix typo in checkboxes hint text example --- .../design-system/components/hint-text/checkboxes/index.njk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/design-system/components/hint-text/checkboxes/index.njk b/app/views/design-system/components/hint-text/checkboxes/index.njk index 6d12195b2..0f5ca3ad3 100644 --- a/app/views/design-system/components/hint-text/checkboxes/index.njk +++ b/app/views/design-system/components/hint-text/checkboxes/index.njk @@ -5,7 +5,7 @@ name: "contact", fieldset: { legend: { - text: "How do you want to be contacted about this?, + text: "How do you want to be contacted about this?", classes: "nhsuk-fieldset__legend--l", isPageHeading: true } From c1b5e03806e2b938879c03b4b46a9b8dadbbc6cf Mon Sep 17 00:00:00 2001 From: Sara Wilcox <45792959+sarawilcox@users.noreply.github.com> Date: Mon, 15 Sep 2025 13:51:20 +0000 Subject: [PATCH 14/30] Shorten and align wording about reverse examples --- CHANGELOG.md | 6 ++++++ .../design-system/components/action-link/index.njk | 11 ++++------- .../design-system/components/back-link/index.njk | 4 ++-- .../design-system/components/breadcrumbs/index.njk | 4 ++-- app/views/design-system/styles/typography/index.njk | 2 +- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e8f1c03b..474e23d13 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # NHS digital service manual Changelog +## Unreleased + +:wrench: **Maintenance** + +- Update wording about reverse examples + ## 8.1.0 - 24 September 2025 :new: **New features** diff --git a/app/views/design-system/components/action-link/index.njk b/app/views/design-system/components/action-link/index.njk index d95125117..05ac4eb97 100644 --- a/app/views/design-system/components/action-link/index.njk +++ b/app/views/design-system/components/action-link/index.njk @@ -3,7 +3,7 @@ {% set subSection = "Components" %} {% set pageDescription = "Use action links to help users get to the next stage of a journey quickly by signposting the start of a digital service." %} {% set theme = "Navigation" %} -{% set dateUpdated = "August 2025" %} +{% set dateUpdated = "September 2025" %} {% set backlog_issue_id = "5" %} {% extends "layouts/app-layout.njk" %} @@ -42,8 +42,8 @@

    The link colour and background colour contrast ratio is 5.76:1, which passes AAA guidelines at that font size.

    -

    Use the nhsuk-action-link--reverse modifier class to show white links and arrows on dark backgrounds – for example, in custom components and patterns with darker backgrounds.

    -

    Make sure all users can see the action link – the background colour must have a contrast ratio of at least 4.5:1 with white to meet WCAG 2.2 success criterion 1.4.3 Contrast (minimum), level AA.

    +

    Use the nhsuk-action-link--reverse modifier class to show white links and arrows on dark backgrounds.

    +

    Make sure all users can see the action link. The background colour must have a contrast ratio of at least 4.5:1 with white to meet WCAG 2.2 success criterion 1.4.3 Contrast (minimum), level AA (W3C).

    {{ designExample({ group: "components", @@ -51,13 +51,10 @@ type: "reverse" }) }} -

    Accessibility

    -

    The link colour and background colour contrast ratio is 5.76:1, which passes AAA guidelines at that font size.

    -

    Research

    We tested the action links on health information pages with lots of content, callout boxes and multi-page navigation.

    Users didn't notice early versions, so we made the size of the text larger than body text size.

    -

    We used NHS blue first but users didn't notice it. So we changed the arrow colour to green - our "action" colour. Users seemed to see the green better.

    +

    We used NHS blue first but users didn't notice it. So we changed the arrow colour to green (our "action" colour). Users seemed to see the green better.

    In follow-up tests on busy content pages, users pointed out the action links and said they found them useful.

    Get in touch to share your research findings about this pattern.

    diff --git a/app/views/design-system/components/back-link/index.njk b/app/views/design-system/components/back-link/index.njk index 1f87b8134..8c933a692 100644 --- a/app/views/design-system/components/back-link/index.njk +++ b/app/views/design-system/components/back-link/index.njk @@ -83,8 +83,8 @@ }) }} -

    Use the nhsuk-back-link--reverse modifier class to show white links and arrows on dark backgrounds – for example, in headers, custom components, and patterns with darker backgrounds.

    -

    Make sure all users can see the back link – the background colour must have a contrast ratio of at least 4.5:1 with white to meet WCAG 2.2 success criterion 1.4.3 Contrast (minimum), level AA.

    +

    Use the nhsuk-back-link--reverse modifier class to show white links and arrows on dark backgrounds.

    +

    Make sure all users can see the back link. The background colour must have a contrast ratio of at least 4.5:1 with white to meet WCAG 2.2 success criterion 1.4.3 Contrast (minimum), level AA (W3C).

    {{ designExample({ group: "components", diff --git a/app/views/design-system/components/breadcrumbs/index.njk b/app/views/design-system/components/breadcrumbs/index.njk index 489616d54..265aac4f3 100644 --- a/app/views/design-system/components/breadcrumbs/index.njk +++ b/app/views/design-system/components/breadcrumbs/index.njk @@ -58,8 +58,8 @@ screen readers know what it is.

    -

    Use the nhsuk-breadcrumb--reverse modifier class to show white links and arrows on dark backgrounds, for example, in headers, custom components, and patterns with darker backgrounds.

    -

    Make sure all users can see the breadcrumbs. The background colour must have a contrast ratio of at least 4.5:1 with white to meet WCAG 2.2 success criterion 1.4.3 Contrast (minimum), level AA.

    +

    Use the nhsuk-breadcrumb--reverse modifier class to show white links and arrows on dark backgrounds.

    +

    Make sure all users can see the breadcrumbs. The background colour must have a contrast ratio of at least 4.5:1 with white to meet WCAG 2.2 success criterion 1.4.3 Contrast (minimum), level AA (W3C).

    {{ designExample({ group: "components", diff --git a/app/views/design-system/styles/typography/index.njk b/app/views/design-system/styles/typography/index.njk index b62eb39f0..e92bb4e1c 100644 --- a/app/views/design-system/styles/typography/index.njk +++ b/app/views/design-system/styles/typography/index.njk @@ -226,7 +226,7 @@

    If the link is on a dark background, for example in custom components, use the nhsuk-link--reverse modifier class to make the text white.

    -

    The white links and background colour must have a contrast ratio of at least 4.5:1 to meet WCAG 2.2 success criterion 1.4.3 Contrast (minimum), level AA.

    +

    The white links and background colour must have a contrast ratio of at least 4.5:1 to meet WCAG 2.2 success criterion 1.4.3 Contrast (minimum), level AA (W3C).

    {{ designExample({ group: "styles", From ebafbb0dd4626198b2b2b464fc0bb85d6e70d676 Mon Sep 17 00:00:00 2001 From: Sara Wilcox <45792959+sarawilcox@users.noreply.github.com> Date: Mon, 15 Sep 2025 13:55:17 +0000 Subject: [PATCH 15/30] Update page dates for components with reverse examples --- app/views/design-system/components/back-link/index.njk | 2 +- app/views/design-system/components/breadcrumbs/index.njk | 2 +- app/views/design-system/components/buttons/index.njk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/design-system/components/back-link/index.njk b/app/views/design-system/components/back-link/index.njk index 8c933a692..ad0802544 100644 --- a/app/views/design-system/components/back-link/index.njk +++ b/app/views/design-system/components/back-link/index.njk @@ -3,7 +3,7 @@ {% set subSection = "Components" %} {% set pageDescription = "Use back links to help users go back to the previous page in a multi-page transaction." %} {% set theme = "Navigation" %} -{% set dateUpdated = "August 2025" %} +{% set dateUpdated = "September 2025" %} {% set backlog_issue_id = "32" %} {% extends "layouts/app-layout.njk" %} diff --git a/app/views/design-system/components/breadcrumbs/index.njk b/app/views/design-system/components/breadcrumbs/index.njk index 265aac4f3..272347ebc 100644 --- a/app/views/design-system/components/breadcrumbs/index.njk +++ b/app/views/design-system/components/breadcrumbs/index.njk @@ -3,7 +3,7 @@ {% set subSection = "Components" %} {% set pageDescription = "Use breadcrumbs to help users understand where they are in the website." %} {% set theme = "Navigation" %} -{% set dateUpdated = "August 2025" %} +{% set dateUpdated = "September 2025" %} {% set backlog_issue_id = "6" %} {% extends "layouts/app-layout.njk" %} diff --git a/app/views/design-system/components/buttons/index.njk b/app/views/design-system/components/buttons/index.njk index 30e7851cd..298f446ec 100644 --- a/app/views/design-system/components/buttons/index.njk +++ b/app/views/design-system/components/buttons/index.njk @@ -3,7 +3,7 @@ {% set subSection = "Components" %} {% set pageDescription = "Use buttons to help users carry out an action on a page like starting an application or saving their progress." %} {% set theme = "Form elements" %} -{% set dateUpdated = "August 2025" %} +{% set dateUpdated = "September 2025" %} {% set backlog_issue_id = "7" %} {% extends "layouts/app-layout.njk" %} From 9d178b0e3eee54e68fbc31b33d7ccb0e526c38d1 Mon Sep 17 00:00:00 2001 From: Colin Rotherham Date: Mon, 15 Sep 2025 15:29:34 +0100 Subject: [PATCH 16/30] Update more examples to prefer set over inline html --- .../components/card/default/index.njk | 6 +- .../patterns/a-to-z-page/panel/index.njk | 89 ++++++++++++------- .../non-urgent/index.njk | 14 +-- .../two-colons/index.njk | 16 ++-- .../urgent/index.njk | 16 ++-- 5 files changed, 87 insertions(+), 54 deletions(-) diff --git a/app/views/design-system/components/card/default/index.njk b/app/views/design-system/components/card/default/index.njk index b254323c2..c5b130391 100644 --- a/app/views/design-system/components/card/default/index.njk +++ b/app/views/design-system/components/card/default/index.njk @@ -1,7 +1,11 @@ {% from 'card/macro.njk' import card %} +{% set cardDescriptionHtml %} +

    Go to NHS 111 online or call 111

    +{% endset %} + {{ card({ heading: "If you need help now, but it’s not an emergency", headingLevel: "3", - descriptionHtml: "

    Go to NHS 111 online or call 111

    " + descriptionHtml: cardDescriptionHtml }) }} diff --git a/app/views/design-system/patterns/a-to-z-page/panel/index.njk b/app/views/design-system/patterns/a-to-z-page/panel/index.njk index c465adf8b..ad65eadc0 100644 --- a/app/views/design-system/patterns/a-to-z-page/panel/index.njk +++ b/app/views/design-system/patterns/a-to-z-page/panel/index.njk @@ -2,58 +2,81 @@ {% block content %}
    + {% set cardADescriptionHtml %} + + {% endset %} + {{ card({ - feature: "true", - heading: "A", - headingClasses: "nhsuk-u-font-size-24", - descriptionHtml: "" - }) }} + feature: "true", + heading: "A", + headingClasses: "nhsuk-u-font-size-24", + descriptionHtml: cardADescriptionHtml + }) }} + + + {% set cardBDescriptionHtml %} +
      +
    • There are currently no conditions listed
    • +
    + {% endset %} + {{ card({ - feature: "true", - heading: "B", - headingClasses: "nhsuk-u-font-size-24", - descriptionHtml: "
      -
    • There are currently no conditions listed
    • -
    " - }) }} + feature: "true", + heading: "B", + headingClasses: "nhsuk-u-font-size-24", + descriptionHtml: cardBDescriptionHtml + }) }} + + + {% set cardCDescriptionHtml %} + + {% endset %} + {{ card({ - feature: "true", - heading: "C", - headingClasses: "nhsuk-u-font-size-24", - descriptionHtml: "" - }) }} + feature: "true", + heading: "C", + headingClasses: "nhsuk-u-font-size-24", + descriptionHtml: cardCDescriptionHtml + }) }} + + + {% set cardDDescriptionHtml %} + + {% endset %} + {{ card({ - feature: "true", - heading: "D", - headingClasses: "nhsuk-u-font-size-24", - descriptionHtml: "" - }) }} + feature: "true", + heading: "D", + headingClasses: "nhsuk-u-font-size-24", + descriptionHtml: cardDDescriptionHtml + }) }} +
    Back to top diff --git a/app/views/design-system/patterns/help-users-decide-when-and-where-to-get-care/non-urgent/index.njk b/app/views/design-system/patterns/help-users-decide-when-and-where-to-get-care/non-urgent/index.njk index 5556dd5cd..4350ff3eb 100644 --- a/app/views/design-system/patterns/help-users-decide-when-and-where-to-get-care/non-urgent/index.njk +++ b/app/views/design-system/patterns/help-users-decide-when-and-where-to-get-care/non-urgent/index.njk @@ -1,15 +1,17 @@ {% from 'card/macro.njk' import card %} -{{ card({ - type: "non-urgent", - heading: "Speak to a GP if:", - descriptionHtml: " +{% set cardDescriptionHtml %}

    Tell the receptionist you think it's chickenpox before going in. They may recommend a special appointment time if other patients are at risk.

    - " +{% endset %} + +{{ card({ + type: "non-urgent", + heading: "Speak to a GP if:", + descriptionHtml: cardDescriptionHtml }) }} diff --git a/app/views/design-system/patterns/help-users-decide-when-and-where-to-get-care/two-colons/index.njk b/app/views/design-system/patterns/help-users-decide-when-and-where-to-get-care/two-colons/index.njk index 4c3d26f0a..602c682ee 100644 --- a/app/views/design-system/patterns/help-users-decide-when-and-where-to-get-care/two-colons/index.njk +++ b/app/views/design-system/patterns/help-users-decide-when-and-where-to-get-care/two-colons/index.njk @@ -1,16 +1,18 @@ {% from 'card/macro.njk' import card %} -{{ card({ - type: "emergency", - heading: "Call 999 or go to A&E if:", - descriptionHtml: " +{% set cardDescriptionHtml %}

    You've been exposed to very cold temperatures and:

      -
    • have hard, frozen skin
    • +
    • have hard, frozen skin
    • have swelling and loss of feeling in the affected area
    • have blisters filled with blood or a clear or milky fluid
    • you're constantly shivering, have slurred speech, slow breathing and are tired and confused
    -

    Find your nearest A&E

    - " +

    Find your nearest A&E

    +{% endset %} + +{{ card({ + type: "emergency", + heading: "Call 999 or go to A&E if:", + descriptionHtml: cardDescriptionHtml }) }} diff --git a/app/views/design-system/patterns/help-users-decide-when-and-where-to-get-care/urgent/index.njk b/app/views/design-system/patterns/help-users-decide-when-and-where-to-get-care/urgent/index.njk index 19b3fdb4a..1c0079522 100644 --- a/app/views/design-system/patterns/help-users-decide-when-and-where-to-get-care/urgent/index.njk +++ b/app/views/design-system/patterns/help-users-decide-when-and-where-to-get-care/urgent/index.njk @@ -1,15 +1,17 @@ {% from 'card/macro.njk' import card %} -{{ card({ - type: "urgent", - heading: "Ask for an urgent GP appointment or get help from NHS 111 if you have:", - descriptionHtml: " +{% set cardDescriptionHtml %}
    • pain in your eyes
    • changes to your vision, such as vision loss or blurred vision
    • very red eyes
    -

    These can be signs of a more serious eye problem.

    -

    You can call 111 or get help from 111 online.

    - " +

    These can be signs of a more serious eye problem.

    +

    You can call 111 or get help from 111 online.

    +{% endset %} + +{{ card({ + type: "urgent", + heading: "Ask for an urgent GP appointment or get help from NHS 111 if you have:", + descriptionHtml: cardDescriptionHtml }) }} From 08f08e74a46f748bb8d5c6a743b25b79c875e645 Mon Sep 17 00:00:00 2001 From: Colin Rotherham Date: Mon, 15 Sep 2025 15:31:34 +0100 Subject: [PATCH 17/30] Prefer single quotes when strings contain double quotes --- .../design-system/components/card/group-quarter/index.njk | 8 ++++---- .../patterns/ask-for-nhs-numbers/default/index.njk | 2 +- .../patterns/ask-for-nhs-numbers/error/index.njk | 2 +- .../patterns/ask-for-nhs-numbers/filter-single/index.njk | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/views/design-system/components/card/group-quarter/index.njk b/app/views/design-system/components/card/group-quarter/index.njk index d8d14be52..efe3842a3 100644 --- a/app/views/design-system/components/card/group-quarter/index.njk +++ b/app/views/design-system/components/card/group-quarter/index.njk @@ -4,25 +4,25 @@
  • {{ card({ clickable: "true", - headingHtml: "

    91 Applicants

    Applicants" + headingHtml: '

    91 Applicants

    Applicants' }) }}
  • {{ card({ clickable: "true", - headingHtml: "

    23 Jobs

    Jobs" + headingHtml: '

    23 Jobs

    Jobs' }) }}
  • {{ card({ clickable: "true", - headingHtml: "

    8 Services

    Services" + headingHtml: '

    8 Services

    Services' }) }}
  • {{ card({ clickable: "true", - headingHtml: "

    33 Messages

    Messages" + headingHtml: '

    33 Messages

    Messages' }) }}
  • diff --git a/app/views/design-system/patterns/ask-for-nhs-numbers/default/index.njk b/app/views/design-system/patterns/ask-for-nhs-numbers/default/index.njk index c770a209e..fa66f5c8a 100644 --- a/app/views/design-system/patterns/ask-for-nhs-numbers/default/index.njk +++ b/app/views/design-system/patterns/ask-for-nhs-numbers/default/index.njk @@ -18,7 +18,7 @@ previewLayout: design-example-wrapper-full isPageHeading: true }, hint: { - html: "Your NHS number is a 10 digit number that you find on any letter the NHS has sent you, for example, 485 777 3456" + html: 'Your NHS number is a 10 digit number that you find on any letter the NHS has sent you, for example, 485 777 3456' }, id: "nhs-number", name: "nhs-number", diff --git a/app/views/design-system/patterns/ask-for-nhs-numbers/error/index.njk b/app/views/design-system/patterns/ask-for-nhs-numbers/error/index.njk index ae6fb6794..11497d4d5 100644 --- a/app/views/design-system/patterns/ask-for-nhs-numbers/error/index.njk +++ b/app/views/design-system/patterns/ask-for-nhs-numbers/error/index.njk @@ -29,7 +29,7 @@ previewLayout: design-example-wrapper-full isPageHeading: true }, hint: { - html: "Your NHS number is a 10 digit number that you find on any letter the NHS has sent you, for example, 485 777 3456" + html: 'Your NHS number is a 10 digit number that you find on any letter the NHS has sent you, for example, 485 777 3456' }, errorMessage: { text: "Your NHS number is too long" diff --git a/app/views/design-system/patterns/ask-for-nhs-numbers/filter-single/index.njk b/app/views/design-system/patterns/ask-for-nhs-numbers/filter-single/index.njk index 581faa5ba..71c753e1b 100644 --- a/app/views/design-system/patterns/ask-for-nhs-numbers/filter-single/index.njk +++ b/app/views/design-system/patterns/ask-for-nhs-numbers/filter-single/index.njk @@ -18,7 +18,7 @@ previewLayout: design-example-wrapper-full isPageHeading: true }, hint: { - html: "Your NHS number is a 10 digit number, for example 485 777 3456" + html: 'Your NHS number is a 10 digit number, for example 485 777 3456' }, id: "nhs-number", name: "nhs-number", From d5b3310c5c30d9a5f28309608f9006baa7f71d7f Mon Sep 17 00:00:00 2001 From: Colin Rotherham Date: Mon, 15 Sep 2025 15:47:15 +0100 Subject: [PATCH 18/30] Prefer double quotes in Nunjucks --- .../make-sure-you-need-each-question.njk | 4 +- app/views/cookie-policy.njk | 4 +- .../components/action-link/default/index.njk | 2 +- .../components/action-link/reverse/index.njk | 2 +- .../components/back-link/button/index.njk | 2 +- .../components/back-link/default/index.njk | 2 +- .../components/back-link/reverse/index.njk | 2 +- .../components/breadcrumbs/default/index.njk | 2 +- .../components/breadcrumbs/reverse/index.njk | 2 +- .../buttons/button-group-link/index.njk | 2 +- .../components/buttons/button-group/index.njk | 2 +- .../components/buttons/default/index.njk | 2 +- .../buttons/prevent-double-click/index.njk | 2 +- .../components/buttons/reverse/index.njk | 2 +- .../buttons/secondary-solid/index.njk | 2 +- .../components/buttons/secondary/index.njk | 2 +- .../components/buttons/warning/index.njk | 2 +- .../components/card/clickable/index.njk | 2 +- .../components/card/default/index.njk | 2 +- .../components/card/group-half/index.njk | 2 +- .../components/card/group-quarter/index.njk | 2 +- .../components/card/group-third/index.njk | 2 +- .../components/card/heading-level/index.njk | 2 +- .../components/card/heading-size/index.njk | 2 +- .../components/card/primary-card/index.njk | 2 +- .../components/card/secondary-card/index.njk | 2 +- .../components/card/top-task/index.njk | 4 +- .../components/card/with-image/index.njk | 2 +- .../character-count/default/index.njk | 2 +- .../character-count/error/index.njk | 4 +- .../character-count/threshold/index.njk | 2 +- .../character-count/without-heading/index.njk | 2 +- .../character-count/word-count/index.njk | 2 +- .../checkboxes/conditional/index.njk | 4 +- .../components/checkboxes/default/index.njk | 2 +- .../checkboxes/error-messages/index.njk | 2 +- .../components/checkboxes/hint-text/index.njk | 2 +- .../checkboxes/items-with-hints/index.njk | 2 +- .../checkboxes/none-option/index.njk | 2 +- .../contents-list/default/index.njk | 2 +- .../components/date-input/default/index.njk | 2 +- .../date-input/with-errors/index.njk | 2 +- .../components/details/default/index.njk | 2 +- .../do-and-dont-lists/default/index.njk | 2 +- .../error-message/default/index.njk | 2 +- .../error-summary-placement-input/index.njk | 8 +- .../index.njk | 8 +- .../error-summary-placement/index.njk | 8 +- .../error-message/in-context/index.njk | 4 +- .../components/error-message/input/index.njk | 2 +- .../components/error-message/radios/index.njk | 2 +- .../error-summary/default/index.njk | 2 +- .../error-summary/link-input/index.njk | 4 +- .../link-multiple-input/index.njk | 4 +- .../error-summary/link-options/index.njk | 4 +- .../error-summary/placement/index.njk | 8 +- .../components/expander/default/index.njk | 2 +- .../components/expander/group/index.njk | 2 +- .../components/fieldset/as-heading/index.njk | 2 +- .../components/fieldset/default/index.njk | 2 +- .../components/footer/columns/index.njk | 2 +- .../components/footer/default/index.njk | 2 +- .../components/header/account-basic/index.njk | 2 +- .../header/account-complex/index.njk | 2 +- .../components/header/default/index.njk | 18 ++--- .../header/logo-service-name/index.njk | 2 +- .../components/header/navigation/index.njk | 18 ++--- .../index.njk | 2 +- .../header/organisational-white/index.njk | 2 +- .../header/organisational/index.njk | 2 +- .../components/header/search/index.njk | 2 +- .../components/hint-text/checkboxes/index.njk | 2 +- .../components/hint-text/default/index.njk | 2 +- .../components/hint-text/input/index.njk | 2 +- .../hint-text/radio-item-with-hints/index.njk | 2 +- .../components/hint-text/radios/index.njk | 6 +- .../components/hint-text/textarea/index.njk | 2 +- .../components/images/default/index.njk | 2 +- .../components/inset-text/default/index.njk | 2 +- .../components/pagination/default/index.njk | 2 +- .../components/panel/default/index.njk | 4 +- .../components/radios/conditional/index.njk | 4 +- .../components/radios/default/index.njk | 2 +- .../components/radios/error-message/index.njk | 2 +- .../components/radios/inline/index.njk | 2 +- .../items-with-a-text-divider/index.njk | 2 +- .../radios/with-hints-options/index.njk | 2 +- .../components/radios/with-hints/index.njk | 6 +- .../components/select/default/index.njk | 2 +- .../components/skip-link/default/index.njk | 2 +- .../summary-list/without-border/index.njk | 2 +- .../components/table/3-column/index.njk | 2 +- .../components/table/basic/index.njk | 2 +- .../components/table/missing-data/index.njk | 2 +- .../components/table/responsive/index.njk | 4 +- .../components/table/word-break/index.njk | 4 +- .../components/tabs/default/index.njk | 80 +++++++++---------- .../components/tag/colours/index.njk | 2 +- .../components/tag/default/index.njk | 2 +- .../components/tag/multiple/index.njk | 2 +- .../components/text-input/default/index.njk | 2 +- .../error-and-prefix-and-suffix/index.njk | 2 +- .../components/text-input/error/index.njk | 2 +- .../text-input/fixed-width/index.njk | 2 +- .../text-input/fluid-width/index.njk | 2 +- .../components/text-input/hint-text/index.njk | 2 +- .../components/text-input/number/index.njk | 2 +- .../text-input/prefix-and-suffix/index.njk | 2 +- .../components/text-input/prefix/index.njk | 2 +- .../components/text-input/suffix/index.njk | 2 +- .../components/textarea/default/index.njk | 2 +- .../components/textarea/error/index.njk | 2 +- .../components/textarea/right-size/index.njk | 2 +- .../warning-callout/custom-heading/index.njk | 2 +- .../warning-callout/default/index.njk | 2 +- .../patterns/a-to-z-page/default/index.njk | 2 +- .../patterns/a-to-z-page/panel/index.njk | 2 +- .../ask-for-nhs-numbers/default/index.njk | 4 +- .../ask-for-nhs-numbers/error/index.njk | 6 +- .../filter-single/index.njk | 4 +- .../filter-third/index.njk | 8 +- .../ask-for-nhs-numbers/filter/index.njk | 8 +- .../patterns/check-answers/example/index.njk | 4 +- .../complete-multiple-tasks/example/index.njk | 4 +- .../index.njk | 4 +- .../have-you-completed-this-section/index.njk | 4 +- .../confirmation-page/default/index.njk | 2 +- .../emergency/index.njk | 4 +- .../non-urgent/index.njk | 2 +- .../two-colons/index.njk | 2 +- .../urgent/index.njk | 2 +- .../page/index.njk | 18 ++--- .../mini-hub/example-symptoms/index.njk | 10 +-- .../patterns/mini-hub/example/index.njk | 6 +- .../question-pages/complex-question/index.njk | 6 +- .../patterns/question-pages/default/index.njk | 6 +- .../label-page-heading/index.njk | 6 +- .../legend-page-heading/index.njk | 6 +- .../multiple-questions/index.njk | 6 +- .../patterns/start-page/example/index.njk | 4 +- .../styles/page-template/annotated/index.njk | 2 +- .../styles/page-template/component/index.njk | 2 +- .../styles/page-template/content/index.njk | 16 ++-- .../use-frutiger-font/terms-of-licence.njk | 4 +- app/views/includes/_header.njk | 2 +- app/views/layouts/design-example-wrapper.njk | 2 +- app/views/layouts/layout.njk | 69 ++++++++-------- app/views/macros/design-example/macro.njk | 4 +- 148 files changed, 317 insertions(+), 312 deletions(-) diff --git a/app/views/content/how-to-write-good-questions-for-forms/make-sure-you-need-each-question.njk b/app/views/content/how-to-write-good-questions-for-forms/make-sure-you-need-each-question.njk index 32985d8ed..7a1c0f8e0 100644 --- a/app/views/content/how-to-write-good-questions-for-forms/make-sure-you-need-each-question.njk +++ b/app/views/content/how-to-write-good-questions-for-forms/make-sure-you-need-each-question.njk @@ -69,7 +69,7 @@ {{ input({ label: { - html: 'Name (optional)' + html: "Name (optional)" }, id: "name", name: "name" @@ -77,7 +77,7 @@ {{ input({ label: { - html: 'Email address' + html: "Email address" }, id: "email", name: "email" diff --git a/app/views/cookie-policy.njk b/app/views/cookie-policy.njk index c57de6793..141708590 100644 --- a/app/views/cookie-policy.njk +++ b/app/views/cookie-policy.njk @@ -122,7 +122,7 @@ { header: "Cookie name", html: "com.adobe.reactor.dataElementCookiesMigrated", - classes: 'nhsuk-u-text-break-word' + classes: "nhsuk-u-text-break-word" }, { header: "Purpose", @@ -215,7 +215,7 @@ fieldset: { legend: { text: "Tell us if we can use analytics cookies", - classes: 'nhsuk-fieldset__legend--m' + classes: "nhsuk-fieldset__legend--m" } }, name: "input-statistics", diff --git a/app/views/design-system/components/action-link/default/index.njk b/app/views/design-system/components/action-link/default/index.njk index aec215c4a..673b7d24c 100644 --- a/app/views/design-system/components/action-link/default/index.njk +++ b/app/views/design-system/components/action-link/default/index.njk @@ -1,4 +1,4 @@ -{% from 'action-link/macro.njk' import actionLink %} +{% from "action-link/macro.njk" import actionLink %} {{ actionLink({ text: "Find your nearest A&E", diff --git a/app/views/design-system/components/action-link/reverse/index.njk b/app/views/design-system/components/action-link/reverse/index.njk index 257f589de..a82cfee62 100644 --- a/app/views/design-system/components/action-link/reverse/index.njk +++ b/app/views/design-system/components/action-link/reverse/index.njk @@ -2,7 +2,7 @@ background: blue --- -{% from 'action-link/macro.njk' import actionLink %} +{% from "action-link/macro.njk" import actionLink %} {{ actionLink({ text: "Find your nearest A&E", diff --git a/app/views/design-system/components/back-link/button/index.njk b/app/views/design-system/components/back-link/button/index.njk index e2db47496..6de59ead3 100644 --- a/app/views/design-system/components/back-link/button/index.njk +++ b/app/views/design-system/components/back-link/button/index.njk @@ -1,4 +1,4 @@ -{% from 'back-link/macro.njk' import backLink %} +{% from "back-link/macro.njk" import backLink %} {{ backLink({ text: "Back", diff --git a/app/views/design-system/components/back-link/default/index.njk b/app/views/design-system/components/back-link/default/index.njk index 63a633a55..dd4d2e3f5 100644 --- a/app/views/design-system/components/back-link/default/index.njk +++ b/app/views/design-system/components/back-link/default/index.njk @@ -1,4 +1,4 @@ -{% from 'back-link/macro.njk' import backLink %} +{% from "back-link/macro.njk" import backLink %} {{ backLink({ href: "#", diff --git a/app/views/design-system/components/back-link/reverse/index.njk b/app/views/design-system/components/back-link/reverse/index.njk index aefa3a63d..215ac6b09 100644 --- a/app/views/design-system/components/back-link/reverse/index.njk +++ b/app/views/design-system/components/back-link/reverse/index.njk @@ -2,7 +2,7 @@ background: blue --- -{% from 'back-link/macro.njk' import backLink %} +{% from "back-link/macro.njk" import backLink %} {{ backLink({ href: "#", diff --git a/app/views/design-system/components/breadcrumbs/default/index.njk b/app/views/design-system/components/breadcrumbs/default/index.njk index 2a2545874..1d7cf19bc 100644 --- a/app/views/design-system/components/breadcrumbs/default/index.njk +++ b/app/views/design-system/components/breadcrumbs/default/index.njk @@ -1,4 +1,4 @@ -{% from 'breadcrumb/macro.njk' import breadcrumb %} +{% from "breadcrumb/macro.njk" import breadcrumb %} {{ breadcrumb({ items: [ diff --git a/app/views/design-system/components/breadcrumbs/reverse/index.njk b/app/views/design-system/components/breadcrumbs/reverse/index.njk index f12f912a7..de0bccde5 100644 --- a/app/views/design-system/components/breadcrumbs/reverse/index.njk +++ b/app/views/design-system/components/breadcrumbs/reverse/index.njk @@ -2,7 +2,7 @@ background: blue --- -{% from 'breadcrumb/macro.njk' import breadcrumb %} +{% from "breadcrumb/macro.njk" import breadcrumb %} {{ breadcrumb({ classes: "nhsuk-breadcrumb--reverse", diff --git a/app/views/design-system/components/buttons/button-group-link/index.njk b/app/views/design-system/components/buttons/button-group-link/index.njk index 960705a70..f78d1bb58 100644 --- a/app/views/design-system/components/buttons/button-group-link/index.njk +++ b/app/views/design-system/components/buttons/button-group-link/index.njk @@ -1,4 +1,4 @@ -{% from 'button/macro.njk' import button %} +{% from "button/macro.njk" import button %}
    {{ button({ diff --git a/app/views/design-system/components/buttons/button-group/index.njk b/app/views/design-system/components/buttons/button-group/index.njk index abffc93e8..3233071b0 100644 --- a/app/views/design-system/components/buttons/button-group/index.njk +++ b/app/views/design-system/components/buttons/button-group/index.njk @@ -1,4 +1,4 @@ -{% from 'button/macro.njk' import button %} +{% from "button/macro.njk" import button %}
    {{ button({ diff --git a/app/views/design-system/components/buttons/default/index.njk b/app/views/design-system/components/buttons/default/index.njk index 759d3ced6..2046c387e 100644 --- a/app/views/design-system/components/buttons/default/index.njk +++ b/app/views/design-system/components/buttons/default/index.njk @@ -1,4 +1,4 @@ -{% from 'button/macro.njk' import button %} +{% from "button/macro.njk" import button %} {{ button({ text: "Continue" diff --git a/app/views/design-system/components/buttons/prevent-double-click/index.njk b/app/views/design-system/components/buttons/prevent-double-click/index.njk index db248e3d9..b80a2c23e 100644 --- a/app/views/design-system/components/buttons/prevent-double-click/index.njk +++ b/app/views/design-system/components/buttons/prevent-double-click/index.njk @@ -1,4 +1,4 @@ -{% from 'button/macro.njk' import button %} +{% from "button/macro.njk" import button %} {{ button({ text: "Confirm and send", diff --git a/app/views/design-system/components/buttons/reverse/index.njk b/app/views/design-system/components/buttons/reverse/index.njk index 8732f08a7..4267ae11a 100644 --- a/app/views/design-system/components/buttons/reverse/index.njk +++ b/app/views/design-system/components/buttons/reverse/index.njk @@ -2,7 +2,7 @@ background: blue --- -{% from 'button/macro.njk' import button %} +{% from "button/macro.njk" import button %} {{ button({ text: "Continue", diff --git a/app/views/design-system/components/buttons/secondary-solid/index.njk b/app/views/design-system/components/buttons/secondary-solid/index.njk index 79f57258d..a8580915b 100644 --- a/app/views/design-system/components/buttons/secondary-solid/index.njk +++ b/app/views/design-system/components/buttons/secondary-solid/index.njk @@ -2,7 +2,7 @@ background: grey-4 --- -{% from 'button/macro.njk' import button %} +{% from "button/macro.njk" import button %} {{ button({ text: "Find my location", diff --git a/app/views/design-system/components/buttons/secondary/index.njk b/app/views/design-system/components/buttons/secondary/index.njk index 19af9552b..23c259913 100644 --- a/app/views/design-system/components/buttons/secondary/index.njk +++ b/app/views/design-system/components/buttons/secondary/index.njk @@ -1,4 +1,4 @@ -{% from 'button/macro.njk' import button %} +{% from "button/macro.njk" import button %} {{ button({ text: "Find my location", diff --git a/app/views/design-system/components/buttons/warning/index.njk b/app/views/design-system/components/buttons/warning/index.njk index fed9fe42d..aeb0cdffd 100644 --- a/app/views/design-system/components/buttons/warning/index.njk +++ b/app/views/design-system/components/buttons/warning/index.njk @@ -1,4 +1,4 @@ -{% from 'button/macro.njk' import button %} +{% from "button/macro.njk" import button %} {{ button({ text: "Yes, delete this vaccine", diff --git a/app/views/design-system/components/card/clickable/index.njk b/app/views/design-system/components/card/clickable/index.njk index b0389eeb9..260a085a5 100644 --- a/app/views/design-system/components/card/clickable/index.njk +++ b/app/views/design-system/components/card/clickable/index.njk @@ -1,4 +1,4 @@ -{% from 'card/macro.njk' import card %} +{% from "card/macro.njk" import card %} {{ card({ href: "#", diff --git a/app/views/design-system/components/card/default/index.njk b/app/views/design-system/components/card/default/index.njk index c5b130391..9c77beaad 100644 --- a/app/views/design-system/components/card/default/index.njk +++ b/app/views/design-system/components/card/default/index.njk @@ -1,4 +1,4 @@ -{% from 'card/macro.njk' import card %} +{% from "card/macro.njk" import card %} {% set cardDescriptionHtml %}

    Go to NHS 111 online or call 111

    diff --git a/app/views/design-system/components/card/group-half/index.njk b/app/views/design-system/components/card/group-half/index.njk index f289ab673..86b233c7a 100644 --- a/app/views/design-system/components/card/group-half/index.njk +++ b/app/views/design-system/components/card/group-half/index.njk @@ -1,4 +1,4 @@ -{% from 'card/macro.njk' import card %} +{% from "card/macro.njk" import card %}