Merge pull request #1924 from alphagov/adjust-layout-header-column-pa…

…dding

Fix layout_header layout and spacing issues

CHANGELOG.md

@@ -14,6 +14,7 @@
 * Remove redundant import in accordion component ([PR #1923](https://github.com/alphagov/govuk_publishing_components/pull/1923))
 * Fix toggle click tracking on step-by-steps ([PR #1925](https://github.com/alphagov/govuk_publishing_components/pull/1925))
 * Accordion summary design adjustment ([PR #1926](https://github.com/alphagov/govuk_publishing_components/pull/1926))
+* Fix `layout_header` layout and spacing issues ([PR #1924](https://github.com/alphagov/govuk_publishing_components/pull/1924))
 
 ## 24.1.0
 

app/assets/stylesheets/govuk_publishing_components/components/_layout-header.scss

@@ -31,7 +31,7 @@
 }
 
 .gem-c-layout-header--search-left {
-  .gem-c-header__menu-button {
+  .gem-c-header__menu-button.govuk-header__menu-button {
     margin-top: - govuk-spacing(7);
     left: 0;
   }
@@ -70,18 +70,24 @@
       margin-top: 0;
     }
 
-    .gem-c-header__content {
+    .gem-c-header__content.govuk-header__content {
       @include govuk-grid-column(two-thirds);
       padding-left: govuk-spacing(6);
       padding-right: govuk-spacing(1);
     }
   }
 }
 
+.gem-c-layout-header__search.govuk-grid-column-one-third-from-desktop,
+.gem-c-layout-header__logo.govuk-grid-column-one-third-from-desktop,
+.gem-c-layout-header__search.govuk-grid-column-one-third,
+.gem-c-layout-header__logo.govuk-grid-column-two-thirds {
+  padding-right: 0;
+  padding-left: 0;
+}
+
 .gem-c-layout-header__logo,
 .gem-c-layout-header__search {
-  padding: 0;
-
   @include govuk-media-query($until: "tablet") {
     margin-bottom: govuk-spacing(3);
   }
@@ -96,8 +102,9 @@
   }
 }
 
-.gem-c-header__content {
+.gem-c-header__content.govuk-header__content {
   width: auto;
+  padding-left: 0;
 
   @include govuk-media-query($from: desktop) {
     float: right;
@@ -159,3 +166,12 @@
     display: block;
   }
 }
+
+.govuk-header__menu-button.gem-c-header__menu-button {
+  top: govuk-spacing(4);
+  right: 0;
+}
+
+.gem-c-header__nav {
+  clear: both;
+}