Merge pull request #1313 from nhsuk/header-margin-collapse

colinrotherham · web-flow · commit 9c239a30399e · 2025-05-22T14:27:56.000+01:00
Fix header menu margin collapse issue
diff --git 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**
diff --git a/app/components/all.njk b/app/components/all.njk
@@ -47,10 +47,6 @@
       {
         text: "Health A-Z",
         href: "#"
-      },
-      {
-        text: "Abscess",
-        href: "#"
       }
     ]
   }) }}
diff --git 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
@@ -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);
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -47,10 +47,6 @@`
`47`	`47`	`{`
`48`	`48`	`text: "Health A-Z",`
`49`	`49`	`href: "#"`
`50`		`- },`
`51`		`- {`
`52`		`- text: "Abscess",`
`53`		`- href: "#"`
`54`	`50`	`}`
`55`	`51`	`]`
`56`	`52`	`}) }}`
Original file line number	Diff line number	Diff line change
`@@ -13,11 +13,11 @@`
`13`	`13`	`////`
`14`	`14`
`15`	`15`	`.nhsuk-back-link {`
`16`		`- margin-top: nhsuk-spacing(3);`
`17`		`- line-height: 1; // [5]`
	`16`	`+ padding-top: nhsuk-spacing(3);`
	`17`	`+ line-height: 1; // [4]`
`18`	`18`
`19`	`19`	`@include nhsuk-media-query($from: tablet) {`
`20`		`- margin-top: nhsuk-spacing(4);`
	`20`	`+ padding-top: nhsuk-spacing(4);`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -15,11 +15,11 @@`
`15`	`15`	`////`
`16`	`16`
`17`	`17`	`.nhsuk-breadcrumb {`
`18`		`- margin-top: nhsuk-spacing(3);`
	`18`	`+ padding-top: nhsuk-spacing(3);`
`19`	`19`	`@include nhsuk-print-hide; // [1]`
`20`	`20`
`21`	`21`	`@include nhsuk-media-query($from: tablet) {`
`22`		`- margin-top: nhsuk-spacing(4);`
	`22`	`+ padding-top: nhsuk-spacing(4);`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`