dxw_govuk_frontend_rails 3.6.0 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de482bfdfa09a6ce5fa71d92b1e3aeba8067157a06e3da22bc86b34713b7c9b8
-  data.tar.gz: f3e866b3cb02ec7ef83d934beddb3ee3a84d17cf191228051301a5301d551f10
+  metadata.gz: 76252356e718d773b335f5c46af4aa74fb1c7d1a7145941c030183ce45043340
+  data.tar.gz: 1a2df5ee7e9080f9975aa76b749074405fed3a6f48062fc9996e0f82dbbf49c3
 SHA512:
-  metadata.gz: 9e1a93086b6f6ed875cb2d63452496cd20ba10c82d6b3f344ea3aa8bc82abf82ce07c5b76e473a864065066cf3cdd852425973c6105f47ec2991e71bc85f5e4e
-  data.tar.gz: b45b9b5aa0bcc6f675d07438cfb9092dec30f836fe95f2ac594b74034c0ec85ff277dcf0478fb2f133398ccf30a0fc47670769e75ed997737984bdcb899a43a9
+  metadata.gz: 435fc41bbd556daab6ab8286d78b7c9f7d22166e64b345653e221d01aa035cb478bc566d792d55cb99a335cfdb56b0391764b7566839185c86cffe13765cc86a
+  data.tar.gz: 8ae7e6ca9a70f1c4796f4950dee3b11e4e8dde78be034614a7c95f4fc3eacff6de59b3c31f2d9690cb9e710da920725654a31c319b98eaa2e7ae1c9d850a372f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dxw_govuk_frontend_rails (3.6.0)
+    dxw_govuk_frontend_rails (3.7.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/dxw_govuk_frontend_rails/version.rb

@@ -1,3 +1,3 @@
 module DxwGovukFrontendRails
-  VERSION = "3.6.0"
+  VERSION = "3.7.0"
 end

data/package-lock.json

@@ -5,9 +5,9 @@
   "requires": true,
   "dependencies": {
     "govuk-frontend": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-3.6.0.tgz",
-      "integrity": "sha512-wTxufdY8vFvKJ2EmmQKmarrQ7n30kzg+vvqgGib2dawl7c5Wst8dffkEJQpy9Zs99TE/yEEFgj0VUO4GRUO22A=="
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-3.7.0.tgz",
+      "integrity": "sha512-G3bqoKGGF8YQ18UJH9tTARrwB8i7iPwN1xc8RXwWyx91q0p/Xl10uNywZLkzGWcJDzEz1vwmBTTL3SLDU/KxNg=="
     }
   }
 }

data/package.json

@@ -21,6 +21,6 @@
   },
   "homepage": "https://github.com/mec/dxw_govuk_frontend_rails#readme",
   "dependencies": {
-    "govuk-frontend": "3.6.0"
+    "govuk-frontend": "3.7.0"
   }
 }

data/vendor/assets/javascripts/govuk_frontend_rails.js

@@ -891,7 +891,7 @@ Accordion.prototype.initHeaderAttributes = function ($headerWrapper, index) {
   icon.className = this.iconClass;
   icon.setAttribute('aria-hidden', 'true');
 
-  $heading.appendChild(icon);
+  $button.appendChild(icon);
 };
 
 // When section toggled, set and store state

data/vendor/assets/stylesheets/_base.scss

@@ -0,0 +1,3 @@
+@import "settings/all";
+@import "tools/all";
+@import "helpers/all";

data/vendor/assets/stylesheets/all.scss

@@ -1,6 +1,4 @@
-@import "settings/all";
-@import "tools/all";
-@import "helpers/all";
+@import "base";
 
 @import "core/all";
 @import "objects/all";

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

@@ -1,29 +1,31 @@
-@import "accordion/accordion";
-@import "back-link/back-link";
-@import "breadcrumbs/breadcrumbs";
-@import "button/button";
-@import "checkboxes/checkboxes";
-@import "character-count/character-count";
-@import "summary-list/summary-list";
-@import "date-input/date-input";
-@import "details/details";
-@import "error-message/error-message";
-@import "error-summary/error-summary";
-@import "fieldset/fieldset";
-@import "file-upload/file-upload";
-@import "footer/footer";
-@import "hint/hint";
-@import "header/header";
-@import "input/input";
-@import "inset-text/inset-text";
-@import "label/label";
-@import "panel/panel";
-@import "phase-banner/phase-banner";
-@import "tabs/tabs";
-@import "tag/tag";
-@import "radios/radios";
-@import "select/select";
-@import "skip-link/skip-link";
-@import "table/table";
-@import "textarea/textarea";
-@import "warning-text/warning-text";
+@import "../base";
+
+@import "accordion/index";
+@import "back-link/index";
+@import "breadcrumbs/index";
+@import "button/index";
+@import "checkboxes/index";
+@import "character-count/index";
+@import "summary-list/index";
+@import "date-input/index";
+@import "details/index";
+@import "error-message/index";
+@import "error-summary/index";
+@import "fieldset/index";
+@import "file-upload/index";
+@import "footer/index";
+@import "hint/index";
+@import "header/index";
+@import "input/index";
+@import "inset-text/index";
+@import "label/index";
+@import "panel/index";
+@import "phase-banner/index";
+@import "tabs/index";
+@import "tag/index";
+@import "radios/index";
+@import "select/index";
+@import "skip-link/index";
+@import "table/index";
+@import "textarea/index";
+@import "warning-text/index";

data/vendor/assets/stylesheets/components/accordion/_accordion.scss

@@ -1,208 +1,2 @@
-@import "../../settings/all";
-@import "../../tools/all";
-@import "../../helpers/all";
-
-
-@include govuk-exports("govuk/component/accordion") {
-
-  $govuk-accordion-link-colour: $govuk-link-colour;
-  $govuk-accordion-link-hover-colour: govuk-colour("light-blue");
-  $govuk-accordion-border-width: 3px;
-
-  .govuk-accordion {
-    @include govuk-responsive-margin(6, "bottom");
-  }
-
-  // Borders between accordion sections
-  .govuk-accordion__section {
-    padding-top: govuk-spacing(3);
-  }
-
-  .govuk-accordion__section-header {
-    padding-top: govuk-spacing(3);
-    padding-bottom: govuk-spacing(3);
-  }
-
-  .govuk-accordion__section-heading {
-    margin-top: 0; // Override browser default
-    margin-bottom: 0; // Override browser default
-  }
-
-  // Buttons within the sections don’t need default styling
-  .govuk-accordion__section-button {
-    @include govuk-font($size: 24, $weight: bold);
-    display: inline-block;
-    margin-bottom: 0;
-    padding-top: govuk-spacing(3);
-  }
-
-  .govuk-accordion__section-summary {
-    margin-top: govuk-spacing(2);
-    margin-bottom: 0;
-  }
-
-  // Remove the bottom margin from the last item inside the content
-  .govuk-accordion__section-content > :last-child {
-    margin-bottom: 0;
-  }
-
-  // JavaScript enabled
-  .js-enabled {
-
-    .govuk-accordion {
-      // Border at the bottom of the whole accordion
-      border-bottom: 1px solid $govuk-border-colour;
-    }
-
-    // Borders between accordion sections
-    .govuk-accordion__section {
-      padding-top: 0;
-    }
-
-    // Hide the body of collapsed sections
-    .govuk-accordion__section-content {
-      display: none;
-      @include govuk-responsive-padding(3, "top");
-      @include govuk-responsive-padding(3, "bottom");
-    }
-
-    // Show the body of expanded sections
-    .govuk-accordion__section--expanded .govuk-accordion__section-content {
-      display: block;
-    }
-
-    // This is styled to look like a link not a button
-    .govuk-accordion__open-all {
-      @include govuk-font($size: 16);
-      position: relative;
-      z-index: 1;
-      margin: 0;
-      padding: 0;
-      border-width: 0;
-      color: $govuk-link-colour;
-      background: none;
-      cursor: pointer;
-      -webkit-appearance: none;
-
-      @include govuk-link-common;
-      @include govuk-link-style-default;
-
-      // Remove default button focus outline in Firefox
-      &::-moz-focus-inner {
-        padding: 0;
-        border: 0;
-      }
-    }
-
-    // Section headers have a pointer cursor as an additional affordance
-    .govuk-accordion__section-header {
-      position: relative;
-      // Safe area on the right to avoid clashing with icon
-      padding-right: 40px;
-      border-top: 1px solid $govuk-border-colour;
-      color: $govuk-accordion-link-colour;
-      cursor: pointer;
-    }
-
-    // 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) {
-      .govuk-accordion__section-header:hover {
-        border-top-color: $govuk-accordion-link-colour;
-        box-shadow: inset 0 $govuk-accordion-border-width 0 0 $govuk-accordion-link-colour;
-      }
-    }
-
-    // Buttons within the headers don’t need default styling
-    .govuk-accordion__section-button {
-      @include govuk-typography-common;
-      margin-top: 0;
-      margin-bottom: 0;
-      margin-left: 0;
-      padding: 0;
-      border-width: 0;
-      color: inherit;
-      background: none;
-      text-align: left;
-      cursor: pointer;
-      -webkit-appearance: none;
-
-      &:focus {
-        @include govuk-focused-text;
-      }
-
-      // Remove default button focus outline in Firefox
-      &::-moz-focus-inner {
-        padding: 0;
-        border: 0;
-      }
-    }
-
-    // Extend the touch area of the button to span the section header
-    .govuk-accordion__section-button:after {
-      content: "";
-      position: absolute;
-      top: 0;
-      right: 0;
-      bottom: 0;
-      left: 0;
-    }
-
-    .govuk-accordion__section-button:hover:not(:focus) {
-      text-decoration: underline;
-    }
-
-    // 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) {
-      .govuk-accordion__section-button:hover {
-        text-decoration: none;
-      }
-    }
-
-    .govuk-accordion__controls {
-      text-align: right;
-    }
-
-    // Display an icon to the right of each header to indicate open/closed status,
-    // and as an additional affordance.
-    .govuk-accordion__icon {
-      position: absolute;
-      top: 50%;
-      right: 15px;
-      width: 16px;
-      height: 16px;
-      margin-top: -8px;
-    }
-
-    .govuk-accordion__icon:after,
-    .govuk-accordion__icon:before {
-      content: "";
-      box-sizing: border-box;
-      position: absolute;
-      top: 0;
-      right: 0;
-      bottom: 0;
-      left: 0;
-      width: 25%;
-      height: 25%;
-      margin: auto;
-      border: 2px solid transparent;
-      background-color: govuk-colour("black");
-    }
-
-    .govuk-accordion__icon:before {
-      width: 100%;
-    }
-
-    .govuk-accordion__icon:after {
-      height: 100%;
-    }
-
-    // Vertical bar should be hidden when section is open, to display a '-' icon
-    .govuk-accordion__section--expanded .govuk-accordion__icon:after {
-      content: " ";
-      display: none;
-    }
-  }
-}
+@import "../../base";
+@import "./index";

data/vendor/assets/stylesheets/components/accordion/_index.scss

@@ -0,0 +1,207 @@
+@include govuk-exports("govuk/component/accordion") {
+
+  $govuk-accordion-link-colour: $govuk-link-colour;
+  $govuk-accordion-link-hover-colour: govuk-colour("light-blue");
+  $govuk-accordion-border-width: 3px;
+
+  .govuk-accordion {
+    @include govuk-responsive-margin(6, "bottom");
+  }
+
+  // Borders between accordion sections
+  .govuk-accordion__section {
+    padding-top: govuk-spacing(3);
+  }
+
+  .govuk-accordion__section-header {
+    padding-top: govuk-spacing(3);
+    padding-bottom: govuk-spacing(3);
+  }
+
+  .govuk-accordion__section-heading {
+    // Override browser defaults to ensure consistent element height
+    // Font size is set in .govuk-accordion__section-button
+    @include govuk-font(24);
+
+    margin-top: 0; // Override browser default
+    margin-bottom: 0; // Override browser default
+  }
+
+  // Buttons within the sections don’t need default styling
+  .govuk-accordion__section-button {
+    @include govuk-font($size: 24, $weight: bold);
+    display: inline-block;
+    margin-bottom: 0;
+    padding-top: govuk-spacing(3);
+  }
+
+  .govuk-accordion__section-summary {
+    margin-top: govuk-spacing(2);
+    margin-bottom: 0;
+  }
+
+  // Remove the bottom margin from the last item inside the content
+  .govuk-accordion__section-content > :last-child {
+    margin-bottom: 0;
+  }
+
+  // JavaScript enabled
+  .js-enabled {
+
+    .govuk-accordion {
+      // Border at the bottom of the whole accordion
+      border-bottom: 1px solid $govuk-border-colour;
+    }
+
+    // Borders between accordion sections
+    .govuk-accordion__section {
+      padding-top: 0;
+    }
+
+    // Hide the body of collapsed sections
+    .govuk-accordion__section-content {
+      display: none;
+      @include govuk-responsive-padding(3, "top");
+      @include govuk-responsive-padding(3, "bottom");
+    }
+
+    // Show the body of expanded sections
+    .govuk-accordion__section--expanded .govuk-accordion__section-content {
+      display: block;
+    }
+
+    // This is styled to look like a link not a button
+    .govuk-accordion__open-all {
+      @include govuk-font($size: 16);
+      position: relative;
+      z-index: 1;
+      margin: 0;
+      padding: 0;
+      border-width: 0;
+      color: $govuk-link-colour;
+      background: none;
+      cursor: pointer;
+      -webkit-appearance: none;
+
+      @include govuk-link-common;
+      @include govuk-link-style-default;
+
+      // Remove default button focus outline in Firefox
+      &::-moz-focus-inner {
+        padding: 0;
+        border: 0;
+      }
+    }
+
+    // Section headers have a pointer cursor as an additional affordance
+    .govuk-accordion__section-header {
+      position: relative;
+      // Safe area on the right to avoid clashing with icon
+      padding-right: 40px;
+      border-top: 1px solid $govuk-border-colour;
+      color: $govuk-accordion-link-colour;
+      cursor: pointer;
+    }
+
+    // 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) {
+      .govuk-accordion__section-header:hover {
+        border-top-color: $govuk-accordion-link-colour;
+        box-shadow: inset 0 $govuk-accordion-border-width 0 0 $govuk-accordion-link-colour;
+      }
+    }
+
+    // Buttons within the headers don’t need default styling
+    .govuk-accordion__section-button {
+      @include govuk-typography-common;
+      margin-top: 0;
+      margin-bottom: 0;
+      margin-left: 0;
+      padding: 0;
+      border-width: 0;
+      color: inherit;
+      background: none;
+      text-align: left;
+      cursor: pointer;
+      -webkit-appearance: none;
+
+      &:focus {
+        @include govuk-focused-text;
+      }
+
+      // Remove default button focus outline in Firefox
+      &::-moz-focus-inner {
+        padding: 0;
+        border: 0;
+      }
+    }
+
+    // Extend the touch area of the button to span the section header
+    .govuk-accordion__section-button:after {
+      content: "";
+      position: absolute;
+      top: 0;
+      right: 0;
+      bottom: 0;
+      left: 0;
+    }
+
+    .govuk-accordion__section-button:hover:not(:focus) {
+      text-decoration: underline;
+    }
+
+    // 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) {
+      .govuk-accordion__section-button:hover {
+        text-decoration: none;
+      }
+    }
+
+    .govuk-accordion__controls {
+      text-align: right;
+    }
+
+    // Display an icon to the right of each header to indicate open/closed status,
+    // and as an additional affordance.
+    .govuk-accordion__icon {
+      position: absolute;
+      top: 50%;
+      right: 15px;
+      width: 16px;
+      height: 16px;
+      margin-top: -8px;
+    }
+
+    .govuk-accordion__icon:after,
+    .govuk-accordion__icon:before {
+      content: "";
+      box-sizing: border-box;
+      position: absolute;
+      top: 0;
+      right: 0;
+      bottom: 0;
+      left: 0;
+      width: 25%;
+      height: 25%;
+      margin: auto;
+      border: 2px solid transparent;
+      background-color: govuk-colour("black");
+    }
+
+    .govuk-accordion__icon:before {
+      width: 100%;
+    }
+
+    .govuk-accordion__icon:after {
+      height: 100%;
+    }
+
+    // Vertical bar should be hidden when section is open, to display a '-' icon
+    .govuk-accordion__section--expanded .govuk-accordion__icon:after {
+      content: " ";
+      display: none;
+    }
+  }
+}