Merge pull request #902 from nhsuk/header-and-width-container-margin

Header and width containers margin
nhsuk · Nov 16, 2023 · bde0444 · bde0444
2 parents 1cfec68 + 850efca
commit bde0444
Show file tree

Hide file tree

Showing 12 changed files with 3 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,11 @@
 # NHS.UK frontend Changelog
 
-## 8.0.3 - 13 November 2023
+## Unreleased
 
 :wrench: **Fixes**
 
 - Updated header component unit tests ([PR 900](https://github.com/nhsuk/nhsuk-frontend/pull/900)).
+- Fixed bug where the header didn't align with the main width container ([PR 902](https://github.com/nhsuk/nhsuk-frontend/pull/902)). This fixes [Issue 901](https://github.com/nhsuk/nhsuk-frontend/issues/901)
 
 ## 8.0.2 - 19 October 2023
 

diff --git a/packages/components/header/_header.scss b/packages/components/header/_header.scss
@@ -23,8 +23,7 @@
 }
 
 .nhsuk-header__container {
-  margin: 0 nhsuk-spacing(3);
-  max-width: $nhsuk-page-width;
+  @include govuk-width-container;
   padding: 20px 0;
 
   @include mq($until: tablet) {
@@ -35,11 +34,6 @@
     border-bottom: 1px solid $color_transparent_nhsuk-white-20;
     display: flex;
     justify-content: space-between;
-    margin: 0 nhsuk-spacing(5);
-  }
-
-  @include mq($from: large-desktop) {
-    margin: 0 auto;
   }
 }
 

diff --git a/.../backstop/bitmaps_reference/nhsuk-frontend_Header_default_0_document_2_iPad.png b/.../backstop/bitmaps_reference/nhsuk-frontend_Header_default_0_document_2_iPad.png
diff --git a/...op/bitmaps_reference/nhsuk-frontend_Header_organisational_0_document_2_iPad.png b/...op/bitmaps_reference/nhsuk-frontend_Header_organisational_0_document_2_iPad.png
diff --git a/...ce/nhsuk-frontend_Header_organisational_with_white_header_0_document_2_iPad.png b/...ce/nhsuk-frontend_Header_organisational_with_white_header_0_document_2_iPad.png
diff --git a/...nd_Header_organisational_with_white_header_and_navigation_0_document_2_iPad.png b/...nd_Header_organisational_with_white_header_and_navigation_0_document_2_iPad.png
diff --git a/...nce/nhsuk-frontend_Header_transactional_with_service_name_0_document_2_iPad.png b/...nce/nhsuk-frontend_Header_transactional_with_service_name_0_document_2_iPad.png
diff --git a/...tmaps_reference/nhsuk-frontend_Header_with_a_service_name_0_document_2_iPad.png b/...tmaps_reference/nhsuk-frontend_Header_with_a_service_name_0_document_2_iPad.png
diff --git a/...frontend_Header_with_a_service_name_search_and_navigation_0_document_2_iPad.png b/...frontend_Header_with_a_service_name_search_and_navigation_0_document_2_iPad.png
diff --git a/...op/bitmaps_reference/nhsuk-frontend_Header_with_logo_only_0_document_2_iPad.png b/...op/bitmaps_reference/nhsuk-frontend_Header_with_logo_only_0_document_2_iPad.png
diff --git a/...p/bitmaps_reference/nhsuk-frontend_Header_with_navigation_0_document_2_iPad.png b/...p/bitmaps_reference/nhsuk-frontend_Header_with_navigation_0_document_2_iPad.png
diff --git a/...kstop/bitmaps_reference/nhsuk-frontend_Header_with_search_0_document_2_iPad.png b/...kstop/bitmaps_reference/nhsuk-frontend_Header_with_search_0_document_2_iPad.png