dxw_govuk_frontend_rails 2.13.0 → 3.0.0

data/vendor/assets/stylesheets/components/input/_input.scss

@@ -9,7 +9,6 @@
 @include govuk-exports("govuk/component/input") {
   .govuk-input {
     @include govuk-font($size: 19);
-    @include govuk-focusable;
 
     box-sizing: border-box;
     width: 100%;
@@ -26,6 +25,23 @@
     -webkit-appearance: none;
        -moz-appearance: none;
             appearance: none;
+
+    &:focus {
+      outline: $govuk-focus-width solid $govuk-focus-colour;
+      // Ensure outline appears outside of the element
+      outline-offset: 0;
+      // Double the border by adding its width again. Use `box-shadow` for this // instead of changing `border-width` - this is for consistency with
+      // components such as textarea where we avoid changing `border-width` as
+      // it will change the element size. Also, `outline` cannot be utilised
+      // here as it is already used for the yellow focus state.
+      box-shadow: inset 0 0 0 $govuk-border-width-form-element;
+
+      @include govuk-if-ie8 {
+        // IE8 doesn't support `box-shadow` so double the border with
+        // `border-width`.
+        border-width: $govuk-border-width-form-element * 2;
+      }
+    }
   }
 
   .govuk-input::-webkit-outer-spin-button,
@@ -40,6 +56,13 @@
 
   .govuk-input--error {
     border: $govuk-border-width-form-element-error solid $govuk-error-colour;
+
+    &:focus {
+      border-color: $govuk-input-border-colour;
+      // Remove `box-shadow` inherited from `:focus` as `input--error`
+      // already has the thicker border.
+      box-shadow: none;
+    }
   }
 
   // The ex measurements are based on the number of W's that can fit inside the input

data/vendor/assets/stylesheets/components/panel/_panel.scss

@@ -23,7 +23,7 @@
 
   .govuk-panel--confirmation {
     color: govuk-colour("white");
-    background: govuk-colour("turquoise");
+    background: govuk-colour("green", $legacy: "turquoise");
   }
 
   .govuk-panel__title {

data/vendor/assets/stylesheets/components/radios/_radios.scss

@@ -124,11 +124,7 @@
 
   // Focused state
   .govuk-radios__input:focus + .govuk-radios__label::before {
-    // Since box-shadows are removed when users customise their colours we set a
-    // transparent outline that is shown instead.
-    // https://accessibility.blog.gov.uk/2017/03/27/how-users-change-colours-on-websites/
-    outline: $govuk-focus-width solid transparent;
-    outline-offset: $govuk-focus-width;
+    border-width: 4px;
     box-shadow: 0 0 0 $govuk-radios-focus-width $govuk-focus-colour;
   }
 
@@ -188,7 +184,9 @@
   // Conditional reveals
   // =========================================================
 
-  $conditional-border-width: $govuk-border-width-mobile;
+  // The narrow border is used in the conditional reveals because the border has
+  // to be an even number in order to be centred under the 40px checkbox or radio.
+  $conditional-border-width: $govuk-border-width-narrow;
   // Calculate the amount of padding needed to keep the border centered against the radios.
   $conditional-border-padding: ($govuk-radios-size / 2) - ($conditional-border-width / 2);
   // Move the border centered with the radios
@@ -276,9 +274,9 @@
     //
     // Reduce the size of the 'button' and center it within the ring
     .govuk-radios__label::after {
-      top: 14px;
-      left: 6px;
-      border-width: 6px;
+      top: 15px;
+      left: 7px;
+      border-width: 5px;
     }
 
     // Fix position of hint with small radios

data/vendor/assets/stylesheets/components/select/_select.scss

@@ -9,13 +9,28 @@
 @include govuk-exports("govuk/component/select") {
   .govuk-select {
     @include govuk-font($size: 19, $line-height: 1.25);
-    @include govuk-focusable;
 
     box-sizing: border-box; // should this be global?
     max-width: 100%;
     height: 40px;
     padding: govuk-spacing(1); // was 5px 4px 4px - size of it should be adjusted to match other form elements
     border: $govuk-border-width-form-element solid $govuk-input-border-colour;
+
+    &:focus {
+      outline: $govuk-focus-width solid $govuk-focus-colour;
+      // Ensure outline appears outside of the element
+      outline-offset: 0;
+      // Double the border by adding its width again. Use `box-shadow` to do
+      // this instead of changing `border-width` (which changes element size) and
+      // since `outline` is already used for the yellow focus state.
+      box-shadow: inset 0 0 0 $govuk-border-width-form-element;
+
+      @include govuk-if-ie8 {
+        // IE8 doesn't support `box-shadow` so double the border with
+        // `border-width`.
+        border-width: $govuk-border-width-form-element * 2;
+      }
+    }
   }
 
   .govuk-select option:active,
@@ -27,6 +42,13 @@
 
   .govuk-select--error {
     border: $govuk-border-width-form-element-error solid $govuk-error-colour;
+
+    &:focus {
+      border-color: $govuk-input-border-colour;
+      // Remove `box-shadow` inherited from `:focus` as `select--error`
+      // already has the thicker border.
+      box-shadow: none;
+    }
   }
 
 }

data/vendor/assets/stylesheets/components/skip-link/_skip-link.scss

@@ -5,7 +5,7 @@
 @include govuk-exports("govuk/component/skip-link") {
   .govuk-skip-link {
     @include govuk-visually-hidden-focusable;
-    @include govuk-link-common;
+    @include govuk-typography-common;
     @include govuk-link-style-text;
     @include govuk-typography-responsive($size: 16);
 
@@ -22,5 +22,10 @@
       padding-right: unquote("max(#{govuk-spacing(3)}, #{$padding-safe-area-right})");
       padding-left: unquote("max(#{govuk-spacing(3)}, #{$padding-safe-area-left})");
     }
+
+    &:focus {
+      outline: $govuk-focus-width solid $govuk-focus-colour;
+      background-color: $govuk-focus-colour;
+    }
   }
 }

data/vendor/assets/stylesheets/components/table/_table.scss

@@ -22,6 +22,7 @@
     padding: govuk-spacing(2) govuk-spacing(4) govuk-spacing(2) 0;
     border-bottom: 1px solid $govuk-border-colour;
     text-align: left;
+    vertical-align: top;
     // GOV.UK Elements sets the font-size and line-height for all headers and cells
     // in tables.
     @include govuk-compatibility(govuk_elements) {

data/vendor/assets/stylesheets/components/tabs/_tabs.scss

@@ -5,30 +5,29 @@
 @include govuk-exports("govuk/component/tabs") {
 
   .govuk-tabs {
-    @include govuk-font($size: 19);
-    @include govuk-text-colour;
     @include govuk-responsive-margin(1, "top");
     @include govuk-responsive-margin(6, "bottom");
   }
 
   .govuk-tabs__title {
     @include govuk-font($size: 19);
-    margin-bottom: govuk-spacing(1);
+    @include govuk-text-colour;
+    margin-bottom: govuk-spacing(2);
   }
 
   .govuk-tabs__list {
     margin: 0;
     padding: 0;
     list-style: none;
-    @include mq($until: tablet) {
-      @include govuk-responsive-margin(6, "bottom");
-    }
+    @include govuk-responsive-margin(6, "bottom");
   }
 
   .govuk-tabs__list-item {
+    @include govuk-font($size: 19);
     margin-left: govuk-spacing(5);
 
     &::before {
+      @include govuk-text-colour;
       content: "\2014 "; // "— "
       margin-left: - govuk-spacing(5);
       padding-right: govuk-spacing(1);
@@ -36,17 +35,15 @@
   }
 
   .govuk-tabs__tab {
-    @include govuk-link-common;
     @include govuk-link-style-default;
-    @include govuk-font($size: 19);
 
     display: inline-block;
-    padding-top: govuk-spacing(2);
-    padding-bottom: govuk-spacing(2);
+    margin-bottom: govuk-spacing(2);
 
-    &[aria-current = "true"] {
-      color: govuk-colour("black");
-      text-decoration: none;
+    // Focus state for mobile and when JavaScript is disabled
+    // It is removed for JS-enabled desktop styles
+    &:focus {
+      @include govuk-focused-text;
     }
   }
 
@@ -57,73 +54,88 @@
   // JavaScript enabled
   .js-enabled {
 
-    @include mq($from: tablet) {
+    @include govuk-media-query($from: tablet) {
 
       .govuk-tabs__list {
         @include govuk-clearfix;
+        margin-bottom: 0;
         border-bottom: 1px solid $govuk-border-colour;
       }
 
+      .govuk-tabs__title {
+        display: none;
+      }
+
       .govuk-tabs__list-item {
+        position: relative;
+
+        margin-right: govuk-spacing(1);
+        margin-bottom: 0;
         margin-left: 0;
+        padding: govuk-spacing(2) govuk-spacing(4);
+
+        float: left;
+        background-color: govuk-colour("light-grey", $legacy: "grey-4");
+        text-align: center;
 
         &::before {
           content: none;
         }
       }
 
-      .govuk-tabs__title {
-        display: none;
+      .govuk-tabs__list-item--selected {
+        $border-width: 1px;
+
+        position: relative;
+
+        margin-top: - govuk-spacing(1);
+
+        // Compensation for border (otherwise we get a shift)
+        margin-bottom: -$border-width;
+        padding-top: govuk-spacing(3) - $border-width;
+        padding-right: govuk-spacing(4) - $border-width;
+        padding-bottom: govuk-spacing(3) + $border-width;
+        padding-left: govuk-spacing(4) - $border-width;
+
+        border: $border-width solid $govuk-border-colour;
+        border-bottom: 0;
+
+        background-color: $govuk-body-background-colour;
+
+        .govuk-tabs__tab {
+          text-decoration: none;
+        }
       }
 
       .govuk-tabs__tab {
-        margin-right: govuk-spacing(1);
-        padding-right: govuk-spacing(4);
-        padding-left: govuk-spacing(4);
-        float: left;
-        color: govuk-colour("black");
-        background-color: govuk-colour("grey-4");
-        text-align: center;
-        text-decoration: none;
-
-        &--selected {
-          margin-top: - govuk-spacing(1);
-          margin-bottom: -1px;
-
-          // 1px is compensation for border (otherwise we get a 1px shift)
-          padding-top: govuk-spacing(3) - 1px;
-          padding-right: govuk-spacing(4) - 1px;
-          padding-bottom: govuk-spacing(3) + 1px;
-          padding-left: govuk-spacing(4) - 1px;
-
-          border: 1px solid $govuk-border-colour;
-          border-bottom: 0;
-          color: govuk-colour("black");
-          background-color: govuk-colour("white");
-
-          &:focus {
-            background-color: transparent;
-          }
+        @include govuk-link-style-text;
+
+        margin-bottom: 0;
+
+        &::after {
+          content: "";
+          position: absolute;
+          top: 0;
+          right: 0;
+          bottom: 0;
+          left: 0;
         }
       }
 
       .govuk-tabs__panel {
         @include govuk-responsive-margin(0, "bottom");
-        padding-top: govuk-spacing(6);
-        padding-right: govuk-spacing(4);
-        padding-bottom: govuk-spacing(6);
-        padding-left: govuk-spacing(4);
+        padding: govuk-spacing(6) govuk-spacing(4);
         border: 1px solid $govuk-border-colour;
         border-top: 0;
 
-        &--hidden {
-          display: none;
-        }
-
         & > :last-child {
           margin-bottom: 0;
         }
       }
+
+      .govuk-tabs__panel--hidden {
+        display: none;
+      }
     }
 
   }

data/vendor/assets/stylesheets/components/tag/_tag.scss

@@ -4,14 +4,8 @@
 
 @include govuk-exports("govuk/component/tag") {
   .govuk-tag {
-    @include govuk-font($size: 16, $weight: bold, $line-height: 1.25);
 
     display: inline-block;
-    padding: 4px 8px;
-    // Since New Transport sits slightly higher than other common fonts.
-    // We use intentionally uneven padding to make it balanced, this can be
-    // removed using the version of the font that has a more common vertical spacing.
-    padding-bottom: 1px;
 
     // When a user customises their colours often the background is removed,
     // by adding a outline we ensure that the tag component still keeps it's meaning.
@@ -25,9 +19,26 @@
 
     text-decoration: none;
     text-transform: uppercase;
+
+    @if $govuk-use-legacy-font {
+      // Since New Transport sits slightly higher than other common fonts.
+      // We use intentionally uneven padding to make it balanced, this can be
+      // removed using the version of the font that has a more common vertical spacing.
+      @include govuk-font($size: 16, $weight: bold, $line-height: 1.25);
+      padding-top: 4px;
+      padding-right: 8px;
+      padding-bottom: 1px;
+      padding-left: 8px;
+    } @else {
+      @include govuk-font($size: 16, $weight: bold, $line-height: 1);
+      padding-top: 5px;
+      padding-right: 8px;
+      padding-bottom: 4px;
+      padding-left: 8px;
+    }
   }
 
   .govuk-tag--inactive {
-    background-color: govuk-colour("grey-1");
+    background-color: govuk-colour("dark-grey", $legacy: "grey-1");
   }
 }

data/vendor/assets/stylesheets/components/textarea/_textarea.scss

@@ -9,7 +9,6 @@
 @include govuk-exports("govuk/component/textarea") {
   .govuk-textarea {
     @include govuk-font($size: 19, $line-height: 1.25);
-    @include govuk-focusable;
 
     box-sizing: border-box; // should this be global?
     display: block;
@@ -24,9 +23,33 @@
     border-radius: 0;
 
     -webkit-appearance: none;
+
+    &:focus {
+      outline: $govuk-focus-width solid $govuk-focus-colour;
+      // Ensure outline appears outside of the element
+      outline-offset: 0;
+      // Double the border by adding its width again. Use `box-shadow` to do
+      // this instead of changing `border-width` (which changes element size) and
+      // since `outline` is already used for the yellow focus state.
+      box-shadow: inset 0 0 0 $govuk-border-width-form-element;
+
+      @include govuk-if-ie8 {
+        // IE8 doesn't support `box-shadow` so double the border with
+        // `border-width`.
+        border-width: $govuk-border-width-form-element * 2;
+      }
+    }
   }
 
   .govuk-textarea--error {
     border: $govuk-border-width-form-element-error solid $govuk-error-colour;
+
+    &:focus {
+      border-color: $govuk-input-border-colour;
+      // Remove `box-shadow` inherited from `:focus` as `textarea--error`
+      // already has the thicker border.
+      box-shadow: none;
+    }
+
   }
 }

data/vendor/assets/stylesheets/helpers/_all.scss

@@ -1,7 +1,7 @@
 @import "clearfix";
 @import "colour";
 @import "device-pixels";
-@import "focusable";
+@import "focused";
 @import "font-faces";
 @import "grid";
 @import "links";

data/vendor/assets/stylesheets/helpers/_colour.scss

@@ -1,3 +1,4 @@
+@import "../settings/compatibility";
 @import "../settings/colours-palette";
 @import "../settings/colours-organisations";
 
@@ -9,11 +10,32 @@
 ///
 /// @param {String} $colour - Name of colour from the colour palette
 ///   (`$govuk-colours`)
+/// @param {String} $legacy - Either the name of colour from the legacy palette
+///   or a colour literal, to return instead when in 'legacy mode' - matching
+///   the palette from GOV.UK Template, Elements or Frontend Toolkit
 /// @return {Colour} Representation of named colour
+///
+/// @example scss - Using legacy colours from the palette
+///  .foo {
+///    background-colour: govuk-colour("mid-grey", $legacy: "grey-2");
+///  }
+///
+/// @example scss - Using legacy colour literals
+///  .foo {
+///    background-colour: govuk-colour("green", $legacy: #BADA55);
+///  }
+///
 /// @throw if `$colour` is not a colour from the colour palette
 /// @access public
 
-@function govuk-colour($colour) {
+@function govuk-colour($colour, $legacy: false) {
+  @if ($govuk-use-legacy-palette and $legacy) {
+    @if (type-of($legacy) == "color") {
+      @return $legacy;
+    }
+    $colour: $legacy;
+  }
+
   $colour: quote($colour);
 
   @if not map-has-key($govuk-colours, $colour) {

data/vendor/assets/stylesheets/helpers/_focused.scss

@@ -0,0 +1,28 @@
+////
+/// @group helpers
+////
+
+/// Focused text
+///
+/// Provides an outline to clearly indicate when the target element is focused.
+/// Used for interactive text-based elements.
+///
+/// @access public
+
+@mixin govuk-focused-text {
+  // When colours are overridden, for example when users have a dark mode,
+  // backgrounds and box-shadows disappear, so we need to ensure there's a
+  // transparent outline which will be set to a visible colour.
+
+  // Since Internet Explorer 8 does not support box-shadow, we want to force the
+  // user-agent outlines
+  @include govuk-not-ie8 {
+    outline: $govuk-focus-width solid transparent;
+  }
+  color: $govuk-focus-text-colour;
+  background-color: $govuk-focus-colour;
+  box-shadow: 0 -2px $govuk-focus-colour, 0 4px $govuk-focus-text-colour;
+  // When link is focussed, hide the default underline since the
+  // box shadow adds the "underline"
+  text-decoration: none;
+}

data/vendor/assets/stylesheets/helpers/_font-faces.scss

@@ -7,57 +7,31 @@
 
 @import "../tools/exports";
 
-/// Font Face - NTA
+/// Font Face - GDS Transport
 ///
-/// Outputs the font-face declaration for NTA at the root of the CSS document
+/// Outputs the font-face declaration for GDS Transport at the root of the CSS document
 /// the first time it is called.
 ///
 /// @access private
 
-@mixin _govuk-font-face-nta {
-  @include govuk-exports("govuk/helpers/font-face") {
+@mixin _govuk-font-face-gds-transport {
+  @include govuk-exports("govuk/helpers/font-faces") {
     @at-root {
       /*! Copyright (c) 2011 by Margaret Calvert & Henrik Kubel. All rights reserved. The font has been customised for exclusive use on gov.uk. This cut is not commercially available. */
 
       @font-face {
-        font-family: "nta";
-        src: govuk-font-url("light-2c037cf7e1-v1.eot");
-        src: govuk-font-url("light-2c037cf7e1-v1.eot?#iefix") format("embedded-opentype"),
-             govuk-font-url("light-f38ad40456-v1.woff2") format("woff2"),
-             govuk-font-url("light-458f8ea81c-v1.woff") format("woff");
+        font-family: "GDS Transport";
+        src: govuk-font-url("light-94a07e06a1-v2.woff2") format("woff2"),
+             govuk-font-url("light-f591b13f7d-v2.woff") format("woff");
         font-weight: normal;
         font-style: normal;
         font-display: fallback;
       }
 
       @font-face {
-        font-family: "nta";
-        src: govuk-font-url("bold-fb2676462a-v1.eot");
-        src: govuk-font-url("bold-fb2676462a-v1.eot?#iefix") format("embedded-opentype"),
-             govuk-font-url("bold-a2452cb66f-v1.woff2") format("woff2"),
-             govuk-font-url("bold-f38c792ac2-v1.woff") format("woff");
-        font-weight: bold;
-        font-style: normal;
-        font-display: fallback;
-      }
-
-      @font-face {
-        font-family: "ntatabularnumbers";
-        src: govuk-font-url("light-tabular-498ea8ffe2-v1.eot");
-        src: govuk-font-url("light-tabular-498ea8ffe2-v1.eot?#iefix") format("embedded-opentype"),
-             govuk-font-url("light-tabular-851b10ccdd-v1.woff2") format("woff2"),
-             govuk-font-url("light-tabular-62cc6f0a28-v1.woff") format("woff");
-        font-weight: normal;
-        font-style: normal;
-        font-display: fallback;
-      }
-
-      @font-face {
-        font-family: "ntatabularnumbers";
-        src: govuk-font-url("bold-tabular-357fdfbcc3-v1.eot");
-        src: govuk-font-url("bold-tabular-357fdfbcc3-v1.eot?#iefix") format("embedded-opentype"),
-             govuk-font-url("bold-tabular-b89238d840-v1.woff2") format("woff2"),
-             govuk-font-url("bold-tabular-784c21afb8-v1.woff") format("woff");
+        font-family: "GDS Transport";
+        src: govuk-font-url("bold-b542beb274-v2.woff2") format("woff2"),
+             govuk-font-url("bold-affa96571d-v2.woff") format("woff");
         font-weight: bold;
         font-style: normal;
         font-display: fallback;