govuk_publishing_components 34.0.0 → 34.1.1

data/app/assets/stylesheets/govuk_publishing_components/components/_layout-super-navigation-header.scss

@@ -8,9 +8,9 @@ $search-width-or-height: $black-bar-height;
 $pseudo-underline-height: 3px;
 $button-pipe-colour: darken(govuk-colour("mid-grey"), 20%);
 
-$after-link-padding: govuk-spacing(6);
-$after-button-padding-right: govuk-spacing(6);
-$after-button-padding-left: govuk-spacing(5);
+$after-link-padding: govuk-spacing(4);
+$after-button-padding-right: govuk-spacing(4);
+$after-button-padding-left: govuk-spacing(4);
 
 @mixin chevron($colour, $update: false) {
   @if $update == true {
@@ -46,6 +46,7 @@ $after-button-padding-left: govuk-spacing(5);
   left: $left;
   position: absolute;
   right: $right;
+  bottom: 0;
   top: auto;
   @if $width {
     width: $width;
@@ -97,21 +98,19 @@ $after-button-padding-left: govuk-spacing(5);
 }
 
 .gem-c-layout-super-navigation-header__header-logo {
+  display: inline-block;
   height: govuk-spacing(6);
   padding-bottom: govuk-spacing(2);
   padding-top: govuk-spacing(2);
-
-  @include govuk-media-query($from: "desktop") {
-    display: block;
-    float: left;
-  }
 }
 
 .gem-c-layout-super-navigation-header__content {
-  @include govuk-media-query($from: "desktop") {
-    display: block;
-    float: right;
+  @include govuk-media-query($until: "tablet") {
+    margin-right: govuk-spacing(-3);
   }
+
+  display: inline-block;
+  float: right;
 }
 
 .gem-c-layout-super-navigation-header__navigation-toggle-wrapper {
@@ -121,53 +120,14 @@ $after-button-padding-left: govuk-spacing(5);
 // Top level navigation and search.
 .gem-c-layout-super-navigation-header__navigation-items,
 .gem-c-layout-super-navigation-header__search-items {
-  background: govuk-colour("light-grey");
   display: block;
+  float: left;
   list-style: none;
-  margin: 0 (0 - govuk-spacing(3));
   padding: 0;
-
-  @include govuk-media-query($from: "tablet") {
-    margin: 0 (0 - govuk-spacing(6));
-  }
-
-  @include govuk-media-query($from: "desktop") {
-    background: none;
-    float: left;
-    padding: 0;
-    margin: 0;
-  }
-}
-
-.gem-c-layout-super-navigation-header__navigation-items {
-  @include govuk-media-query($from: "desktop") {
-    display: inline-block;
-  }
-}
-
-.gem-c-layout-super-navigation-header__navigation-item,
-.gem-c-layout-super-navigation-header__search-item {
-  display: block;
   margin: 0;
-  padding: govuk-spacing(2) govuk-spacing(3);
-  position: relative;
-
-  @include govuk-media-query($from: "tablet") {
-    margin: 0 govuk-spacing(6);
-    padding: govuk-spacing(2) 0;
-  }
-
-  @include govuk-media-query($from: "desktop") {
-    background: govuk-colour("black");
-    display: block;
-    float: left;
-    margin: 0;
-    padding: 0;
-    position: static;
-  }
 }
 
-.gem-c-layout-super-navigation-header__navigation-item {
+.gem-c-layout-super-navigation-header__navigation-items {
   border-bottom: 1px solid $govuk-border-colour;
 
   .js-module-initialised & {
@@ -182,20 +142,22 @@ $after-button-padding-left: govuk-spacing(5);
 
     &:first-of-type {
       margin-right: -1px;
-
-      .gem-c-layout-super-navigation-header__navigation-second-toggle-button-inner,
-      .gem-c-layout-super-navigation-header__navigation-item-link-inner {
-        border-left: 1px solid $button-pipe-colour;
-        border-right: 1px solid $button-pipe-colour;
-      }
     }
   }
 }
 
+.gem-c-layout-super-navigation-header__navigation-item,
+.gem-c-layout-super-navigation-header__search-item {
+  background: govuk-colour("black");
+  display: block;
+  float: left;
+  margin: 0;
+  padding: 0;
+}
+
 // Top level navigation links and search link.
 .gem-c-layout-super-navigation-header__navigation-item-link,
-.gem-c-layout-super-navigation-header__search-item-link,
-.gem-c-layout-super-navigation-header__navigation-second-toggle-button {
+.gem-c-layout-super-navigation-header__search-item-link {
   @include govuk-link-common;
   @include govuk-link-style-no-visited-state;
 
@@ -204,6 +166,7 @@ $after-button-padding-left: govuk-spacing(5);
   font-size: govuk-px-to-rem(19px);
   font-weight: bold;
   margin: govuk-spacing(3) 0;
+  position: relative;
 
   @include govuk-media-query($from: "desktop") {
     display: block;
@@ -228,6 +191,10 @@ $after-button-padding-left: govuk-spacing(5);
       box-shadow: none;
       color: $govuk-link-colour;
 
+      .gem-c-layout-super-navigation-header__navigation-item-link-inner {
+        border-color: $button-pipe-colour;
+      }
+
       &:hover {
         @include govuk-link-decoration;
         @include govuk-link-hover-decoration;
@@ -237,94 +204,82 @@ $after-button-padding-left: govuk-spacing(5);
 
     &:after {
       @include make-selectable-area-bigger;
+      @include pseudo-underline($left: $after-link-padding, $right: $after-link-padding, $width: calc(100% - $after-button-padding-right));
     }
 
-    @include govuk-media-query($from: "desktop") {
-      // stylelint-disable max-nesting-depth
-      float: left;
-      font-size: 16px;
-      font-size: govuk-px-to-rem(16px);
-      height: govuk-spacing(4);
-      position: relative;
+    // stylelint-disable max-nesting-depth
+    float: left;
+    font-size: 16px;
+    font-size: govuk-px-to-rem(16px);
+    height: govuk-spacing(4);
 
-      &:before {
-        @include chevron(govuk-colour("white"), true);
-      }
+    &:before {
+      @include chevron(govuk-colour("white"), true);
+    }
 
-      &:hover {
-        color: govuk-colour("mid-grey");
+    &:hover {
+      color: govuk-colour("mid-grey");
 
-        &:after {
-          background: govuk-colour("mid-grey");
-        }
+      &:after {
+        background: govuk-colour("mid-grey");
       }
+    }
 
-      &:focus:not(:focus-visible) {
-        .gem-c-layout-super-navigation-header__navigation-item-link-inner {
-          border-color: $button-pipe-colour;
-        }
+    @include focus-and-focus-visible {
+      .gem-c-layout-super-navigation-header__navigation-item-link-inner {
+        border-color: $govuk-focus-colour;
+        background: $govuk-focus-colour;
       }
 
-      @include focus-and-focus-visible {
-        .gem-c-layout-super-navigation-header__navigation-item-link-inner {
-          border-color: $govuk-focus-colour;
-        }
-
-        &,
-        &:hover {
-          box-shadow: none;
-          color: $govuk-focus-text-colour;
+      &,
+      &:hover {
+        box-shadow: none;
+        color: $govuk-focus-text-colour;
 
-          &:after {
-            background: $govuk-focus-text-colour;
-          }
+        &:after {
+          background: $govuk-focus-text-colour;
         }
       }
+    }
 
-      @include focus-not-focus-visible {
-        &,
-        &:hover {
-          text-decoration: none;
-        }
-
-        & {
-          color: govuk-colour("white");
-        }
+    @include focus-not-focus-visible {
+      &,
+      &:hover {
+        text-decoration: none;
+      }
 
-        &:hover {
-          color: govuk-colour("mid-grey");
+      & {
+        color: govuk-colour("white");
+      }
 
-          &:after {
-            background: govuk-colour("mid-grey");
-          }
-        }
+      &:hover {
+        color: govuk-colour("mid-grey");
 
         &:after {
-          background: none;
+          background: govuk-colour("mid-grey");
         }
       }
 
       &:after {
-        @include pseudo-underline($left: $after-link-padding, $right: $after-link-padding, $width: calc(100% - $after-link-padding));
+        background: none;
       }
+    }
 
-      .js-module-initialised & {
-        // If js is initialised, we are hiding the links and
-        // making the buttons visible instead. This means we have
-        // to remove the padding added to make the links vertically
-        // aligned, as the buttons are styled vertically aligned by
-        // default.
+    .js-module-initialised & {
+      // If js is initialised, we are hiding the links and
+      // making the buttons visible instead. This means we have
+      // to remove the padding added to make the links vertically
+      // aligned, as the buttons are styled vertically aligned by
+      // default.
 
-        padding: 0;
-        margin: 0;
+      padding: 0;
+      margin: 0;
 
-        &:after {
-          @include pseudo-underline($left: $after-button-padding-left, $right: $after-button-padding-right, $width: calc(100% - $after-button-padding-left));
-        }
+      &:after {
+        @include pseudo-underline($left: $after-button-padding-left, $right: $after-button-padding-right, $width: 100%);
       }
-
-      // stylelint-enable max-nesting-depth
     }
+    // stylelint-enable max-nesting-depth
   }
 
   &:after {
@@ -332,239 +287,79 @@ $after-button-padding-left: govuk-spacing(5);
   }
 }
 
-.gem-c-layout-super-navigation-header__navigation-item-link,
-.gem-c-layout-super-navigation-header__navigation-second-toggle-button {
+.gem-c-layout-super-navigation-header__navigation-item-link {
   @include govuk-media-query($from: "desktop") {
     padding: govuk-spacing(3) 0;
   }
-}
 
-.gem-c-layout-super-navigation-header__navigation-item-link {
   .js-module-initialised & {
     margin-left: govuk-spacing(4);
     @include govuk-link-style-no-underline;
   }
 }
 
-.gem-c-layout-super-navigation-header__navigation-second-toggle-button {
-  background: none;
-  border: 0;
-  color: $govuk-link-colour;
-  cursor: pointer;
-  padding: 0;
+.gem-c-layout-super-navigation-header__navigation-item-link-inner {
+  background-color: govuk-colour("black");
+  border-left: 1px solid $button-pipe-colour;
+  padding: govuk-spacing(1) $after-link-padding;
+}
 
-  @include focus-not-focus-visible {
-    .gem-c-layout-super-navigation-header__navigation-second-toggle-button-inner {
-      &:before {
-        @include chevron($govuk-link-colour);
-      }
-    }
+// Search link and dropdown.
+.gem-c-layout-super-navigation-header__search-item-link {
+  padding: govuk-spacing(3);
+
+  @include govuk-media-query($until: "desktop") {
+    margin: 0;
   }
 
-  @include focus-not-focus-visible {
+  &:link,
+  &:visited {
+    background: $govuk-brand-colour;
+
     &:hover {
-      .gem-c-layout-super-navigation-header__navigation-second-toggle-button-inner {
-        &:before {
-          @include chevron($govuk-link-hover-colour, true);
-        }
+      background: govuk-colour("black");
+
+      &:before {
+        left: 0;
+        right: 0;
       }
     }
-  }
 
-  &:focus {
-    .gem-c-layout-super-navigation-header__navigation-second-toggle-button-inner {
+    &:focus {
+      background: $govuk-focus-colour;
+
       &:before {
-        @include chevron($govuk-focus-text-colour, true);
+        content: none;
       }
     }
-  }
 
-  @include govuk-media-query($from: "desktop") {
     &:after {
-      @include pseudo-underline($left: govuk-spacing(5), $right: govuk-spacing(6));
+      left: 0;
+      right: 0;
+      width: 100%;
     }
 
     @include focus-not-focus-visible {
-      color: govuk-colour("white");
-      float: left;
-      font-size: 16px;
-      font-size: govuk-px-to-rem(16px);
-      height: $black-bar-height;
-      position: relative;
-      text-decoration: none;
-
-      .gem-c-layout-super-navigation-header__navigation-second-toggle-button-inner {
-        border-color: $button-pipe-colour;
+      background: $govuk-link-colour;
 
-        &:before {
-          @include chevron(govuk-colour("white"), true);
-        }
-      }
-    }
-    @include focus-not-focus-visible {
       &:hover {
-        color: govuk-colour("mid-grey");
-        text-decoration: none;
-
-        &:after {
-          background: govuk-colour("mid-grey");
-        }
-
-        .gem-c-layout-super-navigation-header__navigation-second-toggle-button-inner {
-          &:before {
-            @include chevron(govuk-colour("mid-grey"), true);
-          }
-        }
+        background: govuk-colour("black");
       }
     }
 
     @include focus-and-focus-visible {
-      color: $govuk-focus-text-colour;
-
-      &:after {
-        background: $govuk-focus-text-colour;
-      }
-
-      .gem-c-layout-super-navigation-header__navigation-second-toggle-button-inner {
-        border-color: $govuk-focus-colour;
-
-        &:before {
-          @include chevron($govuk-focus-text-colour, true);
-        }
-      }
-    }
-  }
-
-  &.gem-c-layout-super-navigation-header__open-button {
-    @include focus-not-focus-visible {
-      .gem-c-layout-super-navigation-header__navigation-second-toggle-button-inner {
-        &:before {
-          @include prefixed-transform($rotate: 225deg, $translateY: 1px);
-        }
-      }
-    }
-
-    @include govuk-media-query($from: "desktop") {
-      @include focus-not-focus-visible {
-        background: govuk-colour("light-grey");
-        color: $govuk-link-colour;
-
-        // stylelint-disable max-nesting-depth
-        .gem-c-layout-super-navigation-header__navigation-second-toggle-button-inner {
-          border-color: govuk-colour("light-grey");
-
-          &:before {
-            @include chevron($govuk-link-colour, true);
-          }
-        }
-
-        &:after {
-          background-color: $govuk-link-colour;
-        }
-      }
-
-      @include focus-and-focus-visible {
-        background-color: $govuk-focus-colour;
-        color: $govuk-focus-text-colour;
-
-        .gem-c-layout-super-navigation-header__navigation-second-toggle-button-inner {
-          border-color: $govuk-focus-colour;
-
-          &:before {
-            @include chevron($govuk-focus-text-colour, true);
-          }
-        }
-
-        &:after {
-          background: $govuk-focus-text-colour;
-        }
-      }
-    }
-  }
-  // stylelint-enable max-nesting-depth
-
-  .js-module-initialised & {
-    @include govuk-link-style-no-underline;
-  }
-}
-
-.gem-c-layout-super-navigation-header__navigation-item-link-inner {
-  @include govuk-media-query($from: "desktop") {
-    // links have different left padding to the button as
-    // they do not have the 5px wide caret pseudo element
-    padding: govuk-spacing(1) $after-link-padding;
-  }
-}
-
-.gem-c-layout-super-navigation-header__navigation-second-toggle-button-inner {
-  @include govuk-media-query($from: "desktop") {
-    display: inline-block;
-    padding: govuk-spacing(1) $after-button-padding-right govuk-spacing(1) $after-button-padding-left;
-  }
-}
-
-// Search link and dropdown.
-.gem-c-layout-super-navigation-header__search-item-link {
-  @include govuk-media-query($from: "desktop") {
-    padding: govuk-spacing(3);
-  }
-
-  &:link,
-  &:visited {
-    @include govuk-media-query($from: "desktop") {
-      background: $govuk-brand-colour;
-
       &:hover {
-        background: govuk-colour("black");
-
-        &:before {
-          left: 0;
-          right: 0;
-        }
-      }
-
-      &:focus {
         background: $govuk-focus-colour;
-
-        &:before {
-          content: none;
-        }
-      }
-
-      &:after {
-        left: 0;
-        right: 0;
-        width: 100%;
       }
 
-      @include focus-not-focus-visible {
-        background: $govuk-link-colour;
-
-        &:hover {
-          background: govuk-colour("black");
-        }
-      }
-
-      @include focus-and-focus-visible {
-        &:hover {
-          background: $govuk-focus-colour;
-        }
-
-        &:after,
-        &:hover:after {
-          background: $govuk-focus-colour;
-        }
+      &:after,
+      &:hover:after {
+        background: $govuk-focus-colour;
       }
     }
   }
 }
 
-.gem-c-layout-super-navigation-header__search-item-link-text {
-  @include govuk-media-query($from: "desktop") {
-    @include govuk-visually-hidden;
-  }
-}
-
 .gem-c-layout-super-navigation-header__search-item-link-icon,
 .gem-c-layout-super-navigation-header__search-toggle-button-link-icon {
   height: $icon-size;
@@ -572,12 +367,6 @@ $after-button-padding-left: govuk-spacing(5);
   width: $icon-size;
 }
 
-.gem-c-layout-super-navigation-header__search-item-link-icon {
-  @include govuk-media-query($until: "desktop") {
-    @include govuk-visually-hidden;
-  }
-}
-
 // Search and popular content dropdown.
 .gem-c-layout-super-navigation-header__search-and-popular {
   display: none;
@@ -595,6 +384,24 @@ $after-button-padding-left: govuk-spacing(5);
   @include govuk-link-style-no-visited-state;
   @include govuk-link-style-no-underline;
 
+  &:after {
+    @include pseudo-underline($left: $after-button-padding-left, $right: $after-button-padding-right);
+  }
+
+  &:hover {
+    color: govuk-colour("mid-grey");
+
+    &:after {
+      background: govuk-colour("mid-grey");
+    }
+
+    .gem-c-layout-super-navigation-header__navigation-top-toggle-button-inner {
+      &:before {
+        border-color: govuk-colour("mid-grey");
+      }
+    }
+  }
+
   font-size: 16px;
   font-size: govuk-px-to-rem(16px);
   font-weight: 700;
@@ -605,24 +412,56 @@ $after-button-padding-left: govuk-spacing(5);
   cursor: pointer;
   height: $black-bar-height;
   padding: 0;
-  margin: 0;
-  position: absolute;
-  right: (($search-width-or-height - govuk-spacing(3)) - 1px); // width of the search button (50px) - 15px - 1px to create an overlap between buttons and stop the border appearing to hang off the buttons when they're focused/open
-  top: 0;
-  z-index: 10;
+  position: relative;
+  margin: 0 -3px 0 0; // overlap with the search button to hide right border on mobile
+  vertical-align: top;
+
+  @include govuk-media-query($from: "desktop") {
+    background: govuk-colour("black");
+    display: block;
+    float: left;
+    margin: 0;
+    padding: 0;
+    position: relative;
+    right: 0;
+  }
+
+  &:focus-visible {
+    &:hover {
+      .gem-c-layout-super-navigation-header__navigation-top-toggle-button-inner {
+        color: govuk-colour("black");
+
+        &:after {
+          background: govuk-colour("black");
+        }
+
+        &:before {
+          @include chevron(govuk-colour("black"), true);
+        }
+      }
+    }
+  }
 
   @include focus-and-focus-visible {
     @include govuk-focused-text;
+
     box-shadow: none;
 
+    &:hover {
+      &:after {
+        background-color: govuk-colour("black");
+      }
+    }
+
+    &:after {
+      background-color: govuk-colour("black");
+    }
+
     .gem-c-layout-super-navigation-header__navigation-top-toggle-button-inner {
       border-color: $govuk-focus-colour;
-      color: govuk-colour("black");
 
-      @include govuk-media-query($from: 360px) {
-        &:before {
-          @include chevron(govuk-colour("black"), true);
-        }
+      &:before {
+        @include chevron(govuk-colour("black"), true);
       }
     }
   }
@@ -632,10 +471,24 @@ $after-button-padding-left: govuk-spacing(5);
   @include focus-not-focus-visible {
     background: none;
     box-shadow: none;
+    color: govuk-colour("white");
+
+    &:hover {
+      .gem-c-layout-super-navigation-header__navigation-top-toggle-button-inner {
+        &:before {
+          @include chevron(govuk-colour("mid-grey"), true);
+        }
+
+        color: govuk-colour("mid-grey");
+      }
+
+      &:after {
+        background: govuk-colour("mid-grey");
+      }
+    }
 
     .gem-c-layout-super-navigation-header__navigation-top-toggle-button-inner {
       border-color: $button-pipe-colour;
-      color: govuk-colour("white");
 
       @include govuk-media-query($from: 360px) {
         &:before {
@@ -653,7 +506,7 @@ $after-button-padding-left: govuk-spacing(5);
       box-shadow: none;
 
       &:after {
-        background-color: $govuk-focus-colour;
+        background-color: govuk-colour("black");
       }
 
       .gem-c-layout-super-navigation-header__navigation-top-toggle-button-inner {
@@ -697,7 +550,11 @@ $after-button-padding-left: govuk-spacing(5);
   border-left: 1px solid govuk-colour("white");
   border-right: 1px solid govuk-colour("white");
   margin: 0;
-  padding: govuk-spacing(2) govuk-spacing(4);
+  padding: govuk-spacing(1) govuk-spacing(4);
+
+  @include govuk-media-query($from: "desktop") {
+    border-right: 0;
+  }
 
   @include govuk-media-query($from: 360px) {
     &:before {
@@ -715,9 +572,7 @@ $after-button-padding-left: govuk-spacing(5);
   cursor: pointer;
   height: $search-width-or-height;
   padding: govuk-spacing(3);
-  position: absolute;
-  right: (0 - govuk-spacing(3));
-  top: 0;
+  position: relative;
   width: $search-width-or-height;
 
   @include focus-and-focus-visible {
@@ -735,6 +590,8 @@ $after-button-padding-left: govuk-spacing(5);
   }
 
   @include govuk-media-query($from: "desktop") {
+    border: 0;
+    margin: 0;
     right: 0;
 
     @include focus-not-focus-visible {
@@ -776,6 +633,7 @@ $after-button-padding-left: govuk-spacing(5);
       background: govuk-colour("light-grey");
       border-bottom-color: govuk-colour("light-grey");
       color: govuk-colour("light-grey");
+      outline: 1px solid govuk-colour("light-grey"); // overlap the border of the nav menu so it won't appear when menu open
     }
   }
 }
@@ -802,11 +660,21 @@ $after-button-padding-left: govuk-spacing(5);
 // Dropdown menu.
 .gem-c-layout-super-navigation-header__navigation-dropdown-menu {
   background: govuk-colour("light-grey");
+  border-bottom: 1px govuk-colour("mid-grey") solid;
+  top: govuk-spacing(8);
+  left: govuk-spacing(-3);
+  padding: 0 govuk-spacing(3);
+  position: absolute;
+  right: govuk-spacing(-3);
+
+  @include govuk-media-query($from: "tablet") {
+    padding: 0 govuk-spacing(6);
+    left: govuk-spacing(-6);
+    right: govuk-spacing(-6);
+  }
 
   @include govuk-media-query($from: "desktop") {
-    border-bottom: 1px govuk-colour("mid-grey") solid;
     left: 0;
-    position: absolute;
     right: 0;
   }
 }
@@ -824,23 +692,27 @@ $after-button-padding-left: govuk-spacing(5);
 // Dropdown menu items.
 .gem-c-layout-super-navigation-header__dropdown-list-item {
   box-sizing: border-box;
-  padding: 0 0 govuk-spacing(4) 0;
+  padding: 0 0 govuk-spacing(5) 0;
   position: relative;
+  @include govuk-media-query($from: "desktop") {
+    padding: 0 0 govuk-spacing(4) 0;
+  }
 }
 
 // Navigation menu items.
 .gem-c-layout-super-navigation-header__navigation-second-items {
+
   list-style: none;
   margin: 0;
-  padding: govuk-spacing(6) govuk-spacing(4);
+  padding: govuk-spacing(3) govuk-spacing(5) govuk-spacing(5) 0;
 
   & > li {
     margin: 0;
   }
 
   @include govuk-media-query($from: "desktop") {
-    margin: 0 (0 - govuk-spacing(3));
-    padding: govuk-spacing(7) 0 govuk-spacing(8) 0;
+    margin: 0 (0 - govuk-spacing(3)) govuk-spacing(9);
+    padding: govuk-spacing(2) 0 0 0;
 
     & > li {
       margin: 0 govuk-spacing(3);
@@ -848,21 +720,21 @@ $after-button-padding-left: govuk-spacing(5);
   }
 }
 
-.gem-c-layout-super-navigation-header__navigation-second-items--topics {
-  @include govuk-media-query($from: "desktop") {
-    @include columns($items: 17, $columns: 2, $selector: "li", $flow: column);
+.gem-c-layout-super-navigation-header__column--government-activity {
+  position: relative;
+
+  @include govuk-media-query($until: "desktop") {
+    margin-top: govuk-spacing(6);
   }
 }
 
-.gem-c-layout-super-navigation-header__navigation-second-items--government-activity {
-  @include govuk-media-query($from: "desktop") {
-    @include columns($items: 6, $columns: 2, $selector: "li", $flow: column);
-    padding-bottom: 0;
+.gem-c-layout-super-navigation-header__navigation-second-items--topics {
+  @include govuk-media-query($until: "desktop") {
+    border-bottom: 1px solid govuk-colour("mid-grey");
+  }
 
-    & > li {
-      box-sizing: border-box;
-      padding-bottom: govuk-spacing(4);
-    }
+  @include govuk-media-query($from: "desktop") {
+    @include columns($items: 17, $columns: 2, $selector: "li", $flow: column);
   }
 }
 
@@ -870,10 +742,6 @@ $after-button-padding-left: govuk-spacing(5);
   font-size: 16px;
   font-size: govuk-px-to-rem(16px);
 
-  &:after {
-    @include make-selectable-area-bigger;
-  }
-
   @include govuk-media-query($from: "desktop") {
     font-weight: bold;
     padding: 0;
@@ -888,52 +756,10 @@ $after-button-padding-left: govuk-spacing(5);
   font-size: 16px;
   font-size: govuk-px-to-rem(16px);
   font-weight: bold;
-}
-
-// Dropdown menu footer links.
-.gem-c-layout-super-navigation-header__navigation-second-footer-break {
-  @include govuk-media-query($until: "desktop") {
-    display: none;
-  }
-}
-
-.gem-c-layout-super-navigation-header__navigation-second-footer-list {
-  list-style: none;
-  padding: 0 0 govuk-spacing(8) govuk-spacing(4);
-
-  @include govuk-media-query($from: "desktop") {
-    @include columns($items: 2, $columns: 2, $selector: "li");
-    margin: 0 (0 - govuk-spacing(3));
-    padding: govuk-spacing(6) 0 govuk-spacing(7) 0;
-  }
-}
-
-.gem-c-layout-super-navigation-header__navigation-second-footer-item {
-  padding: govuk-spacing(2) 0;
-  position: relative;
-
-  @include govuk-media-query($from: "desktop") {
-    padding: 0 govuk-spacing(3);
-  }
-}
-
-.gem-c-layout-super-navigation-header__navigation-second-footer-link {
-  display: inline-block;
-  font-size: 16px;
-  font-size: govuk-px-to-rem(16px);
-  margin: govuk-spacing(1) 0;
 
   &:after {
     @include make-selectable-area-bigger;
-  }
-
-  @include govuk-media-query($from: "desktop") {
-    display: inline;
-    padding: 0;
-
-    &:after {
-      content: none;
-    }
+    height: calc(100% - 20px);
   }
 }
 
@@ -947,21 +773,22 @@ $after-button-padding-left: govuk-spacing(5);
 
 // Search dropdown.
 .gem-c-layout-super-navigation-header__search-items {
-  background: govuk-colour("light-grey");
-  margin: 0 (0 - govuk-spacing(3));
+  .js-module-initialised & {
+    margin: 0 (0 - govuk-spacing(3));
+    position: absolute;
 
-  @include govuk-media-query($from: "tablet") {
-    margin: 0 (0 - govuk-spacing(6));
+    @include govuk-media-query($from: "tablet") {
+      margin: 0 (0 - govuk-spacing(6));
+    }
   }
 
+  background: govuk-colour("light-grey");
+  left: 0;
+  right: 0;
+  z-index: 999;
+
   @include govuk-media-query($from: "desktop") {
     margin: 0;
-
-    .js-module-initialised & {
-      left: 0;
-      position: absolute;
-      right: 0;
-    }
   }
 }
 
@@ -992,14 +819,22 @@ $after-button-padding-left: govuk-spacing(5);
   }
 }
 
-// To be used with .govuk-width-container - we only need the margins from
-// desktop onwards.
 .gem-c-layout-super-navigation-header__width-container {
   @include govuk-media-query($until: "desktop") {
     margin: 0;
+    margin-top: govuk-spacing(6);
+  }
+
+  @include govuk-media-query($from: "desktop") {
+    margin: govuk-spacing(5) auto 0;
+    max-width: 960px;
   }
 }
 
+.gem-c-layout-super-navigation-header__column-header {
+  font-size: 24px;
+}
+
 @include govuk-media-query($media-type: print) {
   .gem-c-layout-super-navigation-header__content {
     display: none;