From d602b294752e0ed5c81397cc0d4f525257610f84 Mon Sep 17 00:00:00 2001 From: Colin Rotherham Date: Tue, 20 May 2025 15:29:40 +0100 Subject: [PATCH 1/3] Fix margin collapse issue --- packages/components/back-link/_index.scss | 6 +++--- packages/components/breadcrumb/_index.scss | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/components/back-link/_index.scss b/packages/components/back-link/_index.scss index dd4c58a63..632b075a4 100644 --- a/packages/components/back-link/_index.scss +++ b/packages/components/back-link/_index.scss @@ -13,11 +13,11 @@ //// .nhsuk-back-link { - margin-top: nhsuk-spacing(3); - line-height: 1; // [5] + padding-top: nhsuk-spacing(3); + line-height: 1; // [4] @include nhsuk-media-query($from: tablet) { - margin-top: nhsuk-spacing(4); + padding-top: nhsuk-spacing(4); } } diff --git a/packages/components/breadcrumb/_index.scss b/packages/components/breadcrumb/_index.scss index 7a5bede72..07acbb135 100644 --- a/packages/components/breadcrumb/_index.scss +++ b/packages/components/breadcrumb/_index.scss @@ -15,11 +15,11 @@ //// .nhsuk-breadcrumb { - margin-top: nhsuk-spacing(3); + padding-top: nhsuk-spacing(3); @include nhsuk-print-hide; // [1] @include nhsuk-media-query($from: tablet) { - margin-top: nhsuk-spacing(4); + padding-top: nhsuk-spacing(4); } } From 611d9b435796c8f3b388d26925747ac592caf509 Mon Sep 17 00:00:00 2001 From: Colin Rotherham Date: Tue, 20 May 2025 15:30:06 +0100 Subject: [PATCH 2/3] Remove current page from breadcrumb example --- app/components/all.njk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/components/all.njk b/app/components/all.njk index 80560826e..595e56d18 100644 --- a/app/components/all.njk +++ b/app/components/all.njk @@ -47,10 +47,6 @@ { text: "Health A-Z", href: "#" - }, - { - text: "Abscess", - href: "#" } ] }) }} From 0a580aa3d8cd75ebb8c3d1809c99c081eb623e36 Mon Sep 17 00:00:00 2001 From: Colin Rotherham Date: Wed, 21 May 2025 15:49:52 +0100 Subject: [PATCH 3/3] Add changelog entry --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4406be279..594e24961 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -61,6 +61,12 @@ This change ensures consistency with other components, where `text` or `html` pa This change was made in [pull request #1259: Review legacy Nunjucks params](https://github.com/nhsuk/nhsuk-frontend/pull/1259). +:wrench: **Fixes** + +We've made fixes to NHS.UK frontend in the following pull requests: + +- [#1313: Fix header menu margin collapse issue](https://github.com/nhsuk/nhsuk-frontend/pull/1313) + ## 9.6.0 - 20 May 2025 :new: **New features**