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.

Sign up for GitHub

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

Jump to bottom

Incorporate new header and footer style #881

Merged
merged 45 commits into from
Sep 28, 2023
Merged

Incorporate new header and footer style #881

Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
b731336
footer done
roshaanbajwa Jul 24, 2023
c26ffcd
added new header examples
roshaanbajwa Jul 31, 2023
4bcfddc
updated readmes
roshaanbajwa Jul 31, 2023
ed98ccd
fixed naming inconsistencies
roshaanbajwa Jul 31, 2023
4dc2aed
added variations for new footer
roshaanbajwa Aug 2, 2023
6caf834
format read mes
roshaanbajwa Aug 2, 2023
f2c7fa4
added policy link logic to footer
roshaanbajwa Aug 2, 2023
ec96f0a
remove old header and footer and update links
roshaanbajwa Aug 8, 2023
3fc8de0
remove old header components
roshaanbajwa Aug 8, 2023
dc99cce
resolve linting errors
roshaanbajwa Aug 8, 2023
e716a7b
footer on about change fix and added some colours
roshaanbajwa Aug 14, 2023
d112ad3
remove beta code and incorprate into nhsuk styling
roshaanbajwa Aug 21, 2023
f4e8ae8
Merge branch 'main' into new-header-footer
roshaanbajwa Aug 24, 2023
9f8099e
added header class
roshaanbajwa Aug 30, 2023
e86401a
test file
roshaanbajwa Aug 30, 2023
2dfc981
footer variants, split header css
roshaanbajwa Sep 5, 2023
c96f0a9
check header exists
pflynny Sep 7, 2023
67f8f62
added a check to see required elements are present
pflynny Sep 13, 2023
ce3c5b8
removed mixins for unused buttons
pflynny Sep 13, 2023
2ff1e19
clean up styles and remove any cms custom code
pflynny Sep 13, 2023
9d38508
refactor css
roshaanbajwa Sep 15, 2023
cdb7935
removed float on elements and used fle
pflynny Sep 15, 2023
295b027
update header init and comments
pflynny Sep 18, 2023
3e995f6
updated container name to remove relationship to content
pflynny Sep 25, 2023
f8c04e9
removed NHS Digital reference
pflynny Sep 25, 2023
d22defe
update template for new naming convention
pflynny Sep 25, 2023
eb4aafe
removed generic js-show class for bem modifier
pflynny Sep 27, 2023
2345f86
fixing consistency in examples
pflynny Sep 27, 2023
30ae453
Merge branch 'main' into new-header-footer
pflynny Sep 27, 2023
eaf1c50
ran prettier
pflynny Sep 27, 2023
3c27126
updated backstop images
roshaanbajwa Sep 27, 2023
fd5590c
revert puppeeter version
roshaanbajwa Sep 27, 2023
db5e8b9
revert puppeteer version
roshaanbajwa Sep 27, 2023
53074ac
ignore lint errors in cache
roshaanbajwa Sep 27, 2023
a48644e
fix bem syntax
roshaanbajwa Sep 27, 2023
5dbe281
removed the bottom border from the footer and examples
pflynny Sep 28, 2023
79b5721
cleaned up footer
pflynny Sep 28, 2023
c2cfaa6
remove bottom border from example pages
roshaanbajwa Sep 28, 2023
3b00341
update backstop test
roshaanbajwa Sep 28, 2023
4ac3368
remove unused id
roshaanbajwa Sep 28, 2023
b84b1c5
lint
roshaanbajwa Sep 28, 2023
963ca9c
unused ids
roshaanbajwa Sep 28, 2023
5c41059
changelog and puppeteer
roshaanbajwa Sep 28, 2023
6cd9512
prettier
roshaanbajwa Sep 28, 2023
4a7a109
changelog
roshaanbajwa Sep 28, 2023
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
1 change: 1 addition & 0 deletions app/_templates/page.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
{% block footer %}

{{ footer({
"bottomBorder": "false",
"links": [
{
"URL": baseUrl,
Expand Down
3 changes: 2 additions & 1 deletion app/components/all.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -899,6 +899,7 @@

{% block footer %}
{{ footer({
"bottomBorder": "true",
"links": [
{
"URL": "https://www.nhs.uk/nhs-sites",
Expand All @@ -917,7 +918,7 @@
"label": "Profile editor login"
}
],
"secondaryLinks": [
"policyLinks": [
{
"URL": "https://www.nhs.uk/about-us/sitemap/",
"label": "Sitemap"
Expand Down
34 changes: 34 additions & 0 deletions app/components/footer/default-no-bottom-border.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{% set html_style = 'background-color: #f0f4f5;' %}
{% set title = 'Footer without bottom border (default)' %}
{% from 'components/footer/macro.njk' import footer %}
{% extends 'layout.njk' %}

{% block body %}

{{ footer({
"bottomBorder": "false",
"links": [
{
"URL": "#",
"label": "Accessibility statement"
},
{
"URL": "#",
"label": "Contact us"
},
{
"URL": "#",
"label": "Cookies"
},
{
"URL": "#",
"label": "Privacy policy"
},
{
"URL": "#",
"label": "Terms and conditions"
}
]
})}}

{% endblock %}
104 changes: 104 additions & 0 deletions app/components/footer/footer-in-columns-no-bottom-border.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
{% set html_style = 'background-color: #f0f4f5;' %}
{% set title = 'Footer without bottom border (columns)' %}
{% from 'components/footer/macro.njk' import footer %}
{% extends 'layout.njk' %}

{% block body %}

{{ footer({
"bottomBorder": "false",
"links": [
{
"URL": "#",
"label": "Home"
},
{
"URL": "#",
"label": "Health A to Z"
},
{
"URL": "#",
"label": "Live Well"
},
{
"URL": "#",
"label": "Mental health"
},
{
"URL": "#",
"label": "Care and support"
},
{
"URL": "#",
"label": "Accessibility statement"
},
{
"URL": "#",
"label": "Pregnancy"
},
{
"URL": "#",
"label": "NHS services"
},
{
"URL": "#",
"label": "Coronavirus (COVID-19)"
}
],
"linksColumn2": [
{
"URL": "#",
"label": "NHS App"
},
{
"URL": "#",
"label": "Find my NHS number"
},
{
"URL": "#",
"label": "Your health records"
},
{
"URL": "#",
"label": "About the NHS"
},
{
"URL": "#",
"label": "Healthcare abroad"
}
],
"linksColumn3": [
{
"URL": "#",
"label": "Contact us"
},
{
"URL": "#",
"label": "Other NHS websites"
},
{
"URL": "#",
"label": "Profile editor login"
}
],
"policyLinks": [
{
"URL": "#",
"label": "About us"
},
{
"URL": "#",
"label": "Accessibility statement"
},
{
"URL": "#",
"label": "Our policies"
},
{
"URL": "#",
"label": "Cookies"
}
]
})}}

{% endblock %}
103 changes: 103 additions & 0 deletions app/components/footer/footer-in-columns.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
{% set html_style = 'background-color: #f0f4f5;' %}
{% set title = 'Footer (columns)' %}
{% from 'components/footer/macro.njk' import footer %}
{% extends 'layout.njk' %}

{% block body %}

{{ footer({
"links": [
{
"URL": "#",
"label": "Home"
},
{
"URL": "#",
"label": "Health A to Z"
},
{
"URL": "#",
"label": "Live Well"
},
{
"URL": "#",
"label": "Mental health"
},
{
"URL": "#",
"label": "Care and support"
},
{
"URL": "#",
"label": "Accessibility statement"
},
{
"URL": "#",
"label": "Pregnancy"
},
{
"URL": "#",
"label": "NHS services"
},
{
"URL": "#",
"label": "Coronavirus (COVID-19)"
}
],
"linksColumn2": [
{
"URL": "#",
"label": "NHS App"
},
{
"URL": "#",
"label": "Find my NHS number"
},
{
"URL": "#",
"label": "Your health records"
},
{
"URL": "#",
"label": "About the NHS"
},
{
"URL": "#",
"label": "Healthcare abroad"
}
],
"linksColumn3": [
{
"URL": "#",
"label": "Contact us"
},
{
"URL": "#",
"label": "Other NHS websites"
},
{
"URL": "#",
"label": "Profile editor login"
}
],
"policyLinks": [
{
"URL": "#",
"label": "About us"
},
{
"URL": "#",
"label": "Accessibility statement"
},
{
"URL": "#",
"label": "Our policies"
},
{
"URL": "#",
"label": "Cookies"
}
]
})}}

{% endblock %}
2 changes: 1 addition & 1 deletion app/components/footer/index.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% set html_style = 'background-color: #f0f4f5;' %}
{% set title = 'Footer' %}
{% set title = 'Footer (default)' %}
{% from 'components/footer/macro.njk' import footer %}
{% extends 'layout.njk' %}

Expand Down
2 changes: 1 addition & 1 deletion app/components/header/header-logo.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% set html_style = 'background-color: #f0f4f5;' %}
{% set title = 'Header' %}
{% set title = 'Header with logo only' %}
{% from 'components/header/macro.njk' import header %}
{% extends 'layout.njk' %}

Expand Down
8 changes: 6 additions & 2 deletions app/components/header/header-service-name-with-nav.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% set html_style = 'background-color: #f0f4f5;' %}
{% set title = 'Header transactional with service name' %}
{% set title = 'Header with a service name, search and navigation' %}
{% from 'components/header/macro.njk' import header %}
{% extends 'layout.njk' %}

Expand All @@ -14,7 +14,7 @@
"primaryLinks": [
{
"url" : "#",
"label" : "NHS service standard"
"label" : "Standards and technology"
},
{
'url' : '#',
Expand All @@ -28,6 +28,10 @@
'url' : '#',
'label' : 'Accessibility'
},
{
'url' : '#',
'label' : 'Design principles'
},
{
'url' : '#',
'label' : 'Community and contribution'
Expand Down
2 changes: 1 addition & 1 deletion app/components/header/header-service-name.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% set html_style = 'background-color: #f0f4f5;' %}
{% set title = 'Header transactional with service name' %}
{% set title = 'Header with service name' %}
{% from 'components/header/macro.njk' import header %}
{% extends 'layout.njk' %}

Expand Down
2 changes: 1 addition & 1 deletion app/components/header/header-transactional-service-name.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

{{ header({
"transactionalService": {
"name": "Register with a GP"
"name": "Find your NHS number"
},
"showNav": "false",
"showSearch": "false"
Expand Down
15 changes: 0 additions & 15 deletions app/components/header/header-transactional.njk
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion app/components/header/index.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% set html_style = 'background-color: #f0f4f5;' %}
{% set title = 'Header' %}
{% set title = 'Header (default)' %}
{% from 'components/header/macro.njk' import header %}
{% extends 'layout.njk' %}

Expand Down
4 changes: 2 additions & 2 deletions app/pages/about.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
<p>Please see our <a href="https://github.com/nhsuk/nhsuk-frontend/blob/master/CONTRIBUTING.md">contributing guidelines</a> on how to set up the project locally and contribute changes to NHS.UK frontend.</p>

<h2>Get in touch</h2>
<p>NHS.UK frontend is actively maintained by a team at NHS Digital, you can <a href="mailto:[email protected]">email us</a> or get in touch on the <a href="https://join.slack.com/t/nhs-service-manual/shared_invite/enQtNTIyOTEyNjU3NDkyLTk4NDQ3YzkwYzk1Njk5YjAxYTI5YTVkZmUxMGQ0ZjA3NjMyM2ZkNjBlMWMxODVjZjYzNzg1ZmU4MWY1NmE2YzE">NHS digital service manual Slack workspace</a>.

<p>NHS.UK frontend is actively maintained by a team at NHS Digital, you can <a href="mailto:[email protected]">email us</a> or get in touch on the <a href="https://join.slack.com/t/nhs-service-manual/shared_invite/enQtNTIyOTEyNjU3NDkyLTk4NDQ3YzkwYzk1Njk5YjAxYTI5YTVkZmUxMGQ0ZjA3NjMyM2ZkNjBlMWMxODVjZjYzNzg1ZmU4MWY1NmE2YzE">NHS digital service manual Slack workspace</a>.</p>
roshaanbajwa marked this conversation as resolved.
Show resolved Hide resolved
</div>

{% endblock %}
Loading