Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change footer link order and wording to reflect live site changes #972

Merged
merged 8 commits into from
Jun 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## Unreleased

:wrench: **Fixes**

- Change "Contact us" in the footer link examples to "Give us feedback" ([PR 972](https://github.com/nhsuk/nhsuk-frontend/pull/972))

:new: **New features**

- Make nhsuk-page-width a default so that services can override it ([PR 971](https://github.com/nhsuk/nhsuk-frontend/pull/971))
Expand Down
4 changes: 2 additions & 2 deletions app/components/all.njk
Original file line number Diff line number Diff line change
Expand Up @@ -909,8 +909,8 @@
"label": "About us"
},
{
"URL": "https://www.nhs.uk/contact-us/",
"label": "Contact us"
"URL": "https://www.nhs.uk/give-feedback-about-the-nhs-website/",
"label": "Give us feedback"
},
{
"URL": "https://www.nhs.uk/Personalisation/Login.aspx",
Expand Down
2 changes: 1 addition & 1 deletion app/components/footer/custom-copyright.njk
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
{
"URL": "#",
"label": "Contact us"
"label": "Give us feedback"
},
{
"URL": "#",
Expand Down
8 changes: 4 additions & 4 deletions app/components/footer/footer-in-columns.njk
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,6 @@
}
],
"linksColumn3": [
{
"URL": "#",
"label": "Contact us"
},
{
"URL": "#",
"label": "Other NHS websites"
Expand All @@ -86,6 +82,10 @@
"URL": "#",
"label": "About us"
},
{
"URL": "#",
"label": "Give us feedback"
},
{
"URL": "#",
"label": "Accessibility statement"
Expand Down
2 changes: 1 addition & 1 deletion app/components/footer/index.njk
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
},
{
"URL": "#",
"label": "Contact us"
"label": "Give us feedback"
},
{
"URL": "#",
Expand Down
22 changes: 11 additions & 11 deletions packages/components/footer/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Your copyright statement must reflect the ownership of your website or service.
<a class="nhsuk-footer__list-item-link" href="#">Accessibility statement</a>
</li>
<li class="nhsuk-footer__list-item nhsuk-footer-default__list-item">
<a class="nhsuk-footer__list-item-link" href="#">Contact us</a>
<a class="nhsuk-footer__list-item-link" href="#">Give us feedback</a>
</li>
<li class="nhsuk-footer__list-item nhsuk-footer-default__list-item">
<a class="nhsuk-footer__list-item-link" href="#">Cookies</a>
Expand Down Expand Up @@ -59,7 +59,7 @@ Your copyright statement must reflect the ownership of your website or service.
},
{
"URL": "#",
"label": "Contact us"
"label": "Give us feedback"
},
{
"URL": "#",
Expand Down Expand Up @@ -133,9 +133,6 @@ Your copyright statement must reflect the ownership of your website or service.
</li>
</ul>
<ul class="nhsuk-footer__list">
<li class="nhsuk-footer__list-item">
<a class="nhsuk-footer__list-item-link" href="/contact-us/">Contact us</a>
</li>
<li class="nhsuk-footer__list-item">
<a class="nhsuk-footer__list-item-link" href="/nhs-sites/">Other NHS websites</a>
</li>
Expand All @@ -147,6 +144,9 @@ Your copyright statement must reflect the ownership of your website or service.
<li class="nhsuk-footer__list-item">
<a class="nhsuk-footer__list-item-link" href="/about-us/">About us</a>
</li>
<li class="nhsuk-footer__list-item">
<a class="nhsuk-footer__list-item-link" href="/contact-us/">Give us feedback</a>
</li>
<li class="nhsuk-footer__list-item">
<a class="nhsuk-footer__list-item-link" href="/accessibility-statement/">Accessibility statement</a>
</li>
Expand Down Expand Up @@ -234,10 +234,6 @@ Your copyright statement must reflect the ownership of your website or service.
}
],
"linksColumn3": [
{
"URL": "#",
"label": "Contact us"
},
{
"URL": "#",
"label": "Other NHS websites"
Expand All @@ -252,6 +248,10 @@ Your copyright statement must reflect the ownership of your website or service.
"URL": "#",
"label": "About us"
},
{
"URL": "#",
"label": "Give us feedback"
},
{
"URL": "#",
"label": "Accessibility statement"
Expand Down Expand Up @@ -285,7 +285,7 @@ Your copyright statement must reflect the ownership of your website or service.
<a class="nhsuk-footer__list-item-link" href="#">Accessibility statement</a>
</li>
<li class="nhsuk-footer__list-item nhsuk-footer-default__list-item">
<a class="nhsuk-footer__list-item-link" href="#">Contact us</a>
<a class="nhsuk-footer__list-item-link" href="#">Give us feedback</a>
</li>
<li class="nhsuk-footer__list-item nhsuk-footer-default__list-item">
<a class="nhsuk-footer__list-item-link" href="#">Cookies</a>
Expand Down Expand Up @@ -320,7 +320,7 @@ Your copyright statement must reflect the ownership of your website or service.
},
{
"URL": "#",
"label": "Contact us"
"label": "Give us feedback"
},
{
"URL": "#",
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.
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.
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.
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