govuk_publishing_components 27.10.3 → 27.12.0

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

@@ -1,3 +1,5 @@
+@import "mixins/prefixed-transform";
+
 /// Set grid row or column value using the fraction unit.
 ///
 /// @param {Integer} $number - number of fractions that the grid row or column
@@ -46,6 +48,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
@@ -94,19 +100,21 @@
 
 $icon-size: 20px;
 $chevron-indent-spacing: 7px;
+$black-bar-height: 50px;
+$search-width-or-height: $black-bar-height;
 
 @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;
+    @include prefixed-transform($rotate: 45deg, $translateY: -35%);
+    border-bottom: 2px solid $colour;
+    border-right: 2px solid $colour;
     content: " ";
     display: inline-block;
     height: 8px;
     margin: 0 8px 0 2px;
-    transform: translateY(-35%) rotate(45deg);
     vertical-align: middle;
     width: 8px;
   }
@@ -127,9 +135,9 @@ $chevron-indent-spacing: 7px;
   bottom: 0;
   content: " ";
   height: govuk-spacing(1);
-  left: govuk-spacing(4);
+  left: govuk-spacing(3);
   position: absolute;
-  right: govuk-spacing(4);
+  right: govuk-spacing(3);
   top: auto;
 }
 
@@ -161,7 +169,7 @@ $chevron-indent-spacing: 7px;
   position: relative;
 
   .lte-ie8 & {
-    height: govuk-spacing(9);
+    height: $black-bar-height;
   }
 
   [hidden] {
@@ -179,8 +187,8 @@ $chevron-indent-spacing: 7px;
 
 .gem-c-layout-super-navigation-header__header-logo {
   height: govuk-spacing(6);
-  padding-bottom: govuk-spacing(3);
-  padding-top: govuk-spacing(3);
+  padding-bottom: govuk-spacing(2);
+  padding-top: govuk-spacing(2);
 
   @include govuk-media-query($from: "desktop") {
     display: block;
@@ -224,24 +232,18 @@ $chevron-indent-spacing: 7px;
   @include govuk-media-query($from: "desktop") {
     display: inline-block;
   }
-
-  .js-module-initialised & {
-    padding: 0 0 govuk-spacing(9) 0;
-
-    @include govuk-media-query($from: "desktop") {
-      padding: 0;
-    }
-  }
 }
 
 .gem-c-layout-super-navigation-header__navigation-item,
 .gem-c-layout-super-navigation-header__search-item {
   display: block;
-  margin: 0 govuk-spacing(3);
+  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") {
@@ -257,8 +259,15 @@ $chevron-indent-spacing: 7px;
 .gem-c-layout-super-navigation-header__navigation-item {
   border-bottom: 1px solid $govuk-border-colour;
 
+  .js-module-initialised & {
+    &:last-child {
+      border-bottom: none;
+    }
+  }
+
   @include govuk-media-query($from: "desktop") {
     border-bottom: 0;
+    padding: 0;
   }
 }
 
@@ -268,13 +277,14 @@ $chevron-indent-spacing: 7px;
 .gem-c-layout-super-navigation-header__navigation-second-toggle-button {
   @include govuk-link-common;
   @include govuk-link-style-no-visited-state;
-  @include govuk-link-style-no-underline;
 
   display: inline-block;
   font-size: 19px;
-  font-size: govuk-px-to-rem(19px);
+  @if $govuk-typography-use-rem {
+    font-size: govuk-px-to-rem(19px);
+  }
   font-weight: bold;
-  margin: govuk-spacing(3) 0;
+  margin: govuk-spacing(3) 0 govuk-spacing(3) 0;
 
   @include govuk-media-query($from: "desktop") {
     display: block;
@@ -313,9 +323,15 @@ $chevron-indent-spacing: 7px;
     @include govuk-media-query($from: "desktop") {
       float: left;
       font-size: 16px;
-      font-size: govuk-px-to-rem(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);
+      padding: govuk-spacing(3);
       position: relative;
 
       &:before {
@@ -332,28 +348,40 @@ $chevron-indent-spacing: 7px;
 
       // stylelint-disable max-nesting-depth
       @include focus-and-focus-visible {
-        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 {
-          color: govuk-colour("white");
           text-decoration: none;
         }
-      }
-      // stylelint-enable max-nesting-depth
 
-      &:focus:not(:focus-visible) {
+        & {
+          color: govuk-colour("white");
+        }
+
+        &:hover {
+          color: govuk-colour("mid-grey");
+
+          &:after {
+            background: govuk-colour("mid-grey");
+          }
+        }
+
         &:after {
           background: none;
         }
       }
+      // stylelint-enable max-nesting-depth
 
       &:after {
         @include pseudo-underline;
@@ -369,6 +397,7 @@ $chevron-indent-spacing: 7px;
 .gem-c-layout-super-navigation-header__navigation-item-link {
   .js-module-initialised & {
     margin-left: govuk-spacing(4);
+    @include govuk-link-style-no-underline;
   }
 }
 
@@ -408,9 +437,11 @@ $chevron-indent-spacing: 7px;
       color: govuk-colour("white");
       float: left;
       font-size: 16px;
-      font-size: govuk-px-to-rem(16px);
-      height: govuk-spacing(9);
-      padding: govuk-spacing(4);
+      @if $govuk-typography-use-rem {
+        font-size: govuk-px-to-rem(16px);
+      }
+      height: $black-bar-height;
+      padding: govuk-spacing(3);
       position: relative;
       text-decoration: none;
 
@@ -449,7 +480,7 @@ $chevron-indent-spacing: 7px;
   &.gem-c-layout-super-navigation-header__open-button {
     @include focus-not-focus-visible {
       &:before {
-        transform: translateY(0) rotate(225deg);
+        @include prefixed-transform($rotate: 225deg, $translateY: 0);
       }
     }
 
@@ -481,6 +512,10 @@ $chevron-indent-spacing: 7px;
       }
     }
   }
+
+  .js-module-initialised & {
+    @include govuk-link-style-no-underline;
+  }
 }
 
 // Search link and dropdown.
@@ -491,7 +526,7 @@ $chevron-indent-spacing: 7px;
       background: $govuk-brand-colour;
 
       &:hover {
-        background: none;
+        background: govuk-colour("black");
 
         &:before {
           left: 0;
@@ -506,6 +541,30 @@ $chevron-indent-spacing: 7px;
           content: none;
         }
       }
+
+      &:after {
+        left: 0;
+        right: 0;
+      }
+
+      @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;
+        }
+      }
     }
   }
 }
@@ -542,38 +601,39 @@ $chevron-indent-spacing: 7px;
 
 // Styles for top level navigation toggle button.
 .gem-c-layout-super-navigation-header__navigation-top-toggle-button {
-  @include govuk-font($size: 19, $weight: "bold", $line-height: 20px);
+  @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;
-  border-left: 1px solid govuk-colour("white");
-  border-right: 1px solid govuk-colour("white");
   box-sizing: border-box;
   color: govuk-colour("white");
   cursor: pointer;
-  height: govuk-spacing(9);
-  margin-right: -1px;
-  padding: govuk-spacing(4);
+  height: $black-bar-height;
+  padding: 0;
   position: absolute;
-  right: (govuk-spacing(9) - govuk-spacing(3));
+  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;
-
-  @include govuk-media-query($from: 360px) {
-    right: govuk-spacing(9);
-
-    &:before {
-      @include chevron(govuk-colour("white"));
-    }
-  }
+  z-index: 10;
 
   @include focus-and-focus-visible {
     @include govuk-focused-text;
-    border-color: $govuk-focus-colour;
     box-shadow: none;
-    z-index: 10;
 
-    @include govuk-media-query($from: 360px) {
-      &:before {
-        @include chevron(govuk-colour("black"), true);
+    .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);
+        }
       }
     }
   }
@@ -582,42 +642,70 @@ $chevron-indent-spacing: 7px;
   // See https://www.tpgi.com/focus-visible-and-backwards-compatibility/
   @include focus-not-focus-visible {
     background: none;
-    border-color: govuk-colour("white");
     box-shadow: none;
-    color: govuk-colour("white");
 
-    @include govuk-media-query($from: 360px) {
-      &:before {
-        @include chevron(govuk-colour("white"), true);
+    .gem-c-layout-super-navigation-header__navigation-top-toggle-button-inner {
+      border-color: govuk-colour("white");
+      color: govuk-colour("white");
+
+      @include govuk-media-query($from: 360px) {
+        &:before {
+          @include chevron(govuk-colour("white"), true);
+        }
       }
     }
   }
 
   // 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;
-      border-color: $govuk-focus-colour;
       box-shadow: none;
-      color: $govuk-focus-colour;
 
-      @include govuk-media-query($from: 360px) {
-        &:before {
-          @include chevron($govuk-focus-colour, true);
+      .gem-c-layout-super-navigation-header__navigation-top-toggle-button-inner {
+        color: govuk-colour("black");
+        border-color: $govuk-focus-colour;
+
+        @include govuk-media-query($from: 360px) {
+          &:before {
+            @include chevron(govuk-colour("black"), true);
+            @include prefixed-transform($rotate: 225deg, $translateY: 0);
+          }
         }
       }
     }
 
     @include focus-not-focus-visible {
       background: govuk-colour("light-grey");
-      color: govuk-colour("light-grey");
 
-      @include govuk-media-query($from: 360px) {
-        &:before {
-          @include chevron(govuk-colour("light-grey"));
+      .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"));
+            @include prefixed-transform($rotate: 225deg, $translateY: 0);
+          }
         }
       }
     }
+    // stylelint-enable max-nesting-depth
+  }
+}
+
+.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: 0;
+  padding: govuk-spacing(2) govuk-spacing(4);
+
+  @include govuk-media-query($from: 360px) {
+    &:before {
+      @include chevron(govuk-colour("white"));
+    }
   }
 }
 
@@ -626,20 +714,20 @@ $chevron-indent-spacing: 7px;
   @include govuk-font($size: 19, $weight: "bold", $line-height: 20px);
   background: govuk-colour("black");
   border: 0;
-  border-left: 1px solid govuk-colour("white");
   color: govuk-colour("white");
   cursor: pointer;
-  height: govuk-spacing(9);
-  padding: govuk-spacing(4);
+  height: $search-width-or-height;
+  padding: govuk-spacing(3);
   position: absolute;
   right: (0 - govuk-spacing(3));
   top: 0;
-  width: govuk-spacing(9);
+  width: $search-width-or-height;
 
   @include focus-and-focus-visible {
     @include govuk-focused-text;
     border-color: $govuk-focus-colour;
     box-shadow: none;
+    z-index: 11;
   }
 
   &:focus:not(:focus-visible) {
@@ -649,21 +737,19 @@ $chevron-indent-spacing: 7px;
     color: govuk-colour("white");
   }
 
-  @include govuk-media-query($from: 360px) {
+  @include govuk-media-query($from: "desktop") {
     right: 0;
-  }
 
-  @include govuk-media-query($from: "desktop") {
     @include focus-not-focus-visible {
       background: $govuk-brand-colour;
-      border-bottom: govuk-spacing(1) solid $govuk-brand-colour;
+      border-bottom: 1px solid govuk-colour("dark-blue");
       border-left: none;
       position: relative;
     }
 
     &:hover {
       background: govuk-colour("black");
-      border-bottom-color: govuk-colour("mid-grey");
+      border-bottom: govuk-spacing(1) solid govuk-colour("mid-grey");
       color: govuk-colour("mid-grey");
     }
 
@@ -704,7 +790,7 @@ $chevron-indent-spacing: 7px;
   font-weight: normal;
   left: 0;
   line-height: 22px;
-  padding: govuk-spacing(4) 0;
+  padding: govuk-spacing(3) 0;
   pointer-events: none;
   position: absolute;
   right: 0;
@@ -724,7 +810,6 @@ $chevron-indent-spacing: 7px;
     left: 0;
     position: absolute;
     right: 0;
-    top: govuk-spacing(9);
   }
 }
 
@@ -762,9 +847,7 @@ $chevron-indent-spacing: 7px;
 
     & > 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);
     }
   }
 }
@@ -772,13 +855,62 @@ $chevron-indent-spacing: 7px;
 .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;
+    }
   }
 }
 
@@ -790,6 +922,10 @@ $chevron-indent-spacing: 7px;
   @include govuk-media-query($from: "desktop") {
     font-weight: bold;
     padding: 0;
+
+    &:after {
+      content: none;
+    }
   }
 }
 
@@ -800,19 +936,21 @@ $chevron-indent-spacing: 7px;
 }
 
 // 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");
   }
 }
 
@@ -821,15 +959,12 @@ $chevron-indent-spacing: 7px;
   position: relative;
 
   @include govuk-media-query($from: "desktop") {
-    box-sizing: border-box;
-    float: left;
-    padding: 0 govuk-spacing(3);
-    width: 50%;
+    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;
 

data/app/assets/stylesheets/govuk_publishing_components/components/_single-page-notification-button.scss

@@ -0,0 +1,30 @@
+.gem-c-single-page-notification-button__submit {
+  padding: govuk-spacing(2);
+  margin: govuk-spacing(0);
+  border: 1px solid $govuk-border-colour;
+  color: $govuk-link-colour;
+  cursor: pointer;
+  background: none;
+
+  &:focus {
+    @include govuk-focused-text;
+    background-color: $govuk-focus-colour;
+    border-color: transparent;
+    box-shadow: 0 $govuk-focus-width $govuk-text-colour;
+  }
+
+  &:hover {
+    background-color: govuk-colour("light-grey");
+    color: $govuk-link-hover-colour;
+
+    &:focus {
+      color: $govuk-text-colour;
+    }
+  }
+}
+
+.gem-c-single-page-notification-button__icon {
+  color: govuk-colour("black");
+  vertical-align: top;
+  margin-right: govuk-spacing(1);
+}

data/app/assets/stylesheets/govuk_publishing_components/components/mixins/_prefixed-transform.scss

@@ -0,0 +1,5 @@
+@mixin prefixed-transform($translateY: 0, $rotate: 0, $scale: 1) {
+  -webkit-transform: translateY($translateY) rotate($rotate) scale($scale);
+  -ms-transform: translateY($translateY) rotate($rotate) scale($scale);
+  transform: translateY($translateY) rotate($rotate) scale($scale);
+}

data/app/models/govuk_publishing_components/shared_accessibility_criteria.rb

@@ -4,6 +4,23 @@ module GovukPublishingComponents
       "
 Links in the component must:
 
+- accept focus
+- be focusable with a keyboard
+- be usable with a keyboard
+- indicate when they have focus
+- change in appearance when touched (in the touch-down state)
+- change in appearance when hovered
+- be usable with touch
+- be usable with [voice commands](https://www.w3.org/WAI/perspectives/voice.html)
+- have visible text
+- have meaningful text
+      "
+    end
+
+    def self.button
+      "
+Buttons in the component must:
+
 - accept focus
 - be focusable with a keyboard
 - be usable with a keyboard