govuk_publishing_components 23.13.1 → 24.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8e84f4736eb11902079ff68c2a4a2acb1c328126a4024664414adb2aa8a67fd
-  data.tar.gz: 693fabe38ddd9b79740a918e42bd1321a2f61b6abaca88e0b06e4360dcbb27fe
+  metadata.gz: 664f19b71a4b1ec65f49a7a14fa21d4a2a64465b2f593a3c75e2de132474417a
+  data.tar.gz: 8e734701d0d66817548de5855938a6cdad1f9b2ce2fa96437075e9058331785a
 SHA512:
-  metadata.gz: 1b833ced5ea9b6a0ca211eb846b0018fd51920edf04babb7d38126ddb5d85df400600558f73e066e21634346045c7d9819983648ddf3664976ee4ba2a3cd4ae5
-  data.tar.gz: 07132c1756b1ca69c9b674f39c393120679a61b62ee20c6e8c3ade957b4189cee7e9801b76f5c083d8f554d9c5360369dd6681e7f8724020576d3b084811b6cf
+  metadata.gz: 9073c4b0254a544f3a0f6da89889550786a3f0e7cc5611b6c89768be9c8d66ff27b8364d54525e677013c439e73acb7dd618289f2d72787d56b6f833d89df910
+  data.tar.gz: 2ed858269eee93ae2212110fd2aa4b4cee21106e5028a36508d3242982a8e60be387b1f31e8b7694f1b66b401707049865f4fda1338639d3b9ce5e702db99b05

data/app/assets/images/govuk_publishing_components/take-action-amber.svg

@@ -0,0 +1,4 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="17.5" cy="17.5" r="17.5" fill="#FF5800"/>
+<path d="M28.5 10L13.6739 24L6.5 17.2258" stroke="white" stroke-width="3"/>
+</svg>

data/app/assets/images/govuk_publishing_components/take-action-green.svg

@@ -0,0 +1,4 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="17.5" cy="17.5" r="17.5" fill="#0EBA72"/>
+<path d="M28.5 10L13.6739 24L6.5 17.2258" stroke="white" stroke-width="3"/>
+</svg>

data/app/assets/images/govuk_publishing_components/take-action-red.svg

@@ -0,0 +1,4 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="17.5" cy="17.5" r="17.5" fill="#FF003B"/>
+<path d="M28.5 10.5L13.6739 24.5L6.5 17.7258" stroke="white" stroke-width="3"/>
+</svg>

data/app/assets/javascripts/govuk_publishing_components/components/accordion.js

@@ -1,5 +1,287 @@
-// This component relies on JavaScript from GOV.UK Frontend
-// = require govuk/components/accordion/accordion.js
+/* global nodeListForEach */
+//  = require ../vendor/polyfills/closest.js
+//  = require ../vendor/polyfills/indexOf.js
+//  = require ../vendor/polyfills/common.js
+
 window.GOVUK = window.GOVUK || {}
-window.GOVUK.Modules = window.GOVUK.Modules || {}
-window.GOVUK.Modules.Accordion = window.GOVUKFrontend
+window.GOVUK.Modules = window.GOVUK.Modules || {};
+
+(function (Modules) {
+  function GemAccordion () { }
+
+  GemAccordion.prototype.start = function ($module) {
+    this.$module = $module[0]
+    this.moduleId = this.$module.getAttribute('id')
+    this.sections = this.$module.querySelectorAll('.gem-c-accordion__section')
+    this.openAllButton = ''
+    this.browserSupportsSessionStorage = helper.checkForSessionStorage()
+    this.controlsClass = 'gem-c-accordion__controls'
+    this.openAllClass = 'gem-c-accordion__open-all'
+    this.openAllTextClass = 'gem-c-accordion__open-all-text'
+    this.sectionHeaderClass = 'gem-c-accordion__section-header'
+    this.sectionHeadingClass = 'gem-c-accordion__section-heading'
+    this.sectionSummaryClass = 'gem-c-accordion__section-summary'
+    this.sectionButtonClass = 'gem-c-accordion__section-button'
+    this.sectionExpandedClass = 'gem-c-accordion__section--expanded'
+    this.sectionInnerContent = 'gem-c-accordion__section-content'
+    this.toggleLinkClass = 'js-toggle-link'
+    this.sectionShowHideIconClass = 'gem-c-accordion__toggle-link'
+    this.sectionShowHideTextClass = 'gem-c-accordion__toggle-text'
+    this.upChevonIconClass = 'gem-c-accordion-nav__chevron'
+    this.downChevonIconClass = 'gem-c-accordion-nav__chevron--down'
+
+    // Indicate that js has worked
+    this.$module.classList.add('gem-c-accordion--active')
+
+    this.initControls()
+    this.initSectionHeaders()
+
+    // See if "Show all sections" button text should be updated
+    var areAllSectionsOpen = this.checkIfAllSectionsOpen()
+    this.updateOpenAllButton(areAllSectionsOpen)
+  }
+
+  // Initialise controls and set attributes
+  GemAccordion.prototype.initControls = function () {
+    // Create "Show all" button and set attributes
+    this.openAllButton = document.createElement('button')
+    this.openAllButton.setAttribute('class', this.openAllClass)
+    this.openAllButton.setAttribute('aria-expanded', 'false')
+
+    // Create icon, add to element
+    var icon = document.createElement('span')
+    icon.classList.add(this.upChevonIconClass)
+    this.openAllButton.appendChild(icon)
+
+    // Create control wrapper and add controls to it
+    var accordionControls = document.createElement('div')
+    accordionControls.setAttribute('class', this.controlsClass)
+    accordionControls.appendChild(this.openAllButton)
+    this.$module.insertBefore(accordionControls, this.$module.firstChild)
+
+    // Build addtional wrapper for open all toggle text, place icon after wrapped text.
+    var wrapperOpenAllText = document.createElement('span')
+    wrapperOpenAllText.classList.add(this.openAllTextClass)
+    this.openAllButton.insertBefore(wrapperOpenAllText, this.openAllButton.childNodes[0] || null)
+
+    // Handle events for the controls
+    this.openAllButton.addEventListener('click', this.onOpenOrCloseAllToggle.bind(this))
+  }
+
+  // Initialise section headers
+  GemAccordion.prototype.initSectionHeaders = function () {
+    // Loop through section headers
+    nodeListForEach(this.sections, function (section, i) {
+      // Set header attributes
+      var header = section.querySelector('.' + this.sectionHeaderClass)
+      this.initHeaderAttributes(header, i)
+      this.setExpanded(this.isExpanded(section), section)
+
+      // Handle events
+      header.addEventListener('click', this.onSectionToggle.bind(this, section))
+
+      // See if there is any state stored in sessionStorage and set the sections to
+      // open or closed.
+      this.setInitialState(section)
+    }.bind(this))
+  }
+
+  // Set individual header attributes
+  GemAccordion.prototype.initHeaderAttributes = function (headerWrapper, index) {
+    var span = headerWrapper.querySelector('.' + this.sectionButtonClass)
+    var heading = headerWrapper.querySelector('.' + this.sectionHeadingClass)
+    var summary = headerWrapper.querySelector('.' + this.sectionSummaryClass)
+
+    // Copy existing span element to an actual button element, for improved accessibility.
+    var button = document.createElement('button')
+    button.setAttribute('id', this.moduleId + '-heading-' + (index + 1))
+    button.setAttribute('aria-controls', this.moduleId + '-content-' + (index + 1))
+
+    // Create show / hide arrow icons with text.
+    var showIcons = document.createElement('span')
+    showIcons.classList.add(this.sectionShowHideIconClass, this.toggleLinkClass)
+
+    // Add pause after heading for assistive technology.
+    var srPause = document.createElement('span')
+    srPause.classList.add('govuk-visually-hidden')
+    srPause.innerHTML = ', '
+
+    // Build addtional copy for assistive technology
+    var srAddtionalCopy = document.createElement('span')
+    srAddtionalCopy.classList.add('govuk-visually-hidden')
+    srAddtionalCopy.innerHTML = ' this section'
+
+    // Build addtional wrapper for toggle text, place icon after wrapped text.
+    var wrapperShowHideIcon = document.createElement('span')
+    var icon = document.createElement('span')
+    icon.classList.add(this.upChevonIconClass)
+    showIcons.appendChild(icon)
+    wrapperShowHideIcon.classList.add(this.sectionShowHideTextClass)
+    showIcons.insertBefore(wrapperShowHideIcon, showIcons.childNodes[0] || null)
+
+    // Copy all attributes (https://developer.mozilla.org/en-US/docs/Web/API/Element/attributes) from span to button
+    for (var i = 0; i < span.attributes.length; i++) {
+      var attr = span.attributes.item(i)
+      button.setAttribute(attr.nodeName, attr.nodeValue)
+    }
+
+    // span could contain HTML elements (see https://www.w3.org/TR/2011/WD-html5-20110525/content-models.html#phrasing-content)
+    button.innerHTML = span.innerHTML
+    heading.removeChild(span)
+    heading.appendChild(button)
+    button.appendChild(srPause)
+
+    // If summary content exists add to DOM in correct order
+    if (typeof (summary) !== 'undefined' && summary !== null) {
+      button.setAttribute('aria-describedby', this.moduleId + '-summary-' + (index + 1))
+      button.appendChild(summary)
+    }
+
+    button.appendChild(showIcons)
+    button.appendChild(srAddtionalCopy)
+  }
+
+  // When section toggled, set and store state
+  GemAccordion.prototype.onSectionToggle = function (section) {
+    var expanded = this.isExpanded(section)
+    this.setExpanded(!expanded, section)
+
+    // Store the state in sessionStorage when a change is triggered
+    this.storeState(section)
+  }
+
+  // When Open/Close All toggled, set and store state
+  GemAccordion.prototype.onOpenOrCloseAllToggle = function () {
+    var module = this
+    var sections = this.sections
+    var nowExpanded = !this.checkIfAllSectionsOpen()
+
+    nodeListForEach(sections, function (section) {
+      module.setExpanded(nowExpanded, section)
+      // Store the state in sessionStorage when a change is triggered
+      module.storeState(section)
+    })
+
+    module.updateOpenAllButton(nowExpanded)
+  }
+
+  // Set section attributes when opened/closed
+  GemAccordion.prototype.setExpanded = function (expanded, section) {
+    var icon = section.querySelector('.' + this.upChevonIconClass)
+    var showHideText = section.querySelector('.' + this.sectionShowHideTextClass)
+    var button = section.querySelector('.' + this.sectionButtonClass)
+    var newButtonText = expanded ? 'Hide' : 'Show'
+
+    showHideText.innerHTML = newButtonText
+    button.setAttribute('aria-expanded', expanded)
+    button.classList.add(this.toggleLinkClass)
+
+    // Swap icon, change class
+    if (expanded) {
+      section.classList.add(this.sectionExpandedClass)
+      icon.classList.remove(this.downChevonIconClass)
+    } else {
+      section.classList.remove(this.sectionExpandedClass)
+      icon.classList.add(this.downChevonIconClass)
+    }
+
+    // See if "Show all sections" button text should be updated
+    var areAllSectionsOpen = this.checkIfAllSectionsOpen()
+    this.updateOpenAllButton(areAllSectionsOpen)
+  }
+
+  // Get state of section
+  GemAccordion.prototype.isExpanded = function (section) {
+    return section.classList.contains(this.sectionExpandedClass)
+  }
+
+  // Check if all sections are open
+  GemAccordion.prototype.checkIfAllSectionsOpen = function () {
+    // Get a count of all the Accordion sections
+    var sectionsCount = this.sections.length
+    // Get a count of all Accordion sections that are expanded
+    var expandedSectionCount = this.$module.querySelectorAll('.' + this.sectionExpandedClass).length
+    var areAllSectionsOpen = sectionsCount === expandedSectionCount
+
+    return areAllSectionsOpen
+  }
+
+  // Update "Show all sections" button
+  GemAccordion.prototype.updateOpenAllButton = function (expanded) {
+    var icon = this.openAllButton.querySelector('.' + this.upChevonIconClass)
+    var openAllCopy = this.openAllButton.querySelector('.' + this.openAllTextClass)
+    var newButtonText = expanded ? 'Hide all sections' : 'Show all sections'
+    this.openAllButton.setAttribute('aria-expanded', expanded)
+    openAllCopy.innerHTML = newButtonText
+
+    // Swap icon, toggle class
+    if (expanded) {
+      icon.classList.remove(this.downChevonIconClass)
+    } else {
+      icon.classList.add(this.downChevonIconClass)
+    }
+  }
+
+  var helper = {
+    checkForSessionStorage: function () {
+      var testString = 'this is the test string'
+      var result
+      try {
+        window.sessionStorage.setItem(testString, testString)
+        result = window.sessionStorage.getItem(testString) === testString.toString()
+        window.sessionStorage.removeItem(testString)
+        return result
+      } catch (exception) {
+        if ((typeof console === 'undefined' || typeof console.log === 'undefined')) {
+          console.log('Notice: sessionStorage not available.')
+        }
+      }
+    }
+  }
+
+  // Set the state of the accordions in sessionStorage
+  GemAccordion.prototype.storeState = function (section) {
+    if (this.browserSupportsSessionStorage) {
+      // We need a unique way of identifying each content in the GemAccordion. Since
+      // an `#id` should be unique and an `id` is required for `aria-` attributes
+      // `id` can be safely used.
+      var button = section.querySelector('.' + this.sectionButtonClass)
+
+      if (button) {
+        var contentId = button.getAttribute('aria-controls')
+        var contentState = button.getAttribute('aria-expanded')
+
+        if (typeof contentId === 'undefined' && (typeof console === 'undefined' || typeof console.log === 'undefined')) {
+          console.error(new Error('No aria controls present in accordion section heading.'))
+        }
+
+        if (typeof contentState === 'undefined' && (typeof console === 'undefined' || typeof console.log === 'undefined')) {
+          console.error(new Error('No aria expanded present in accordion section heading.'))
+        }
+
+        // Only set the state when both `contentId` and `contentState` are taken from the DOM.
+        if (contentId && contentState) {
+          window.sessionStorage.setItem(contentId, contentState)
+        }
+      }
+    }
+  }
+
+  // Read the state of the accordions from sessionStorage
+  GemAccordion.prototype.setInitialState = function (section) {
+    if (this.browserSupportsSessionStorage) {
+      var button = section.querySelector('.' + this.sectionButtonClass)
+
+      if (button) {
+        var contentId = button.getAttribute('aria-controls')
+        var contentState = contentId ? window.sessionStorage.getItem(contentId) : null
+
+        if (contentState !== null) {
+          this.setExpanded(contentState === 'true', section)
+        }
+      }
+    }
+  }
+
+  Modules.GemAccordion = GemAccordion
+})(window.GOVUK.Modules)

data/app/assets/javascripts/govuk_publishing_components/components/cookie-banner.js

@@ -85,10 +85,6 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
     this.$module.cookieBannerConfirmationMessage.style.display = 'block'
   }
 
-  CookieBanner.prototype.listenForCrossOriginMessages = function () {
-    window.addEventListener('message', this.receiveMessage.bind(this), false)
-  }
-
   CookieBanner.prototype.isInCookiesPage = function () {
     return window.location.pathname === '/help/cookies'
   }

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/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);
     }
   }
 }