diff --git a/CHANGELOG.md b/CHANGELOG.md index 537869795..c2f80054b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,13 @@ # NHS.UK frontend Changelog -## Unreleased +## 8.1.0 - 11 January 2024 :wrench: **Fixes** - Updated header component unit tests ([PR 900](https://github.com/nhsuk/nhsuk-frontend/pull/900)). - Fixed bug where the header didn't align with the main width container ([PR 902](https://github.com/nhsuk/nhsuk-frontend/pull/902)). This fixes [Issue 901](https://github.com/nhsuk/nhsuk-frontend/issues/901) +- Clicking the chevron image on a 'Primary Card (With Chevron)' card element now focuses the link ([PR 905](https://github.com/nhsuk/nhsuk-frontend/pull/905)). +- Added font licensing guidance to the relevant package READMEs and updated the copyright guidance to include NHS England ([PR 915](https://github.com/nhsuk/nhsuk-frontend/pull/915)). :new: **New features** diff --git a/README.md b/README.md index 092377e01..9c6946c25 100644 --- a/README.md +++ b/README.md @@ -34,4 +34,4 @@ NHS.UK frontend is maintained by NHS England. [Email us](mailto:service-manual@n ## Licence -The codebase is released under the MIT Licence, unless stated otherwise. This covers both the codebase and any sample code in the documentation. The documentation is © Crown copyright and available under the terms of the Open Government 3.0 licence. +The codebase is released under the MIT Licence, unless stated otherwise. This covers both the codebase and any sample code in the documentation. The documentation is © NHS England and available under the terms of the Open Government 3.0 licence. diff --git a/packages/components/footer/README.md b/packages/components/footer/README.md index 99a2054a3..34e016729 100644 --- a/packages/components/footer/README.md +++ b/packages/components/footer/README.md @@ -4,6 +4,8 @@ Find out more about the footer component and when to use it in the [NHS digital service manual](https://service-manual.nhs.uk/design-system/components/footer). +Your copyright statement must reflect the ownership of your website or service. The NHS website is (c) Crown copyright but the NHS generally does not have Crown status. + ## Quick start examples ### Footer (default) @@ -36,7 +38,7 @@ Find out more about the footer component and when to use it in the [NHS digital
- +
@@ -156,6 +158,9 @@ Find out more about the footer component and when to use it in the [NHS digital +
+ +
diff --git a/packages/components/footer/template.njk b/packages/components/footer/template.njk index 928cc07e4..903485217 100644 --- a/packages/components/footer/template.njk +++ b/packages/components/footer/template.njk @@ -29,7 +29,7 @@ {%- endfor %}
- +
{# close nhsuk-footer #} {% else %} diff --git a/packages/core/README.md b/packages/core/README.md index 00b97c193..e90beb9d1 100644 --- a/packages/core/README.md +++ b/packages/core/README.md @@ -234,6 +234,8 @@ Hide elements visually but keep it in the DOM, useful for screen readers. The default `@font-face`, "Frutiger", is loaded from `https://assets.nhs.uk`. The host for the fonts can be overridden or disabled entirely. +NHS England has a licence for the Frutiger webfont that the NHS website team can use. All other NHS England teams and other NHS organisations **must** have their own licence with Monotype. + - `$nhsuk-fonts-path`: base URL to load fonts from (e.g. `/fonts/`; trailing slash required) - `$nhsuk-include-font-face`: set to false to disable the inclusion of the `@font-face` definition entirely diff --git a/packages/core/generic/_font-face.scss b/packages/core/generic/_font-face.scss index 074167f8a..57b5a7a6b 100644 --- a/packages/core/generic/_font-face.scss +++ b/packages/core/generic/_font-face.scss @@ -4,7 +4,8 @@ // NHS uses the Frutiger font, it was originally made // for print, but we've had to adapt for web. -// https://assets.nhs.uk/fonts/nhsuk-fonts-1.3.0.css +// NHS England has a licence for the Frutiger webfont that the NHS website team can use. +// All other NHS England teams and other NHS organisations must have their own licence with Monotype. /* stylelint-disable indentation */ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Footer_default_0_document_0_iPhone_5_SE.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Footer_default_0_document_0_iPhone_5_SE.png index da63c0803..60b7dd99d 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Footer_default_0_document_0_iPhone_5_SE.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Footer_default_0_document_0_iPhone_5_SE.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Footer_default_0_document_1_iPhone_6-8.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Footer_default_0_document_1_iPhone_6-8.png index d722c2a32..08e70b8fc 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Footer_default_0_document_1_iPhone_6-8.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Footer_default_0_document_1_iPhone_6-8.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Footer_default_0_document_2_iPad.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Footer_default_0_document_2_iPad.png index 42e5057a0..18a7a32a2 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Footer_default_0_document_2_iPad.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Footer_default_0_document_2_iPad.png differ