Skip to content

Commit

Permalink
Merge pull request #915 from nhsuk/update-font-guidance
Browse files Browse the repository at this point in the history
Update font and copyright guidance
  • Loading branch information
roshaanbajwa authored Jan 11, 2024
2 parents 3302f09 + f061e39 commit fc028ad
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 5 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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**

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
7 changes: 6 additions & 1 deletion packages/components/footer/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -36,7 +38,7 @@ Find out more about the footer component and when to use it in the [NHS digital
</li>
</ul>
<div>
<p class="nhsuk-footer__copyright">&copy; Crown copyright</p>
<p class="nhsuk-footer__copyright">&copy; NHS England</p>
</div>
</div>
</div>
Expand Down Expand Up @@ -156,6 +158,9 @@ Find out more about the footer component and when to use it in the [NHS digital
</li>
</ul>
</div>
<div>
<p class="nhsuk-footer__copyright">&copy; Crown copyright</p>
</div>
</div>
</div>
</footer>
Expand Down
2 changes: 1 addition & 1 deletion packages/components/footer/template.njk
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
{%- endfor %}
</ul>
<div>
<p class="nhsuk-footer__copyright">&copy; Crown copyright</p>
<p class="nhsuk-footer__copyright">&copy; NHS England</p>
</div>
</div> {# close nhsuk-footer #}
{% else %}
Expand Down
2 changes: 2 additions & 0 deletions packages/core/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion packages/core/generic/_font-face.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit fc028ad

Please sign in to comment.