govuk_publishing_components 27.10.2 → 27.11.0

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

@@ -46,6 +46,10 @@
   grid-template-columns: fractions($columns);
   -ms-grid-rows: fractions($rows);
   grid-template-rows: fractions($rows);
+}
+
+@mixin columns-children($items, $columns, $selector: "*") {
+  $rows: ceil($items / $columns);
 
   // Internet Explorer 10-11 require each element to be placed in the grid -
   // the `grid-auto-flow` property isn't supported. This means that both the
@@ -92,169 +96,72 @@
   }
 }
 
-$search-icon-size: 20px;
-
-@mixin chevron($colour) {
-  border-bottom: 3px solid govuk-colour($colour);
-  border-right: 3px solid govuk-colour($colour);
-  content: " ";
-  display: inline-block;
-  height: 8px;
-  margin: 0 8px 0 2px;
-  transform: translateY(-35%) rotate(45deg);
-  vertical-align: middle;
-  width: 8px;
-}
-
-%top-level-navigation-link-base {
-  background: none;
-  @include govuk-font($size: 24, $weight: bold, $line-height: 20px);
-  border: 0;
-  box-sizing: border-box;
-  display: block;
-  margin: 0;
-  padding: govuk-spacing(6) govuk-spacing(3);
-  position: relative;
-  text-decoration: none;
-
-  &,
-  &:link,
-  &:visited {
-    color: $govuk-link-colour;
-  }
-
-  &:focus {
-    background: $govuk-focus-colour;
-    border-color: $govuk-focus-text-colour;
-    border-top-color: $govuk-focus-colour;
-    color: $govuk-focus-text-colour;
-    outline: 3px solid transparent;
-    box-shadow: none;
-    z-index: 1;
-  }
-
-  @include govuk-media-query($from: "tablet") {
-    padding: govuk-spacing(6);
-  }
-
-  @include govuk-media-query($from: "desktop") {
-    @include govuk-font($size: 16, $weight: false, $line-height: 20px);
-    color: govuk-colour("white");
-    display: inherit;
-    height: govuk-spacing(9);
-    padding: govuk-spacing(4);
-
-    &:after {
-      background: govuk-colour("black");
-      bottom: 0;
-      content: " ";
-      display: block;
-      height: govuk-spacing(1);
-      left: govuk-spacing(4);
-      position: absolute;
-      right: govuk-spacing(4);
-    }
-
-    &:hover {
-      background: govuk-colour("black");
-      color: govuk-colour("mid-grey");
-
-      &:after {
-        background-color: govuk-colour("mid-grey");
-      }
-    }
-
-    &:focus {
-      @include govuk-focused-text;
-      box-shadow: none;
+$icon-size: 20px;
+$chevron-indent-spacing: 7px;
 
-      &:after {
-        background-color: $govuk-focus-text-colour;
-      }
-    }
-
-    &,
-    &:visited {
-      color: govuk-colour("white");
-    }
+@mixin chevron($colour, $update: false) {
+  @if ($update == true) {
+    border-bottom-color: $colour;
+    border-right-color: $colour;
+  } @else {
+    border-bottom: 3px solid $colour;
+    border-right: 3px solid $colour;
+    content: " ";
+    display: inline-block;
+    height: 8px;
+    margin: 0 8px 0 2px;
+    transform: translateY(-35%) rotate(45deg);
+    vertical-align: middle;
+    width: 8px;
   }
 }
 
-%toggle-base {
-  @extend %top-level-navigation-link-base;
-  @include govuk-font($size: 16, $weight: false, $line-height: 20px);
-  border-radius: 0;
-  cursor: pointer;
-  padding: govuk-spacing(4);
+@mixin make-selectable-area-bigger {
+  background: none;
+  bottom: 0;
+  content: " ";
+  left: 0;
+  position: absolute;
   right: 0;
   top: 0;
-
-  @include govuk-media-query($from: "desktop") {
-    border: none;
-  }
 }
 
-%top-level-navigation-toggle-base {
-  @extend %toggle-base;
-  border-top: 1px solid govuk-colour("black");
-  height: govuk-spacing(9);
+@mixin pseudo-underline {
+  background: none;
+  bottom: 0;
+  content: " ";
+  height: govuk-spacing(1);
+  left: govuk-spacing(4);
+  position: absolute;
+  right: govuk-spacing(4);
+  top: auto;
+}
 
+@mixin focus-and-focus-visible {
   &:focus {
-    border-color: $govuk-focus-colour;
+    @content;
   }
 
-  &.gem-c-layout-super-navigation-header__open-button {
-    border-left-color: govuk-colour("black");
-    border-right-color: govuk-colour("black");
-
-    &,
-    &:hover {
-      background: govuk-colour("light-grey");
-      color: govuk-colour("light-grey");
-    }
-
-    &:focus {
-      color: $govuk-focus-colour;
-      background: $govuk-focus-colour;
-    }
-
-    &:before,
-    &:after {
-      $width: govuk-spacing(4);
-      $height: 4px;
-
-      border: none;
-      content: " ";
-      display: block;
-      margin: 0;
-      width: $width;
-      height: $height;
-      background: govuk-colour("black");
-      transform-origin: center;
-      position: absolute;
-      top: calc(50% - #{$height / 2});
-      left: calc(50% - #{$width / 2});
-    }
-
-    &:before {
-      transform: rotate(45deg);
-    }
-
-    &:after {
-      transform: rotate(-45deg);
-    }
+  &:focus-visible {
+    @content;
   }
 }
 
-%search-icon {
-  height: $search-icon-size;
-  pointer-events: none;
-  width: $search-icon-size;
+@mixin focus-not-focus-visible {
+  & {
+    @content;
+  }
+
+  &:focus:not(:focus-visible) {
+    @content;
+  }
 }
 
 // Header layout - black bar and logo.
 .gem-c-layout-super-navigation-header {
   background: govuk-colour("black");
+  border-top: 1px solid govuk-colour("black");
+  margin-top: -1px;
   position: relative;
 
   .lte-ie8 & {
@@ -276,8 +183,8 @@ $search-icon-size: 20px;
 
 .gem-c-layout-super-navigation-header__header-logo {
   height: govuk-spacing(6);
-  padding-top: govuk-spacing(3);
   padding-bottom: govuk-spacing(3);
+  padding-top: govuk-spacing(3);
 
   @include govuk-media-query($from: "desktop") {
     display: block;
@@ -292,6 +199,10 @@ $search-icon-size: 20px;
   }
 }
 
+.gem-c-layout-super-navigation-header__navigation-toggle-wrapper {
+  position: relative;
+}
+
 // Top level navigation and search.
 .gem-c-layout-super-navigation-header__navigation-items,
 .gem-c-layout-super-navigation-header__search-items {
@@ -314,6 +225,10 @@ $search-icon-size: 20px;
 }
 
 .gem-c-layout-super-navigation-header__navigation-items {
+  @include govuk-media-query($from: "desktop") {
+    display: inline-block;
+  }
+
   .js-module-initialised & {
     padding: 0 0 govuk-spacing(9) 0;
 
@@ -325,94 +240,290 @@ $search-icon-size: 20px;
 
 .gem-c-layout-super-navigation-header__navigation-item,
 .gem-c-layout-super-navigation-header__search-item {
-  margin-right: 0;
-  padding: 0;
+  display: block;
+  margin: 0 govuk-spacing(3);
+  position: relative;
+
+  @include govuk-media-query($from: "tablet") {
+    margin: 0 govuk-spacing(6);
+  }
 
   @include govuk-media-query($from: "desktop") {
-    border-bottom: none;
+    background: govuk-colour("black");
+    display: block;
     float: left;
+    margin: 0;
     padding: 0;
+    position: static;
   }
 }
 
 .gem-c-layout-super-navigation-header__navigation-item {
-  &:after {
-    background-color: $govuk-border-colour;
-    content: " ";
-    display: block;
-    height: 1px;
-    left: 0;
-    right: 0;
-    position: absolute;
-  }
+  border-bottom: 1px solid $govuk-border-colour;
 
   @include govuk-media-query($from: "desktop") {
-    &:after {
-      content: none;
-    }
+    border-bottom: 0;
   }
 }
 
-// Top level navigation links.
-.gem-c-layout-super-navigation-header__navigation-item-link {
-  @extend %top-level-navigation-link-base;
+// 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 {
+  @include govuk-link-common;
+  @include govuk-link-style-no-visited-state;
+
+  display: inline-block;
+  font-size: 19px;
+  @if $govuk-typography-use-rem {
+    font-size: govuk-px-to-rem(19px);
+  }
+  font-weight: bold;
+  margin: govuk-spacing(3) 0;
+
+  @include govuk-media-query($from: "desktop") {
+    display: block;
+    margin: 0;
+  }
+
+  &:hover {
+    @include govuk-link-hover-decoration;
+  }
 
   &,
-  &:link, // 👈 required to override govuk-template
+  &:link,
   &:visited {
-    color: $govuk-link-colour;
+    @include focus-and-focus-visible {
+      @include govuk-focused-text;
+    }
 
-    &:hover {
-      color: $govuk-link-hover-colour;
+    // Undoes the :focus styles *only* for browsers that support :focus-visible.
+    // See https://www.tpgi.com/focus-visible-and-backwards-compatibility/
+    &:focus:not(:focus-visible) {
+      background: none;
+      box-shadow: none;
+      color: $govuk-link-colour;
 
-      @include govuk-media-query($from: "desktop") {
-        color: govuk-colour("mid-grey");
+      &:hover {
+        @include govuk-link-decoration;
+        @include govuk-link-hover-decoration;
+        color: $govuk-link-hover-colour;
       }
     }
 
-    &:focus {
-      color: $govuk-focus-text-colour;
+    &:after {
+      @include make-selectable-area-bigger;
     }
 
     @include govuk-media-query($from: "desktop") {
-      color: govuk-colour("white");
+      float: left;
+      font-size: 16px;
+
+      // stylelint-disable max-nesting-depth
+      @if $govuk-typography-use-rem {
+        font-size: govuk-px-to-rem(16px);
+      }
+      // stylelint-enable max-nesting-depth
+
+      height: govuk-spacing(4);
+      padding: govuk-spacing(4);
+      position: relative;
+
+      &:before {
+        @include chevron(govuk-colour("white"), true);
+      }
+
+      &:hover {
+        color: govuk-colour("mid-grey");
+
+        &:after {
+          background: govuk-colour("mid-grey");
+        }
+      }
+
+      // stylelint-disable max-nesting-depth
+      @include focus-and-focus-visible {
+        box-shadow: none;
+        color: $govuk-focus-text-colour;
+
+        &:after {
+          background: $govuk-focus-text-colour;
+        }
+      }
+
+      @include focus-not-focus-visible {
+        &,
+        &:hover {
+          color: govuk-colour("white");
+          text-decoration: none;
+        }
+      }
+      // stylelint-enable max-nesting-depth
+
+      &:focus:not(:focus-visible) {
+        &:after {
+          background: none;
+        }
+      }
+
+      &:after {
+        @include pseudo-underline;
+      }
     }
   }
 
-  // This :link:focus selector is required to override the `govuk-template`
-  // defaults.
-  &:link:focus {
-    color: $govuk-focus-text-colour;
+  &:after {
+    @include make-selectable-area-bigger;
   }
+}
 
+.gem-c-layout-super-navigation-header__navigation-item-link {
   .js-module-initialised & {
-    @include govuk-media-query($until: "desktop") {
-      padding: govuk-spacing(6) govuk-spacing(3) govuk-spacing(6) govuk-spacing(9);
+    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;
+
+  @include focus-not-focus-visible {
+    &:before {
+      @include chevron($govuk-link-colour);
+    }
+  }
+
+  @include focus-not-focus-visible {
+    &:hover {
+      &:before {
+        @include chevron($govuk-link-hover-colour, true);
+      }
+    }
+  }
+
+  &:focus {
+    &:before {
+      @include chevron($govuk-focus-text-colour, true);
+    }
+  }
+
+  @include govuk-media-query($from: "desktop") {
+    &:after {
+      @include pseudo-underline;
+    }
+
+    @include focus-not-focus-visible {
+      color: govuk-colour("white");
+      float: left;
+      font-size: 16px;
+      @if $govuk-typography-use-rem {
+        font-size: govuk-px-to-rem(16px);
+      }
+      height: govuk-spacing(9);
+      padding: govuk-spacing(4);
+      position: relative;
+      text-decoration: none;
+
+      &: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");
+        }
+
+        &:before {
+          @include chevron(govuk-colour("mid-grey"), true);
+        }
+      }
     }
 
-    @include govuk-media-query($until: "tablet") {
-      padding-left: govuk-spacing(7);
+    @include focus-and-focus-visible {
+      color: $govuk-focus-text-colour;
+
+      &:after {
+        background: $govuk-focus-text-colour;
+      }
+
+      &:before {
+        @include chevron($govuk-focus-text-colour, true);
+      }
     }
   }
+
+  &.gem-c-layout-super-navigation-header__open-button {
+    @include focus-not-focus-visible {
+      &:before {
+        transform: translateY(0) rotate(225deg);
+      }
+    }
+
+    @include govuk-media-query($from: "desktop") {
+      @include focus-not-focus-visible {
+        background: govuk-colour("light-grey");
+        color: $govuk-link-colour;
+
+        &: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;
+
+        &:before {
+          @include chevron($govuk-focus-text-colour, true);
+        }
+
+        &:after {
+          background: $govuk-focus-text-colour;
+        }
+      }
+    }
+  }
+
+  .js-module-initialised & {
+    @include govuk-link-style-no-underline;
+  }
 }
 
 // Search link and dropdown.
 .gem-c-layout-super-navigation-header__search-item-link {
-  @extend %top-level-navigation-link-base;
+  &:link,
+  &:visited {
+    @include govuk-media-query($from: "desktop") {
+      background: $govuk-brand-colour;
 
-  @include govuk-media-query($from: "desktop") {
-    background: $govuk-link-colour;
-    margin-left: 0;
+      &:hover {
+        background: none;
 
-    &:focus:hover:after,
-    &:after {
-      content: none;
-    }
+        &:before {
+          left: 0;
+          right: 0;
+        }
+      }
 
-    &:hover:after {
-      content: " ";
-      left: 0;
-      right: 0;
+      &:focus {
+        background: $govuk-focus-colour;
+
+        &:before {
+          content: none;
+        }
+      }
     }
   }
 }
@@ -423,18 +534,17 @@ $search-icon-size: 20px;
   }
 }
 
-.gem-c-layout-super-navigation-header__search-item-link-icon {
-  @extend %search-icon;
-  display: none;
-
-  @include govuk-media-query($from: "desktop") {
-    display: block;
-  }
+.gem-c-layout-super-navigation-header__search-item-link-icon,
+.gem-c-layout-super-navigation-header__search-toggle-button-link-icon {
+  height: $icon-size;
+  pointer-events: none;
+  width: $icon-size;
 }
 
-.gem-c-layout-super-navigation-header__search-toggle-button-link-icon {
-  @extend %search-icon;
-  display: block;
+.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.
@@ -450,223 +560,216 @@ $search-icon-size: 20px;
 
 // Styles for top level navigation toggle button.
 .gem-c-layout-super-navigation-header__navigation-top-toggle-button {
-  @extend %top-level-navigation-toggle-base;
-  border-left: 1px solid govuk-colour("mid-grey");
+  @include govuk-link-common;
+  @include govuk-link-style-no-visited-state;
+  @include govuk-link-style-no-underline;
+
+  font-size: 16px;
+  @if $govuk-typography-use-rem {
+    font-size: govuk-px-to-rem(16px);
+  }
+  font-weight: 700;
+  background: govuk-colour("black");
+  border: 0;
+  box-sizing: border-box;
   color: govuk-colour("white");
+  cursor: pointer;
+  height: govuk-spacing(9);
+  padding: 0;
   position: absolute;
-  right: 45px;
+  right: ((govuk-spacing(9) - govuk-spacing(3)) - 1px); // width of the search button (60px) - 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;
 
-  &.gem-c-layout-super-navigation-header__open-button {
-    border-top-color: govuk-colour("black");
-  }
+  @include focus-and-focus-visible {
+    @include govuk-focused-text;
+    box-shadow: none;
 
-  @include govuk-media-query($from: 360px) {
-    &:before {
-      @include chevron("white");
-    }
-  }
+    .gem-c-layout-super-navigation-header__navigation-top-toggle-button-inner {
+      border-color: $govuk-focus-colour;
+      color: govuk-colour("black");
 
-  &:focus {
-    &:before {
-      border-color: $govuk-focus-text-colour;
+      @include govuk-media-query($from: 360px) {
+        &:before {
+          @include chevron(govuk-colour("black"), true);
+        }
+      }
     }
   }
 
-  @include govuk-media-query(360px) {
-    right: 60px;
-  }
-
-  @include govuk-media-query($from: "desktop") {
-    display: none;
-  }
-}
-
-// styles for search toggle button
-.gem-c-layout-super-navigation-header__search-toggle-button {
-  @extend %top-level-navigation-toggle-base;
-  border-top: 1px solid transparent;
-  border-left: 1px solid govuk-colour("mid-grey");
-  color: govuk-colour("white");
-  position: absolute;
-  right: (0 - govuk-spacing(3));
+  // Undoes the :focus styles *only* for browsers that support :focus-visible.
+  // See https://www.tpgi.com/focus-visible-and-backwards-compatibility/
+  @include focus-not-focus-visible {
+    background: none;
+    box-shadow: none;
 
-  &:after {
-    background-color: $govuk-link-colour;
-    content: " ";
-    left: 0;
-    right: 0;
-  }
+    .gem-c-layout-super-navigation-header__navigation-top-toggle-button-inner {
+      border-color: govuk-colour("white");
+      color: govuk-colour("white");
 
-  &:not(.gem-c-layout-super-navigation-header__open-button):focus {
-    &:hover,
-    &:after {
-      background-color: $govuk-focus-colour;
-      border-top-color: $govuk-focus-colour;
+      @include govuk-media-query($from: 360px) {
+        &:before {
+          @include chevron(govuk-colour("white"), true);
+        }
+      }
     }
   }
 
-  @include govuk-media-query($from: 360px) {
-    right: 0;
-  }
-
-  @include govuk-media-query($from: "desktop") {
-    background-color: $govuk-link-colour;
-    border-left: 0;
-    height: govuk-spacing(9);
-    margin-left: govuk-spacing(3);
-    padding: govuk-spacing(4);
-    position: relative;
-    float: right;
+  // Open button modifier
+  &.gem-c-layout-super-navigation-header__open-button {
+    // stylelint-disable max-nesting-depth
+    @include focus-and-focus-visible {
+      @include govuk-focused-text;
+      box-shadow: none;
 
-    &.gem-c-layout-super-navigation-header__open-button {
-      border-top-color: govuk-colour("black");
+      .gem-c-layout-super-navigation-header__navigation-top-toggle-button-inner {
+        color: govuk-colour("black");
+        border-color: $govuk-focus-colour;
 
-      &:hover:after {
-        content: " ";
+        @include govuk-media-query($from: 360px) {
+          &:before {
+            @include chevron(govuk-colour("black"), true);
+            transform: translateY(0) rotate(225deg);
+          }
+        }
       }
     }
 
-    // To avoid the 'sticky hover' problem, we need to stop the hover state on
-    // touch screen devices.
-    //
-    // One solution is to use `@media(hover: hover)`. This turns on the hover
-    // state only for devices that aren't touchscreen, but means that browsers
-    // that don't support this media query won't get a hover state at all.
-    //
-    // To get around this, we do the opposite - we turn off the hover state for
-    // for touchscreen devices.
-    @media (hover: none), (pointer: coarse) {
-      &:not(:focus):hover {
-        background-color: $govuk-link-colour;
-        color: govuk-colour("white");
+    @include focus-not-focus-visible {
+      background: govuk-colour("light-grey");
 
-        &:after {
-          background-color: $govuk-link-colour;
+      .gem-c-layout-super-navigation-header__navigation-top-toggle-button-inner {
+        color: govuk-colour("black");
+        border-color: govuk-colour("light-grey");
+
+        @include govuk-media-query($from: 360px) {
+          &:before {
+            @include chevron(govuk-colour("black"));
+            transform: translateY(0) rotate(225deg);
+          }
         }
       }
     }
+    // stylelint-enable max-nesting-depth
   }
 }
 
-// styles for second level navigation toggle buttons
-.gem-c-layout-super-navigation-header__navigation-second-toggle-button {
-  @extend %toggle-base;
-  @include govuk-font($size: 24, $weight: false, $line-height: 20px);
-  border: 0;
-  margin: 0;
-  padding: govuk-spacing(6) govuk-spacing(3);
-  position: relative;
-  text-align: left;
-  text-decoration: none;
-  width: 100%;
+.gem-c-layout-super-navigation-header__navigation-top-toggle-button-inner {
+  display: inline-block;
+  border-left: 1px solid govuk-colour("white");
+  border-right: 1px solid govuk-colour("white");
+  margin: govuk-spacing(2) 0;
+  padding: govuk-spacing(2) govuk-spacing(4);
 
-  &:before {
-    @include chevron("black");
+  @include govuk-media-query($from: 360px) {
+    &:before {
+      @include chevron(govuk-colour("white"));
+    }
   }
+}
 
-  &,
-  &:visited {
-    color: $govuk-link-colour;// FIXME: contrast against govuk-colour("light-grey") not high enough
+// Styles for search toggle button.
+.gem-c-layout-super-navigation-header__search-toggle-button {
+  @include govuk-font($size: 19, $weight: "bold", $line-height: 20px);
+  background: govuk-colour("black");
+  border: 0;
+  color: govuk-colour("white");
+  cursor: pointer;
+  height: govuk-spacing(9);
+  padding: govuk-spacing(4);
+  position: absolute;
+  right: (0 - govuk-spacing(3));
+  top: 0;
+  width: govuk-spacing(9);
 
-    @include govuk-media-query($from: "desktop") {
-      color: govuk-colour("white");
-    }
+  @include focus-and-focus-visible {
+    @include govuk-focused-text;
+    border-color: $govuk-focus-colour;
+    box-shadow: none;
+    z-index: 11;
   }
 
-  @include govuk-media-query($from: "tablet") {
-    padding: govuk-spacing(6);
+  &:focus:not(:focus-visible) {
+    background: none;
+    border-color: govuk-colour("white");
+    box-shadow: none;
+    color: govuk-colour("white");
   }
 
   @include govuk-media-query($from: "desktop") {
-    @include govuk-font($size: 16, $weight: false, $line-height: 20px);
-    border-top: 1px solid transparent;
-    color: govuk-colour("white");
-    height: govuk-spacing(9);
-    padding: govuk-spacing(4);
-    position: relative;
+    right: 0;
 
-    &:before {
-      border-color: govuk-colour("white");
+    @include focus-not-focus-visible {
+      background: $govuk-brand-colour;
+      border-bottom: 1px solid govuk-colour("dark-blue");
+      border-left: none;
+      position: relative;
     }
 
     &:hover {
+      background: govuk-colour("black");
+      border-bottom: govuk-spacing(1) solid govuk-colour("mid-grey");
       color: govuk-colour("mid-grey");
-
-      &:after {
-        background-color: govuk-colour("mid-grey");
-      }
-
-      &:before {
-        border-color: govuk-colour("mid-grey");
-      }
     }
 
-    &:focus {
-      color: $govuk-focus-text-colour;
-
-      &:after {
-        background-color: $govuk-focus-text-colour;
-      }
-
-      &:before {
-        border-color: $govuk-focus-text-colour;
-      }
+    @include focus-and-focus-visible {
+      @include govuk-focused-text;
+      border-bottom-color: $govuk-focus-colour;
+      box-shadow: none;
     }
   }
 
+  // Open button modifier
   &.gem-c-layout-super-navigation-header__open-button {
-    border-top-color: govuk-colour("black");
-
-    &:before {
-      transform: translateY(20%) rotate(225deg);
-    }
-
-    @include govuk-media-query($from: "desktop") {
-      background-color: govuk-colour("light-grey");
-      color: $govuk-link-colour;
-
-      &:after {
-        background: $govuk-link-colour;
-      }
-
-      &:before {
-        border-color: $govuk-link-colour;
-      }
-
-      &:focus {
-        background-color: $govuk-focus-colour;
-        color: $govuk-focus-text-colour;
-
-        &:after {
-          background-color: $govuk-focus-text-colour;
-        }
+    @include focus-and-focus-visible {
+      @include govuk-focused-text;
+      border-color: $govuk-focus-colour;
+      box-shadow: none;
+      color: $govuk-focus-colour;
 
+      @include govuk-media-query($from: 360px) {
         &:before {
-          border-color: $govuk-focus-text-colour;
+          @include chevron($govuk-focus-colour, true);
         }
       }
+    }
 
-      &:active {
-        background-color: govuk-colour("light-grey");
-        color: $govuk-link-colour;
-
-        &:before {
-          border-color: $govuk-link-colour;
-        }
-      }
+    @include focus-not-focus-visible {
+      background: govuk-colour("light-grey");
+      border-bottom-color: govuk-colour("light-grey");
+      color: govuk-colour("light-grey");
     }
   }
 }
 
+.gem-c-layout-super-navigation-header__navigation-top-toggle-close-icon {
+  color: $govuk-text-colour;
+  display: none;
+  font-size: 36px;
+  font-weight: normal;
+  left: 0;
+  line-height: 22px;
+  padding: govuk-spacing(4) 0;
+  pointer-events: none;
+  position: absolute;
+  right: 0;
+  text-align: center;
+  top: 0;
+
+  .gem-c-layout-super-navigation-header__open-button & {
+    display: block;
+  }
+}
+
 // Dropdown menu.
 .gem-c-layout-super-navigation-header__navigation-dropdown-menu {
-  background: govuk-colour("white");
+  background: govuk-colour("light-grey");
 
   @include govuk-media-query($from: "desktop") {
-    background: govuk-colour("light-grey");
     left: 0;
     position: absolute;
     right: 0;
+    top: govuk-spacing(9);
   }
 }
 
@@ -682,7 +785,12 @@ $search-icon-size: 20px;
 
 // Dropdown menu items.
 .gem-c-layout-super-navigation-header__dropdown-list-item {
+  margin: 0 0 0 $chevron-indent-spacing;
+  padding: govuk-spacing(2) 0;
+  position: relative;
+
   @include govuk-media-query($from: "desktop") {
+    margin: 0;
     padding: govuk-spacing(2) 0;
   }
 }
@@ -699,9 +807,7 @@ $search-icon-size: 20px;
 
     & > li {
       box-sizing: border-box;
-      margin-bottom: 0;
-      padding-left: govuk-spacing(3);
-      padding-right: govuk-spacing(3);
+      margin: 0 govuk-spacing(3) govuk-spacing(2) govuk-spacing(3);
     }
   }
 }
@@ -709,64 +815,122 @@ $search-icon-size: 20px;
 .gem-c-layout-super-navigation-header__navigation-second-items--topics {
   @include govuk-media-query($from: "desktop") {
     @include columns(18, 2, "li");
+    @include columns-children(18, 2, "li");
   }
 }
 
 .gem-c-layout-super-navigation-header__navigation-second-items--government-activity {
+  & > li:first-child {
+    margin-bottom: govuk-spacing(7);
+  }
+
   @include govuk-media-query($from: "desktop") {
-    @include columns(5, 2, "li");
-    padding-bottom: govuk-spacing(3);
+    @include columns(7, 2, "li");
+    padding-bottom: 0;
+
+    & > li,
+    & > li:first-child {
+      margin-bottom: govuk-spacing(4);
+    }
+
+    @supports (display: grid) {
+      & > li:first-child {
+        grid-column: span 2;
+      }
+    }
+
+    & > li:first-child {
+      border-bottom: 1px solid $govuk-border-colour;
+      padding-bottom: 0;
+      -ms-grid-column-span: 2;
+      -ms-grid-column: 1;
+      -ms-grid-row: 1;
+    }
+
+    & > li:nth-child(2) {
+      -ms-grid-column: 1;
+      -ms-grid-row: 2;
+    }
+
+    & > li:nth-child(3) {
+      -ms-grid-column: 1;
+      -ms-grid-row: 3;
+    }
+
+    & > li:nth-child(4) {
+      -ms-grid-column: 1;
+      -ms-grid-row: 4;
+    }
+
+    & > li:nth-child(5) {
+      -ms-grid-column: 2;
+      -ms-grid-row: 2;
+    }
+
+    & > li:nth-child(6) {
+      -ms-grid-column: 2;
+      -ms-grid-row: 3;
+    }
   }
 }
 
 .gem-c-layout-super-navigation-header__navigation-second-item-link {
-  display: inline-block;
-  padding: govuk-spacing(2) 0;
+  &:after {
+    @include make-selectable-area-bigger;
+  }
 
   @include govuk-media-query($from: "desktop") {
-    display: inline;
     font-weight: bold;
     padding: 0;
+
+    &:after {
+      content: none;
+    }
   }
 }
 
 .gem-c-layout-super-navigation-header__navigation-second-item-link--with-description {
   @include govuk-font($size: 19, $weight: bold);
-  margin-top: govuk-spacing(2);
   margin-bottom: 0;
+  margin-top: govuk-spacing(2);
 }
 
 // Dropdown menu footer links.
-.gem-c-layout-super-navigation-header__navigation-second-footer {
-  border-top: 1px solid govuk-colour("mid-grey");
+.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-bottom: govuk-spacing(8);
-  padding-top: govuk-spacing(4);
-
-  @include govuk-grid-column($width: "two-thirds", $float: right, $at: "desktop");
+  padding: 0 0 govuk-spacing(8) 0;
 
   @include govuk-media-query($from: "desktop") {
-    padding: govuk-spacing(7) 0 govuk-spacing(8) 0;
+    margin: 0 (0 - govuk-spacing(3)) 0 (0 - govuk-spacing(3));
+    padding: govuk-spacing(8) 0 govuk-spacing(9) 0;
+    @include columns(2, 2, "li");
+    @include columns-children(2, 2, "li");
   }
 }
 
 .gem-c-layout-super-navigation-header__navigation-second-footer-item {
+  padding: govuk-spacing(2) 0 govuk-spacing(2) $chevron-indent-spacing;
+  position: relative;
+
   @include govuk-media-query($from: "desktop") {
-    box-sizing: border-box;
-    float: left;
-    width: 50%;
-    padding: 0 govuk-spacing(3);
+    padding: 0 govuk-spacing(3) 0 govuk-spacing(3);
   }
 }
 
 .gem-c-layout-super-navigation-header__navigation-second-footer-link {
-  @include govuk-font($size: 19, $weight: bold);
+  @include govuk-font($size: 19, $weight: normal);
   display: inline-block;
   margin: govuk-spacing(1) 0;
-  padding: govuk-spacing(2) 0;
+
+  &:after {
+    @include make-selectable-area-bigger;
+  }
 
   @include govuk-media-query($from: "desktop") {
     display: inline;
@@ -791,7 +955,6 @@ $search-icon-size: 20px;
       left: 0;
       position: absolute;
       right: 0;
-      top: 60px;
     }
   }
 }