govuk_publishing_components 23.15.0 → 24.3.0

data/app/assets/javascripts/govuk_publishing_components/components/step-by-step-nav.js

@@ -40,13 +40,13 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
       this.$module.sessionStoreLink = this.$module.sessionStoreLink + '_' + this.$module.uniqueId
     }
 
-    this.$module.upChevronSvg = '<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg" class="gem-c-step-nav__chevron">' +
-      '<path d="M19.5 10C19.5 15.2467 15.2467 19.5 10 19.5C4.75329 19.5 0.499997 15.2467 0.499998 10C0.499999 4.7533 4.7533 0.500001 10 0.500002C15.2467 0.500003 19.5 4.7533 19.5 10Z" stroke="#1D70B8"/>' +
-      '<path d="M6.32617 12.3262L10 8.65234L13.6738 12.3262" stroke="#1D70B8" stroke-width="2"/>' +
+    this.$module.upChevronSvg = '<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">' +
+      '<path class="gem-c-step-nav__chevron-stroke" d="M19.5 10C19.5 15.2467 15.2467 19.5 10 19.5C4.75329 19.5 0.499997 15.2467 0.499998 10C0.499999 4.7533 4.7533 0.500001 10 0.500002C15.2467 0.500003 19.5 4.7533 19.5 10Z" stroke="#1D70B8"/>' +
+      '<path class="gem-c-step-nav__chevron-stroke" d="M6.32617 12.3262L10 8.65234L13.6738 12.3262" stroke="#1D70B8" stroke-width="2"/>' +
       '</svg>'
-    this.$module.downChevronSvg = '<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg" class="gem-c-step-nav__chevron">' +
-      '<path d="M0.499997 10C0.499998 4.75329 4.75329 0.499999 10 0.499999C15.2467 0.5 19.5 4.75329 19.5 10C19.5 15.2467 15.2467 19.5 10 19.5C4.75329 19.5 0.499997 15.2467 0.499997 10Z" stroke="#1D70B8"/>' +
-      '<path d="M13.6738 8.67383L10 12.3477L6.32617 8.67383" stroke="#1D70B8" stroke-width="2"/>' +
+    this.$module.downChevronSvg = '<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">' +
+      '<path class="gem-c-step-nav__chevron-stroke" d="M0.499997 10C0.499998 4.75329 4.75329 0.499999 10 0.499999C15.2467 0.5 19.5 4.75329 19.5 10C19.5 15.2467 15.2467 19.5 10 19.5C4.75329 19.5 0.499997 15.2467 0.499997 10Z" stroke="#1D70B8"/>' +
+      '<path class="gem-c-step-nav__chevron-stroke" d="M13.6738 8.67383L10 12.3477L6.32617 8.67383" stroke="#1D70B8" stroke-width="2"/>' +
       '</svg>'
 
     var stepNavTracker = new this.StepNavTracker(this.$module.uniqueId, this.$module.totalSteps, this.$module.totalLinks)
@@ -76,8 +76,8 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
     var showall = document.createElement('div')
     showall.className = 'gem-c-step-nav__controls'
     showall.innerHTML = '<button aria-expanded="false" class="gem-c-step-nav__button gem-c-step-nav__button--controls js-step-controls-button">' +
-      this.$module.downChevronSvg +
-      this.$module.actions.showAllText +
+      '<span class="gem-c-step-nav__button-text gem-c-step-nav__button-text--all js-step-controls-button-text">' + this.$module.actions.showAllText + '</span>' +
+      '<span class="gem-c-step-nav__chevron js-step-controls-button-icon">' + this.$module.downChevronSvg + '</span>' +
       '</button>'
 
     var steps = this.$module.querySelectorAll('.gem-c-step-nav__steps')[0]
@@ -93,13 +93,20 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
       if (!thisel.querySelectorAll('.js-toggle-link').length) {
         var span = document.createElement('span')
         var showHideSpan = document.createElement('span')
+        var showHideSpanText = document.createElement('span')
+        var showHideSpanIcon = document.createElement('span')
         var commaSpan = document.createElement('span')
         var thisSectionSpan = document.createElement('span')
 
         showHideSpan.className = 'gem-c-step-nav__toggle-link js-toggle-link'
+        showHideSpanText.className = 'gem-c-step-nav__button-text js-toggle-link-text'
+        showHideSpanIcon.className = 'gem-c-step-nav__chevron js-toggle-link-icon'
         commaSpan.className = 'govuk-visually-hidden'
         thisSectionSpan.className = 'govuk-visually-hidden'
 
+        showHideSpan.appendChild(showHideSpanText)
+        showHideSpan.appendChild(showHideSpanIcon)
+
         commaSpan.innerHTML = ', '
         thisSectionSpan.innerHTML = ' this section'
 
@@ -351,12 +358,12 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
 
   Gemstepnav.prototype.setShowHideAllText = function () {
     var shownSteps = this.$module.querySelectorAll('.step-is-shown').length
+
     // Find out if the number of is-opens == total number of steps
-    if (shownSteps === this.$module.totalSteps) {
-      this.$module.showOrHideAllButton.innerHTML = this.$module.upChevronSvg + this.$module.actions.hideAllText
-    } else {
-      this.$module.showOrHideAllButton.innerHTML = this.$module.downChevronSvg + this.$module.actions.showAllText
-    }
+    var shownStepsIsTotalSteps = shownSteps === this.$module.totalSteps
+
+    this.$module.showOrHideAllButton.querySelector('.js-step-controls-button-text').innerHTML = shownStepsIsTotalSteps ? this.$module.actions.hideAllText : this.$module.actions.showAllText
+    this.$module.showOrHideAllButton.querySelector('.js-step-controls-button-icon').innerHTML = shownStepsIsTotalSteps ? this.$module.upChevronSvg : this.$module.downChevronSvg
   }
 
   Gemstepnav.prototype.StepView = function (stepElement, $module) {
@@ -394,7 +401,9 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
 
       this.titleButton.setAttribute('aria-expanded', isShown)
       var showHideText = this.stepElement.querySelectorAll('.js-toggle-link')[0]
-      showHideText.innerHTML = isShown ? this.upChevronSvg + this.hideText : this.downChevronSvg + this.showText
+
+      showHideText.querySelector('.js-toggle-link-text').innerHTML = isShown ? this.hideText : this.showText
+      showHideText.querySelector('.js-toggle-link-icon').innerHTML = isShown ? this.upChevronSvg : this.downChevronSvg
     }
 
     this.isShown = function () {

data/app/assets/javascripts/govuk_publishing_components/vendor/polyfills/common.js

@@ -0,0 +1,8 @@
+function nodeListForEach (nodes, callback) {
+  if (window.NodeList.prototype.forEach) {
+    return nodes.forEach(callback)
+  }
+  for (var i = 0; i < nodes.length; i++) {
+    callback.call(window, nodes[i], i, nodes);
+  }
+}

data/app/assets/stylesheets/component_guide/application.scss

@@ -262,14 +262,6 @@ html {
   }
 }
 
-// Hide survey banner
-// stylelint-disable selector-max-id
-#user-satisfaction-survey-container,
-#global-cookie-message {
-  display: none;
-}
-// stylelint-enable selector-max-id
-
 // Rouge syntax highlighting
 // Based on https://github.com/alphagov/tech-docs-template/blob/master/template/source/stylesheets/palette/_syntax-highlighting.scss
 

data/app/assets/stylesheets/govuk_publishing_components/_all_components.scss

@@ -17,7 +17,6 @@
 @import "components/button";
 @import "components/character-count";
 @import "components/checkboxes";
-@import "components/chevron-banner";
 @import "components/contents-list";
 @import "components/contextual-guidance";
 @import "components/contextual-sidebar";

data/app/assets/stylesheets/govuk_publishing_components/component_support.scss

@@ -6,12 +6,10 @@
 @import "govuk/utilities/all";
 @import "govuk/overrides/all";
 
-@import "govuk_publishing_components/components/helpers/variables";
 @import "govuk_publishing_components/components/helpers/brand-colours";
 @import "govuk_publishing_components/components/helpers/link";
 @import "govuk_publishing_components/components/helpers/px-to-em";
 @import "govuk_publishing_components/components/mixins/govuk-template-link-focus-override";
 @import "govuk_publishing_components/components/mixins/media-down";
 @import "govuk_publishing_components/components/mixins/margins";
-@import "govuk_publishing_components/components/mixins/clearfix";
 @import "govuk_publishing_components/components/mixins/css3";

data/app/assets/stylesheets/govuk_publishing_components/components/_accordion.scss

@@ -1,25 +1,309 @@
-@import "govuk/components/accordion/accordion";
+$gem-c-accordion-border-width: 3px;
+$gem-c-accordion-bottom-border-width: 1px;
 
-.gem-c-accordion {
-  .govuk-accordion__section-heading {
-    // this is a temporary addition to fix the line height when it
-    // is being overridden by styles from govuk-template in collections
-    @include govuk-media-query($until: desktop) {
-      @include govuk-font(24, $weight: bold, $line-height: 1.6);
+// Buttons within the sections don’t need default styling
+.gem-c-accordion__section-button {
+  display: inline-block;
+  margin-bottom: 0;
+  padding-top: govuk-spacing(3);
+  font-weight: bold;
+  @include govuk-font($size: 24, $weight: bold);
+}
+
+.gem-c-accordion__section-header {
+  padding-top: govuk-spacing(2) 0;
+}
+
+.gem-c-accordion__section-heading {
+  margin: govuk-spacing(1) 0;
+}
+
+.js-enabled {
+  .gem-c-accordion {
+    border-bottom: $gem-c-accordion-bottom-border-width solid $govuk-border-colour;
+  }
+
+  .gem-c-accordion__controls {
+    text-align: left;
+  }
+
+  .gem-c-accordion__open-all {
+    position: relative;
+    z-index: 1;
+    border-width: 0;
+    color: $govuk-link-colour;
+    background: none;
+    -webkit-appearance: none;
+    cursor: pointer;
+    margin-bottom: govuk-spacing(4);
+    padding: 0 govuk-spacing(1) govuk-spacing(1) 0;
+    @include govuk-font($size: 16);
+    @include govuk-link-common;
+    @include govuk-link-style-default;
+    // Remove default button focus outline in Firefox
+    &::-moz-focus-inner {
+      padding: 0;
+      border: 0;
     }
   }
-}
 
-.govuk-accordion--condensed {
-  .govuk-accordion__section-button {
-    @include govuk-media-query($from: tablet) {
-      @include govuk-font($size: 19, $weight: bold);
+  .gem-c-accordion__open-all:hover,
+  .gem-c-accordion__open-all-text:hover {
+    text-decoration: underline;
+    color: $govuk-link-colour;
+  }
+
+  // Focus state, also to change chervon icon to black
+  .gem-c-accordion__open-all:focus {
+    .gem-c-accordion__open-all-text,
+    .gem-c-accordion-nav__chevron {
+      color: $govuk-focus-text-colour;
+      text-decoration: none;
     }
   }
 
-  .govuk-accordion__section-summary {
+  // Create Chervon icon align with text
+  .gem-c-accordion-nav__chevron {
+    vertical-align: text-top;
+    display: inline-block;
+    box-sizing: border-box;
+    position: relative;
+    width: em(20, 14);
+    height: em(20, 14);
+    margin-left: em(5, 14);
+    border: em(1, 14) solid;
+    border-radius: em(100, 14);
+    // Main icon size across views, yet keep responsive for zoom
     @include govuk-media-query($from: tablet) {
-      @include govuk-font($size: 16);
+      width: em(20, 16);
+      height: em(20, 16);
+      margin-left: em(5, 16);
+      border: em(1, 16) solid;
+    }
+
+    &:after {
+      content: "";
+      display: block;
+      box-sizing: border-box;
+      position: absolute;
+      overflow: visible;
+      width: em(6, 14);
+      height: em(6, 14);
+      border-top: em(2, 14) solid;
+      border-right: em(2, 14) solid;
+      transform: rotate(-45deg);
+      left: em(6, 14);
+      bottom: em(5, 14);
+      @include govuk-media-query($from: tablet) {
+        width: em(6, 16);
+        height: em(6, 16);
+        border-top: em(2, 16) solid;
+        border-right: em(2, 16) solid;
+        left: em(6, 16);
+        bottom: em(5, 16);
+      }
+    }
+  }
+
+  // Rotate icon to create "Down" version
+  .gem-c-accordion-nav__chevron--down {
+    transform: rotate(180deg);
+  }
+
+  .gem-c-accordion__section-heading {
+    // Override browser defaults to ensure consistent element height
+    margin-top: 0; // Override browser default
+    margin-bottom: 0; // Override browser default
+    @include govuk-font(24);
+  }
+
+  // Section headers have a pointer cursor as an additional affordance
+  .gem-c-accordion__section-header {
+    position: relative;
+  }
+
+  // For devices that can't hover such as touch devices,
+  // remove hover state as it can be stuck in that state (iOS).
+  @media (hover: none) {
+    .gem-c-accordion__section-header:hover {
+      border-top-color: $govuk-link-colour;
+      box-shadow: inset 0 $gem-c-accordion-border-width 0 0 $govuk-link-colour;
+
+      .gem-c-accordion__section-button {
+        border-top-color: $govuk-link-colour;
+      }
+    }
+  }
+
+  // Buttons within the headers don’t need default styling
+  .gem-c-accordion__section-button {
+    padding: govuk-spacing(2) 0 govuk-spacing(5);
+    position: relative;
+    margin: 0;
+    border-width: $gem-c-accordion-bottom-border-width 0 0 0;
+    border-top: $gem-c-accordion-bottom-border-width solid $govuk-border-colour;
+    color: $govuk-text-colour;
+    background: none;
+    text-align: left;
+    cursor: pointer;
+    -webkit-appearance: none;
+    @include govuk-typography-common;
+    width: 100%;
+
+    &:active {
+      z-index: 1;
+      color: $govuk-link-active-colour;
+      background: none;
+    }
+
+    // Remove default button focus outline in Firefox
+    &::-moz-focus-inner {
+      padding: 0;
+      border: 0;
+    }
+  }
+
+  .gem-c-accordion__section-button:hover {
+    color: $govuk-link-colour;
+    // On hover, add underline to toggle link
+    .gem-c-accordion__toggle-text {
+      text-decoration: underline;
+      color: $govuk-link-colour;
+    }
+  }
+
+  .gem-c-accordion__section-button:focus {
+    @include govuk-focused-text;
+    // Overwrite focus border to top
+    box-shadow: 0 0, 0 -4px;
+    border-top: 1px solid transparent;
+
+    // Focus state to change the toggle link within individual sections
+    .gem-c-accordion__toggle-text {
+      color: $govuk-focus-text-colour;
+      text-decoration: none;
+    }
+    // Focus state to change chervon icon colour within individual sections
+    .gem-c-accordion-nav__chevron {
+      color: $govuk-text-colour;
+    }
+  }
+
+  // Extend the touch area of the button to span the section header
+  .gem-c-accordion__section-button:after {
+    content: "";
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+  }
+
+  .gem-c-accordion__section-button:hover:not(:focus) {
+    text-decoration: none;
+  }
+
+  // For devices that can't hover such as touch devices,
+  // remove hover state as it can be stuck in that state (iOS).
+  @media (hover: none) {
+    .gem-c-accordion__section-button:hover {
+      text-decoration: none;
+    }
+  }
+
+  // Add toggle link with Chevron icon on right.
+  .gem-c-accordion__toggle-link {
+    display: block;
+    color: $govuk-link-colour;
+    text-transform: capitalize;
+    margin-top: govuk-spacing(1);
+    margin-bottom: govuk-spacing(1);
+    @include govuk-font($size: 16, $line-height: 1);
+
+    &:active {
+      background: $govuk-link-active-colour;
+    }
+  }
+
+  // Setting width of the text, so the icon doesn't shift (left / right) when toggled
+  .gem-c-accordion__toggle-text {
+    min-width: em(40, 16);
+    display: inline-block;
+  }
+
+  .gem-c-accordion__open-all-text {
+    min-width: em(120, 16);
+    display: inline-block;
+    text-align: left;
+  }
+
+  // Change the summary subheading size.
+  .gem-c-accordion__section-summary {
+    @include govuk-responsive-margin(1, "top");
+    @include govuk-responsive-margin(2, "bottom");
+    @include govuk-typography-common;
+    @include govuk-typography-responsive($size: 19);
+  }
+
+  // Hide body of expanded sections
+  .gem-c-accordion__section-content {
+    display: none;
+    @include govuk-responsive-padding(0, "top");
+    @include govuk-responsive-padding(8, "bottom");
+  }
+
+  // Show the body of expanded sections
+  .gem-c-accordion__section--expanded .gem-c-accordion__section-content {
+    display: block;
+  }
+
+  // Remove the bottom margin from the last item inside the content
+  .gem-c-accordion__section-content > :last-child {
+    margin-bottom: 0;
+  }
+
+  // Condensed layout
+  .gem-c-accordion--condensed {
+    .gem-c-accordion__open-all {
+      margin-bottom: govuk-spacing(5);
+      @include govuk-font($size: 14, $line-height: 1);
+    }
+
+    .gem-c-accordion__section-button {
+      @include govuk-typography-responsive($size: 19, $important: true);
+      padding-top: govuk-spacing(1);
+      padding-bottom: govuk-spacing(5);
+    }
+
+    // Reduce Chevron size
+    .gem-c-accordion-nav__chevron {
+      width: em(20, 14);
+      height: em(20, 14);
+      margin-left: em(5, 14);
+      border: em(1, 14) solid;
+      border-radius: em(100, 14);
+      transform: scale(.875);
+
+      &:after {
+        width: em(6, 14);
+        height: em(6, 14);
+        border-top: em(2, 14) solid;
+        border-right: em(2, 14) solid;
+        left: em(6, 14);
+        bottom: em(5, 14);
+      }
+    }
+
+    .gem-c-accordion-nav__chevron--down {
+      transform: scale(.875) rotate(180deg);
+    }
+
+    .gem-c-accordion__section-summary {
+      @include govuk-typography-responsive($size: 16, $important: true);
+    }
+
+    .gem-c-accordion__toggle-link {
+      @include govuk-font($size: 14, $line-height: 1);
     }
   }
 }