Skip to content

Commit f029232

Browse files
roshaanbajwaroshaanbajwa
authored
Merge pull request #277 from nhsuk/update-to-frontend-8.1.0
Update to 8.1.0
2 parents f3096ef + 0d8add7 commit f029232

11 files changed

+126
-77
lines changed

‎CHANGELOG.md

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
# NHS.UK prototype kit Changelog
22

3-
## TBC
3+
## 4.10.0 - 22 February 2024
44

55
:wrench: Fixes
66

7-
- Add aria-label to coronavirus hub page navigation links
8-
- Add aria-label to mental health page navigation links
7+
- Add aria-labels to coronavirus hub page and mental health pagenavigation links
98
- Removed the duplicate selector in '\_related-nav.scss'
9+
- Removed Covid banner from 'Social care and support guide' and 'NHS Services' templates
1010
- Use 'String#startsWith' method instead of getting the index of a substring in utils.js
1111
- Change unexpected var for const in gulpfile.js
12-
- Upgrade node version to v20 (nunjucks v3.2.4, gulp-rename v3.2.4, gulp-sass v3.2.4, keypather v3.2.4, express v4.18.2, express-session v1.17.3)
12+
- Update 'Social care and support guide' template to use primary cards with chevrons
13+
- Upgrade node version to v20
14+
- Update NHS.UK frontend to [v8.1.0](https://github.com/nhsuk/nhsuk-frontend/releases/tag/v8.1.0), includes updates to header and footer components
1315

1416
## 4.9.0 - 1 June 2023
1517

‎docs/views/layout.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ <h2 class="nhsuk-u-visually-hidden">Support links</h2>
5252
</li>
5353
</ul>
5454
<div>
55-
<p class="nhsuk-footer__copyright">&copy; Crown copyright</p>
55+
<p class="nhsuk-footer__copyright">&copy; NHS England</p>
5656
</div>
5757
</div>
5858
</div>

‎docs/views/templates/nhsuk-coronavirus-hub.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@ <h2 class="nhsuk-u-visually-hidden">Support links</h2>
550550
</ul>
551551
</div>
552552
<div>
553-
<p class="nhsuk-footer__copyright">© Crown copyright</p>
553+
<p class="nhsuk-footer__copyright">© NHS England</p>
554554
</div>
555555
</div>
556556
</div>

‎docs/views/templates/nhsuk-healthaz.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -4190,7 +4190,7 @@ <h2 class="nhsuk-u-visually-hidden">Support links</h2>
41904190
</ul>
41914191
</div>
41924192
<div>
4193-
<p class="nhsuk-footer__copyright">© Crown copyright</p>
4193+
<p class="nhsuk-footer__copyright">© NHS England</p>
41944194
</div>
41954195
</div>
41964196
</div>

‎docs/views/templates/nhsuk-livewell.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ <h2 class="nhsuk-u-visually-hidden">Support links</h2>
404404
</ul>
405405
</div>
406406
<div>
407-
<p class="nhsuk-footer__copyright">© Crown copyright</p>
407+
<p class="nhsuk-footer__copyright">© NHS England</p>
408408
</div>
409409
</div>
410410
</div>

‎docs/views/templates/nhsuk-mentalhealth.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ <h2 class="nhsuk-u-visually-hidden">Support links</h2>
403403
</ul>
404404
</div>
405405
<div>
406-
<p class="nhsuk-footer__copyright">© Crown copyright</p>
406+
<p class="nhsuk-footer__copyright">© NHS England</p>
407407
</div>
408408
</div>
409409
</div>

‎docs/views/templates/nhsuk-nhs-services.html

+1-16
Original file line numberDiff line numberDiff line change
@@ -96,21 +96,6 @@
9696
{% endblock %}
9797

9898
{% block beforeContent %}
99-
<!-- Coronavirus (COVID-19) banner -->
100-
<div class="app-global-alert" id="app-global-alert" role="complementary">
101-
<div class="nhsuk-width-container">
102-
<div class="nhsuk-grid-row">
103-
<div class="nhsuk-grid-column-full">
104-
<div class="app-global-alert__content">
105-
<div class="app-global-alert__message">
106-
<h2>Coronavirus (COVID-19)</h2>
107-
<p><a href="">Get the latest advice about COVID-19</a></p>
108-
</div>
109-
</div>
110-
</div>
111-
</div>
112-
</div>
113-
</div>
11499
<!-- Breadcrumbs -->
115100
<nav class="nhsuk-breadcrumb beta-breadcrumb" aria-label="Breadcrumb">
116101
<div class="nhsuk-width-container">
@@ -462,7 +447,7 @@ <h2 class="nhsuk-u-visually-hidden">Support links</h2>
462447
</ul>
463448
</div>
464449
<div>
465-
<p class="nhsuk-footer__copyright">© Crown copyright</p>
450+
<p class="nhsuk-footer__copyright">© NHS England</p>
466451
</div>
467452
</div>
468453
</div>

‎docs/views/templates/nhsuk-pregnancy.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ <h2 class="nhsuk-u-visually-hidden">Support links</h2>
390390
</ul>
391391
</div>
392392
<div>
393-
<p class="nhsuk-footer__copyright">© Crown copyright</p>
393+
<p class="nhsuk-footer__copyright">© NHS England</p>
394394
</div>
395395
</div>
396396
</div>

‎docs/views/templates/nhsuk-socialcare.html

+102-40
Original file line numberDiff line numberDiff line change
@@ -93,21 +93,6 @@
9393
{% endblock %}
9494

9595
{% block beforeContent %}
96-
<!-- Coronavirus (COVID-19) banner -->
97-
<div class="app-global-alert" id="app-global-alert" role="complementary">
98-
<div class="nhsuk-width-container">
99-
<div class="nhsuk-grid-row">
100-
<div class="nhsuk-grid-column-full">
101-
<div class="app-global-alert__content">
102-
<div class="app-global-alert__message">
103-
<h2>Coronavirus (COVID-19)</h2>
104-
<p><a href="">Get the latest advice about COVID-19</a></p>
105-
</div>
106-
</div>
107-
</div>
108-
</div>
109-
</div>
110-
</div>
11196
<!-- Breadcrumbs -->
11297
<nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
11398
<div class="nhsuk-width-container">
@@ -141,144 +126,221 @@ <h1>Social care and support guide</h1>
141126

142127

143128
<!-- Introduction to care and support -->
144-
<li class="nhsuk-grid-column-one-third nhsuk-card-group__item">
129+
<li class="nhsuk-grid-column-one-half nhsuk-card-group__item">
145130
<div class="nhsuk-card nhsuk-card--clickable">
146-
<div class="nhsuk-card__content">
131+
<div class="nhsuk-card__content nhsuk-card__content--primary">
147132
<h2 class="nhsuk-card__heading nhsuk-heading-m">
148133
<a class="nhsuk-card__link" href="">
149134
Introduction to care and support
150135
</a>
151136
</h2>
152137
<p class="nhsuk-card__description">A quick guide for people who have care and support needs and their carers.</p>
138+
139+
<svg class="nhsuk-icon nhsuk-icon nhsuk-icon__chevron-right-circle" xmlns="http://www.w3.org/2000/svg" width="27" height="27" aria-hidden="true" focusable="false">
140+
<circle cx="13.333" cy="13.333" r="13.333" fill="" />
141+
<g data-name="Group 1" fill="none" stroke="#fff" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2.667">
142+
<path d="M15.438 13l-3.771 3.771" />
143+
<path data-name="Path" d="M11.667 9.229L15.438 13" />
144+
</g>
145+
</svg>
146+
153147
</div>
154148
</div>
155149
</li>
156150

157151

158152
<!-- Help from social services and charities -->
159-
<li class="nhsuk-grid-column-one-third nhsuk-card-group__item">
153+
<li class="nhsuk-grid-column-one-half nhsuk-card-group__item">
160154
<div class="nhsuk-card nhsuk-card--clickable">
161-
<div class="nhsuk-card__content">
155+
<div class="nhsuk-card__content nhsuk-card__content--primary">
162156
<h2 class="nhsuk-card__heading nhsuk-heading-m">
163157
<a class="nhsuk-card__link" href="">
164158
Help from social services and charities
165159
</a>
166160
</h2>
167161
<p class="nhsuk-card__description">Includes helplines, needs assessments, advocacy and reporting abuse.</p>
162+
163+
<svg class="nhsuk-icon nhsuk-icon nhsuk-icon__chevron-right-circle" xmlns="http://www.w3.org/2000/svg" width="27" height="27" aria-hidden="true" focusable="false">
164+
<circle cx="13.333" cy="13.333" r="13.333" fill="" />
165+
<g data-name="Group 1" fill="none" stroke="#fff" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2.667">
166+
<path d="M15.438 13l-3.771 3.771" />
167+
<path data-name="Path" d="M11.667 9.229L15.438 13" />
168+
</g>
169+
</svg>
170+
168171
</div>
169172
</div>
170173
</li>
171174

172175

173176
<!-- Care services, equipment and care homes -->
174-
<li class="nhsuk-grid-column-one-third nhsuk-card-group__item">
177+
<li class="nhsuk-grid-column-one-half nhsuk-card-group__item">
175178
<div class="nhsuk-card nhsuk-card--clickable">
176-
<div class="nhsuk-card__content">
179+
<div class="nhsuk-card__content nhsuk-card__content--primary">
177180
<h2 class="nhsuk-card__heading nhsuk-heading-m">
178181
<a class="nhsuk-card__link" href="">
179182
Care services, equipment and care homes
180183
</a>
181184
</h2>
182185
<p class="nhsuk-card__description">Includes home adaptations, help at home from a paid carer, staying safe and housing.</p>
186+
187+
<svg class="nhsuk-icon nhsuk-icon nhsuk-icon__chevron-right-circle" xmlns="http://www.w3.org/2000/svg" width="27" height="27" aria-hidden="true" focusable="false">
188+
<circle cx="13.333" cy="13.333" r="13.333" fill="" />
189+
<g data-name="Group 1" fill="none" stroke="#fff" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2.667">
190+
<path d="M15.438 13l-3.771 3.771" />
191+
<path data-name="Path" d="M11.667 9.229L15.438 13" />
192+
</g>
193+
</svg>
194+
183195
</div>
184196
</div>
185197
</li>
186-
</ul>
187-
188-
<ul class="nhsuk-grid-row nhsuk-card-group">
189198

190199

191200
<!-- Money, work and benefits -->
192-
<li class="nhsuk-grid-column-one-third nhsuk-card-group__item">
201+
<li class="nhsuk-grid-column-one-half nhsuk-card-group__item">
193202
<div class="nhsuk-card nhsuk-card--clickable">
194-
<div class="nhsuk-card__content">
203+
<div class="nhsuk-card__content nhsuk-card__content--primary">
195204
<h2 class="nhsuk-card__heading nhsuk-heading-m">
196205
<a class="nhsuk-card__link" href="">
197206
Money, work and benefits
198207
</a>
199208
</h2>
200209
<p class="nhsuk-card__description">How to pay for care and support, and where you can get help with costs.</p>
210+
211+
<svg class="nhsuk-icon nhsuk-icon nhsuk-icon__chevron-right-circle" xmlns="http://www.w3.org/2000/svg" width="27" height="27" aria-hidden="true" focusable="false">
212+
<circle cx="13.333" cy="13.333" r="13.333" fill="" />
213+
<g data-name="Group 1" fill="none" stroke="#fff" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2.667">
214+
<path d="M15.438 13l-3.771 3.771" />
215+
<path data-name="Path" d="M11.667 9.229L15.438 13" />
216+
</g>
217+
</svg>
218+
201219
</div>
202220
</div>
203221
</li>
204222

205223

206224
<!-- Care after a hospital stay -->
207-
<li class="nhsuk-grid-column-one-third nhsuk-card-group__item">
225+
<li class="nhsuk-grid-column-one-half nhsuk-card-group__item">
208226
<div class="nhsuk-card nhsuk-card--clickable">
209-
<div class="nhsuk-card__content">
227+
<div class="nhsuk-card__content nhsuk-card__content--primary">
210228
<h2 class="nhsuk-card__heading nhsuk-heading-m">
211229
<a class="nhsuk-card__link" href="">
212230
Care after a hospital stay
213231
</a>
214232
</h2>
215233
<p class="nhsuk-card__description">Includes hospital discharge and care and support afterwards.</p>
234+
235+
<svg class="nhsuk-icon nhsuk-icon nhsuk-icon__chevron-right-circle" xmlns="http://www.w3.org/2000/svg" width="27" height="27" aria-hidden="true" focusable="false">
236+
<circle cx="13.333" cy="13.333" r="13.333" fill="" />
237+
<g data-name="Group 1" fill="none" stroke="#fff" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2.667">
238+
<path d="M15.438 13l-3.771 3.771" />
239+
<path data-name="Path" d="M11.667 9.229L15.438 13" />
240+
</g>
241+
</svg>
242+
216243
</div>
217244
</div>
218245
</li>
219246

220247

221248
<!-- Support and benefits for carers -->
222-
<li class="nhsuk-grid-column-one-third nhsuk-card-group__item">
249+
<li class="nhsuk-grid-column-one-half nhsuk-card-group__item">
223250
<div class="nhsuk-card nhsuk-card--clickable">
224-
<div class="nhsuk-card__content">
251+
<div class="nhsuk-card__content nhsuk-card__content--primary">
225252
<h2 class="nhsuk-card__heading nhsuk-heading-m">
226253
<a class="nhsuk-card__link" href="">
227254
Support and benefits for carers
228255
</a>
229256
</h2>
230257
<p class="nhsuk-card__description">Includes carer&#x27;s assessments, support from local councils, respite care and help for young carers.</p>
258+
259+
<svg class="nhsuk-icon nhsuk-icon nhsuk-icon__chevron-right-circle" xmlns="http://www.w3.org/2000/svg" width="27" height="27" aria-hidden="true" focusable="false">
260+
<circle cx="13.333" cy="13.333" r="13.333" fill="" />
261+
<g data-name="Group 1" fill="none" stroke="#fff" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2.667">
262+
<path d="M15.438 13l-3.771 3.771" />
263+
<path data-name="Path" d="M11.667 9.229L15.438 13" />
264+
</g>
265+
</svg>
266+
231267
</div>
232268
</div>
233269
</li>
234-
</ul>
235-
236-
<ul class="nhsuk-grid-row nhsuk-card-group">
237270

238271

239272
<!-- Practical tips if you care for someone -->
240-
<li class="nhsuk-grid-column-one-third nhsuk-card-group__item">
273+
<li class="nhsuk-grid-column-one-half nhsuk-card-group__item">
241274
<div class="nhsuk-card nhsuk-card--clickable">
242-
<div class="nhsuk-card__content">
275+
<div class="nhsuk-card__content nhsuk-card__content--primary">
243276
<h2 class="nhsuk-card__heading nhsuk-heading-m">
244277
<a class="nhsuk-card__link" href="">
245278
Practical tips if you care for someone
246279
</a>
247280
</h2>
248281
<p class="nhsuk-card__description">Includes advice on challenging behaviour, moving and lifting people and medicines.</p>
282+
283+
<svg class="nhsuk-icon nhsuk-icon nhsuk-icon__chevron-right-circle" xmlns="http://www.w3.org/2000/svg" width="27" height="27" aria-hidden="true" focusable="false">
284+
<circle cx="13.333" cy="13.333" r="13.333" fill="" />
285+
<g data-name="Group 1" fill="none" stroke="#fff" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2.667">
286+
<path d="M15.438 13l-3.771 3.771" />
287+
<path data-name="Path" d="M11.667 9.229L15.438 13" />
288+
</g>
289+
</svg>
290+
249291
</div>
250292
</div>
251293
</li>
252294

253295

254296
<!-- Caring for children and young people -->
255-
<li class="nhsuk-grid-column-one-third nhsuk-card-group__item">
297+
<li class="nhsuk-grid-column-one-half nhsuk-card-group__item">
256298
<div class="nhsuk-card nhsuk-card--clickable">
257-
<div class="nhsuk-card__content">
299+
<div class="nhsuk-card__content nhsuk-card__content--primary">
258300
<h2 class="nhsuk-card__heading nhsuk-heading-m">
259301
<a class="nhsuk-card__link" href="">
260302
Caring for children and young people
261303
</a>
262304
</h2>
263305
<p class="nhsuk-card__description">Services, support and tips if you care for someone under 21, and moving to adult social services.</p>
306+
307+
<svg class="nhsuk-icon nhsuk-icon nhsuk-icon__chevron-right-circle" xmlns="http://www.w3.org/2000/svg" width="27" height="27" aria-hidden="true" focusable="false">
308+
<circle cx="13.333" cy="13.333" r="13.333" fill="" />
309+
<g data-name="Group 1" fill="none" stroke="#fff" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2.667">
310+
<path d="M15.438 13l-3.771 3.771" />
311+
<path data-name="Path" d="M11.667 9.229L15.438 13" />
312+
</g>
313+
</svg>
314+
264315
</div>
265316
</div>
266317
</li>
267318

268319

269320
<!-- Sexual health -->
270-
<li class="nhsuk-grid-column-one-third nhsuk-card-group__item">
321+
<li class="nhsuk-grid-column-one-half nhsuk-card-group__item">
271322
<div class="nhsuk-card nhsuk-card--clickable">
272-
<div class="nhsuk-card__content">
323+
<div class="nhsuk-card__content nhsuk-card__content--primary">
273324
<h2 class="nhsuk-card__heading nhsuk-heading-m">
274325
<a class="nhsuk-card__link" href="">
275326
Making decisions for someone else
276327
</a>
277328
</h2>
278329
<p class="nhsuk-card__description">Includes powers of attorney and mental capacity.</p>
330+
331+
<svg class="nhsuk-icon nhsuk-icon nhsuk-icon__chevron-right-circle" xmlns="http://www.w3.org/2000/svg" width="27" height="27" aria-hidden="true" focusable="false">
332+
<circle cx="13.333" cy="13.333" r="13.333" fill="" />
333+
<g data-name="Group 1" fill="none" stroke="#fff" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2.667">
334+
<path d="M15.438 13l-3.771 3.771" />
335+
<path data-name="Path" d="M11.667 9.229L15.438 13" />
336+
</g>
337+
</svg>
338+
279339
</div>
280340
</div>
281341
</li>
342+
343+
282344
</ul>
283345
</article>
284346

@@ -330,7 +392,7 @@ <h2 class="nhsuk-u-visually-hidden">Support links</h2>
330392
</ul>
331393
</div>
332394
<div>
333-
<p class="nhsuk-footer__copyright">© Crown copyright</p>
395+
<p class="nhsuk-footer__copyright">© NHS England</p>
334396
</div>
335397
</div>
336398
</div>

0 commit comments

Comments
 (0)