govuk_publishing_components 64.2.0 → 65.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac4e471b589031c6a117d700be0a816631ed09e325fd174a05965d7d86f5ad95
-  data.tar.gz: 8a9a5455dd4b3464b4abd50a2b84fb7a21d39415e7c72f6043232f8711f20db7
+  metadata.gz: 5a7948661e4bf8e19ab9c6a5510d300c61079c96f2cac1d573d7ef3ec1a3ddda
+  data.tar.gz: 10d2df108c49d0a839bb897a734d8775deac5a71361e677c3ca937a46c0421f1
 SHA512:
-  metadata.gz: b695337f57ca2b458e5df63e52338565ad1e0021be84e912a29373b0119d5ce96c49a5b78bc88b577372ef2efcfcb2b147e1bb7e1c6433cf1b069499187196f2
-  data.tar.gz: 216b8f0d3f45d9a8732983b26361632d6597bc21279c170dbbf4a123e416b9c1863abb922e898afe0af3d897fa0b6fe4b742fb9d21b16ea4a59cdaef10a1f98c
+  metadata.gz: 8d374a98c7fd19c17b516a9a8c2a0b3e86dda144a0944e83121196af87b9f4b606f2088b799c873e4cdf2be1d82d552843c790b8094bf5b619c38ad08847e81c
+  data.tar.gz: 0e56f97f572bc11756d4d49894a09a28f52e77b58a714f40b276bb82eaaa04dd843c9a854f24c7e8e6578f781c9b35812cf499c5b9cf2b66f5e879e376bb1ffc

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

@@ -1,6 +1,6 @@
 // This file contains the styles for the Component Guide.
 @use "sass:color";
-@import "govuk_publishing_components/all_components";
+@import "govuk_publishing_components/all-components";
 
 // Include required helpers
 @import "../../stylesheets/govuk_publishing_components/components/helpers/markdown-typography";

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

@@ -0,0 +1,7 @@
+// nothing in this file should add any CSS weight
+// so that it can be imported into any CSS file
+
+@import "settings/index";
+@import "govuk/base";
+@import "govuk_publishing_components/components/helpers/colours";
+@import "govuk_publishing_components/components/mixins/index";

data/app/assets/stylesheets/govuk_publishing_components/{_all_components.scss → all-components.scss}

@@ -1,13 +1,15 @@
-// This is the file that the application needs to include in order to use
-// the components.
+@import "base";
 
-@import "govuk_publishing_components/govuk_frontend_support";
-@import "govuk_publishing_components/component_support";
+@import "govuk/core/index";
+@import "govuk/objects/index";
+@import "govuk/utilities/index";
+@import "govuk/overrides/index";
 
-// Include all govuk frontend components
-@import "govuk/components/index";
+@import "govuk_publishing_components/components/helpers/brand-colours";
+@import "govuk_publishing_components/components/helpers/contents-list-helper";
+@import "govuk_publishing_components/lib/link";
+@import "govuk_publishing_components/lib/print_support";
 
-// components
 @import "components/accordion";
 @import "components/action-link";
 @import "components/add-another";
@@ -73,6 +75,7 @@
 @import "components/related-navigation";
 @import "components/reorderable-list";
 @import "components/search";
+@import "components/search-with-autocomplete";
 @import "components/secondary-navigation";
 @import "components/select";
 @import "components/select-with-search";

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

@@ -1,4 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
 @import "govuk/components/accordion/accordion";
 
 // Prevent elements inside the button from receiving click events

data/app/assets/stylesheets/govuk_publishing_components/components/_action-link.scss

@@ -1,5 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
-
 .gem-c-action-link {
   display: table;
 

data/app/assets/stylesheets/govuk_publishing_components/components/_add-another.scss

@@ -1,4 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
 @import "govuk/components/button/button";
 @import "govuk/components/fieldset/fieldset";
 

data/app/assets/stylesheets/govuk_publishing_components/components/_app-promo-banner.scss

@@ -1,5 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
-
 .gem-c-app-promo-banner {
   display: none;
   padding: govuk-spacing(5) 0;

data/app/assets/stylesheets/govuk_publishing_components/components/_attachment-link.scss

@@ -1,5 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
-
 .gem-c-attachment-link__abbr {
   text-decoration: none;
   cursor: help;

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

@@ -1,5 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
-
 $thumbnail-width: 99px;
 $thumbnail-height: 140px;
 $thumbnail-border-width: 5px;

data/app/assets/stylesheets/govuk_publishing_components/components/_back-link.scss

@@ -1,2 +1 @@
-@import "govuk_publishing_components/individual_component_support";
 @import "govuk/components/back-link/back-link";

data/app/assets/stylesheets/govuk_publishing_components/components/_back-to-top-link.scss

@@ -1,5 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
-
 .gem-c-back-to-top-link {
   display: inline-block;
   margin-bottom: govuk-spacing(2);

data/app/assets/stylesheets/govuk_publishing_components/components/_big-number.scss

@@ -1,5 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
-
 .gem-c-big-number {
   margin-bottom: govuk-spacing(3);
   @include govuk-text-colour;

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

@@ -1,4 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
 @import "govuk/components/breadcrumbs/breadcrumbs";
 
 .gem-c-breadcrumbs--border-bottom {

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

@@ -1,4 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
 @import "govuk/components/button/button";
 
 // Because govuk-frontend adds a responsive bottom margin by default for each component

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

@@ -1,7 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
-@import "mixins/grid-helper";
-@import "mixins/css3";
-
 .gem-c-cards__heading {
   @include govuk-responsive-margin(6, "bottom");
 }

data/app/assets/stylesheets/govuk_publishing_components/components/_character-count.scss

@@ -1,2 +1 @@
-@import "govuk_publishing_components/individual_component_support";
 @import "govuk/components/character-count/character-count";

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

@@ -1,4 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
 @import "govuk/components/checkboxes/checkboxes";
 
 .govuk-checkboxes--nested {

data/app/assets/stylesheets/govuk_publishing_components/components/_contents-list-with-body.scss

@@ -1,5 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
-
 .govuk-frontend-supported .gem-c-contents-list-with-body__sticky-element {
   position: absolute;
   bottom: 0;

data/app/assets/stylesheets/govuk_publishing_components/components/_contents-list.scss

@@ -1,6 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
-@import "helpers/contents-list-helper";
-
 .gem-c-contents-list {
   // Always render the contents list above a
   // back to contents link

data/app/assets/stylesheets/govuk_publishing_components/components/_contextual-guidance.scss

@@ -1,5 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
-
 .gem-c-contextual-guidance {
   .govuk-grid-column-one-third {
     position: relative;

data/app/assets/stylesheets/govuk_publishing_components/components/_contextual-sidebar.scss

@@ -1,5 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
-
 .gem-c-contextual-sidebar__related-links {
   border-top: 2px solid $govuk-brand-colour;
 }

data/app/assets/stylesheets/govuk_publishing_components/components/_cookie-banner.scss

@@ -1,4 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
 @import "govuk/components/cookie-banner/cookie-banner";
 
 .gem-c-cookie-banner {

data/app/assets/stylesheets/govuk_publishing_components/components/_cross-service-header.scss

@@ -1,5 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
-
 $govuk-header-link-underline-thickness: 3px;
 $toggle-content-spacing: 8px;
 $toggle-padding: 15px;

data/app/assets/stylesheets/govuk_publishing_components/components/_date-input.scss

@@ -1,4 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
 @import "govuk/components/date-input/date-input";
 
 // Add spacing between input items on narrow containers when they collapse under each other

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

@@ -1,2 +1 @@
-@import "govuk_publishing_components/individual_component_support";
 @import "govuk/components/details/details";

data/app/assets/stylesheets/govuk_publishing_components/components/_devolved-nations.scss

@@ -1,5 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
-
 .gem-c-devolved-nations {
   background: govuk-colour("light-grey");
   margin-bottom: govuk-spacing(3);

data/app/assets/stylesheets/govuk_publishing_components/components/_document-list.scss

@@ -1,5 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
-
 .gem-c-document-list {
   margin: 0;
   padding: 0;

data/app/assets/stylesheets/govuk_publishing_components/components/_emergency-banner.scss

@@ -1,5 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
-
 .gem-c-emergency-banner {
   background-color: govuk-colour("mid-grey");
   color: govuk-colour("white");

data/app/assets/stylesheets/govuk_publishing_components/components/_error-alert.scss

@@ -1,5 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
-
 .gem-c-error-alert {
   color: $govuk-text-colour;
   padding: govuk-spacing(3);

data/app/assets/stylesheets/govuk_publishing_components/components/_error-message.scss

@@ -1,2 +1 @@
-@import "govuk_publishing_components/individual_component_support";
 @import "govuk/components/error-message/error-message";

data/app/assets/stylesheets/govuk_publishing_components/components/_error-summary.scss

@@ -1,4 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
 @import "govuk/components/error-summary/error-summary";
 
 .gem-c-error-summary__list-item {

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

@@ -1,5 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
-
 $feedback-prompt-background-colour: $govuk-blue-tint-95;
 $feedback-prompt-border-top-colour: $govuk-blue-tint-50;
 

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

@@ -1,2 +1 @@
-@import "govuk_publishing_components/individual_component_support";
 @import "govuk/components/fieldset/fieldset";

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

@@ -1,5 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
-
 $gap: govuk-spacing(1);
 
 .gem-c-figure {

data/app/assets/stylesheets/govuk_publishing_components/components/_file-upload.scss

@@ -1,2 +1 @@
-@import "govuk_publishing_components/individual_component_support";
 @import "govuk/components/file-upload/file-upload";

data/app/assets/stylesheets/govuk_publishing_components/components/_glance-metric.scss

@@ -1,5 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
-
 .gem-c-glance-metric {
   border-top: 1px solid $govuk-border-colour;
   border-bottom: 0;

data/app/assets/stylesheets/govuk_publishing_components/components/_global-banner.scss

@@ -1,5 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
-
 .gem-c-global-banner {
   background-color: #d9e7f2;
   display: none;

data/app/assets/stylesheets/govuk_publishing_components/components/_govspeak-html-publication.scss

@@ -1,5 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
-
 // stylelint-disable max-nesting-depth
 
 // Override govspeak styles with HTML publication specific ones

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

@@ -1,5 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
-
 @import "govspeak/attachment";
 @import "govspeak/button";
 @import "govspeak/call-to-action";

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

@@ -1,5 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
-
 .gem-c-heading {
   // needs to be this specific to override govuk-heading
   .gem-c-heading__text {

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

@@ -1,2 +1 @@
-@import "govuk_publishing_components/individual_component_support";
 @import "govuk/components/hint/hint";

data/app/assets/stylesheets/govuk_publishing_components/components/_image-card.scss

@@ -1,5 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
-
 .gem-c-image-card {
   position: relative;
   margin-bottom: govuk-spacing(6);

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

@@ -1,4 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
 @import "govuk/components/input/input";
 
 $search-icon-size: 40px;

data/app/assets/stylesheets/govuk_publishing_components/components/_inset-text.scss

@@ -1,4 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
 @import "govuk/components/inset-text/inset-text";
 
 @include govuk-media-query($media-type: print) {

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

@@ -1,5 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
-
 .gem-c-intervention {
   background-color: govuk-colour("light-grey");
   border-left: 10px solid $govuk-success-colour;

data/app/assets/stylesheets/govuk_publishing_components/components/_inverse-header.scss

@@ -1,5 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
-
 .gem-c-inverse-header {
   width: 100%;
   background-color: $govuk-blue-tint-80;

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

@@ -1,2 +1 @@
-@import "govuk_publishing_components/individual_component_support";
 @import "govuk/components/label/label";

data/app/assets/stylesheets/govuk_publishing_components/components/_layout-footer.scss

@@ -1,4 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
 @import "govuk/components/footer/footer";
 
 .govuk-footer__list-item {

data/app/assets/stylesheets/govuk_publishing_components/components/_layout-for-public.scss

@@ -1,5 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
-
 .gem-c-layout-for-public {
   font-family: $govuk-font-family;
 }

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

@@ -1,4 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
 @import "govuk/components/header/header";
 
 .gem-c-layout-header.gem-c-layout-header--no-bottom-border,

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

@@ -1,7 +1,4 @@
-@import "govuk_publishing_components/individual_component_support";
 @import "govuk/components/header/header";
-@import "mixins/css3";
-@import "mixins/grid-helper";
 
 $chevron-breakpoint: 360px;
 $chevron-indent-spacing: 7px;

data/app/assets/stylesheets/govuk_publishing_components/components/_lead-paragraph.scss

@@ -1,5 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
-
 .gem-c-lead-paragraph {
   margin-top: 0;
   // Ensure the text has a line-length of around 60 characters

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

@@ -1,5 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
-
 .gem-c-metadata {
   @include govuk-text-colour;
   @include govuk-font(16);

data/app/assets/stylesheets/govuk_publishing_components/components/_modal-dialogue.scss

@@ -1,5 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
-
 $govuk-modal-margin: govuk-spacing(6);
 $govuk-modal-close-button-size: 44px;
 $govuk-modal-z-index: 1000;

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

@@ -1,4 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
 @import "govuk/components/notification-banner/notification-banner";
 
 .gem-c-notice {

data/app/assets/stylesheets/govuk_publishing_components/components/_option-select.scss

@@ -1,5 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
-
 .gem-c-option-select {
   position: relative;
   padding: 0 0 govuk-spacing(2);

data/app/assets/stylesheets/govuk_publishing_components/components/_organisation-logo.scss

@@ -1,5 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
-
 // Default logo corresponds with the "medium stacked" Whitehall equivalent
 .gem-c-organisation-logo {
   font-weight: 400;

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

@@ -1,4 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
 @import "govuk/components/pagination/pagination";
 
 // stylelint-disable declaration-no-important

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

@@ -1,4 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
 @import "govuk/components/panel/panel";
 
 .gem-c-panel__prepend {

data/app/assets/stylesheets/govuk_publishing_components/components/_password-input.scss

@@ -1,2 +1 @@
-@import "govuk_publishing_components/individual_component_support";
 @import "govuk/components/password-input/password-input";

data/app/assets/stylesheets/govuk_publishing_components/components/_phase-banner.scss

@@ -1,4 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
 @import "govuk/components/phase-banner/phase-banner";
 
 .gem-c-phase-banner {

data/app/assets/stylesheets/govuk_publishing_components/components/_print-link.scss

@@ -1,5 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
-
 $gem-c-print-link-background-width: 16px;
 $gem-c-print-link-background-height: 18px;
 

data/app/assets/stylesheets/govuk_publishing_components/components/_published-dates.scss

@@ -1,5 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
-
 .gem-c-published-dates {
   direction: ltr;
   line-height: 1.45em;

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

@@ -1,4 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
 @import "govuk/components/radios/radios";
 
 .gem-c-radio__heading-text {

data/app/assets/stylesheets/govuk_publishing_components/components/_related-navigation.scss

@@ -1,5 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
-
 .gem-c-related-navigation {
   border-top: 2px solid govuk-colour("blue");
   margin-bottom: govuk-spacing(9);

data/app/assets/stylesheets/govuk_publishing_components/components/_reorderable-list.scss

@@ -1,5 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
-
 .gem-c-reorderable-list {
   list-style-type: none;
   margin-bottom: govuk-spacing(6);

data/app/assets/stylesheets/govuk_publishing_components/components/_search-with-autocomplete.scss

@@ -1,5 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
-
 // These styles are adapted from the original Accessible Autocomplete component stylesheet, mostly
 // to remove superfluous styles that are already provided by the GOV.UK Design System, and to adapt
 // the styling to match the new GOV.UK search box designs (e.g. to remove the zebra striping on

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

@@ -1,6 +1,4 @@
 @use "sass:color";
-@import "govuk_publishing_components/individual_component_support";
-@import "mixins/css3";
 
 $input-size: 40px;
 $large-input-size: 50px;

data/app/assets/stylesheets/govuk_publishing_components/components/_secondary-navigation.scss

@@ -1,5 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
-
 .gem-c-secondary-navigation {
   @include govuk-font(19);
   @include govuk-responsive-margin(6, "bottom");

data/app/assets/stylesheets/govuk_publishing_components/components/_select-with-search.scss

@@ -1,7 +1,5 @@
 // overload the choices.js variables
 
-@import "govuk_publishing_components/individual_component_support";
-
 $font-size: 19px;
 
 $choices-bg-color: govuk-colour("white") !default;
@@ -16,7 +14,6 @@ $choices-border-radius-item: 0 !default;
 $choices-z-index: 2 !default;
 $choices-button-dimension: 12px !default;
 
-@import "mixins/css3";
 @import "govuk/components/label/label";
 @import "choices.js/src/styles/choices";
 

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

@@ -1,4 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
 @import "govuk/components/select/select";
 
 // Increase height of selects that have a `multiple`

data/app/assets/stylesheets/govuk_publishing_components/components/_service-navigation.scss

@@ -1,4 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
 @import "govuk/components/service-navigation/service-navigation";
 
 .gem-c-service-navigation--full-width {

data/app/assets/stylesheets/govuk_publishing_components/components/_share-links.scss

@@ -1,5 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
-
 $share-button-width: 30px;
 $share-button-height: 30px;
 

data/app/assets/stylesheets/govuk_publishing_components/components/_signup-link.scss

@@ -1,5 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
-
 .gem-c-signup-link__link {
   @include govuk-font($size: 19);
 }

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

@@ -1,5 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
-
 .gem-c-single-page-notification-button__submit {
   padding: govuk-spacing(2);
   margin: govuk-spacing(0);

data/app/assets/stylesheets/govuk_publishing_components/components/_skip-link.scss

@@ -1,2 +1 @@
-@import "govuk_publishing_components/individual_component_support";
 @import "govuk/components/skip-link/skip-link";

data/app/assets/stylesheets/govuk_publishing_components/components/_step-by-step-nav-header.scss

@@ -1,5 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
-
 .gem-c-step-nav-header {
   position: relative;
   padding: 10px;

data/app/assets/stylesheets/govuk_publishing_components/components/_step-by-step-nav-related.scss

@@ -1,5 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
-
 .gem-c-step-nav-related {
   border-top: 2px solid govuk-colour("blue");
   margin-bottom: govuk-spacing(6);

data/app/assets/stylesheets/govuk_publishing_components/components/_step-by-step-nav.scss

@@ -1,5 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
-
 $stroke-width: 1px;
 $number-circle-size: 30px;
 $number-circle-size-large: 35px;

data/app/assets/stylesheets/govuk_publishing_components/components/_subscription-links.scss

@@ -1,6 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
-@import "mixins/css3";
-
 .gem-c-subscription-links {
   @include govuk-text-colour;
   @include govuk-font(19, $weight: bold);

data/app/assets/stylesheets/govuk_publishing_components/components/_success-alert.scss

@@ -1,4 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
 @import "govuk/components/notification-banner/notification-banner";
 
 // stylelint-disable declaration-no-important

data/app/assets/stylesheets/govuk_publishing_components/components/_summary-banner.scss

@@ -1,5 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
-
 .gem-c-summary-banner {
   direction: ltr;
   background: $govuk-brand-colour;

data/app/assets/stylesheets/govuk_publishing_components/components/_summary-card.scss

@@ -1,4 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
 @import "govuk/components/summary-list/summary-list";
 
 .gem-c-summary-card {

data/app/assets/stylesheets/govuk_publishing_components/components/_summary-list.scss

@@ -1,4 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
 @import "govuk/components/summary-list/summary-list";
 
 .gem-c-summary-list {

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

@@ -1,4 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
 @import "govuk/components/table/table";
 
 $table-border-width: 1px;

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

@@ -1,4 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
 @import "govuk/components/tabs/tabs";
 
 .govuk-frontend-supported {

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

@@ -1,4 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
 @import "govuk/components/tag/tag";
 
 .gem-c-tag {

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

@@ -1,4 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
 @import "govuk/components/textarea/textarea";
 
 .gem-c-textarea {

data/app/assets/stylesheets/govuk_publishing_components/components/_translation-nav.scss

@@ -1,5 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
-
 .gem-c-translation-nav {
   margin-bottom: govuk-spacing(6);
   border-bottom: 1px solid $govuk-border-colour;

data/app/assets/stylesheets/govuk_publishing_components/components/_warning-text.scss

@@ -1,4 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
 @import "govuk/components/warning-text/warning-text";
 
 .gem-c-warning-text .govuk-warning-text__text {

data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_typography.scss

@@ -1,4 +1,3 @@
-@import "../helpers/markdown-typography";
 // Govspeak typography
 // https://components.publishing.service.gov.uk/component-guide/govspeak/heading_levels
 // https://components.publishing.service.gov.uk/component-guide/govspeak/lists
@@ -10,6 +9,7 @@
 // - alphagov/govspeak: ✔︎
 
 // stylelint-disable max-nesting-depth
+@import "../helpers/markdown-typography";
 
 .govspeak, // Legacy class name that's still used in some content items - needs to be kept until `.govspeak` is removed from the content items.
 .gem-c-govspeak {

data/app/assets/stylesheets/govuk_publishing_components/{govuk_frontend_support.scss → components/helpers/_colours.scss}

@@ -1,14 +1,3 @@
-// This file should be included in an application prior to specific components
-// It provides govuk-frontend but adds no weight to the compiled CSS
-@import "components/helpers/govuk-frontend-settings";
-@import "govuk/base";
-
-@import "components/mixins/margins";
-
-$govuk-suppressed-warnings: (
-  organisation-colours
-);
-
 $gem-secondary-button-colour: #00823b;
 $gem-secondary-button-hover-colour: darken($gem-secondary-button-colour, 5%);
 $gem-secondary-button-background-colour: govuk-colour("white");
@@ -17,10 +6,7 @@ $gem-secondary-button-hover-background-colour: govuk-colour("light-grey");
 $gem-quiet-button-colour: govuk-colour("dark-grey");
 $gem-quiet-button-hover-colour: darken($gem-quiet-button-colour, 5%);
 
-$gem-hover-dark-background: #dddcdb;
-
 // Brand refresh
-
 $govuk-blue-tint-95: govuk-tint($govuk-brand-colour, 95%);
 $govuk-blue-tint-80: govuk-tint(govuk-colour("blue"), 80%);
 $govuk-blue-tint-50: govuk-tint(govuk-colour("blue"), 50%);

data/app/assets/stylesheets/govuk_publishing_components/components/mixins/_index.scss

@@ -0,0 +1,4 @@
+@import "grid-helper";
+@import "margins";
+@import "prefixed-transform";
+@import "scale";

data/app/assets/stylesheets/govuk_publishing_components/components/mixins/{_css3.scss → _prefixed-transform.scss}

@@ -1,9 +1,3 @@
-@mixin scale($size) {
-  -webkit-transform: scale($size);  // Chrome, Opera 15+, Safari 3.1+
-  -ms-transform: scale($size);  // IE 9
-  transform: scale($size);  // Firefox 16+, IE 10+, Opera
-}
-
 @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);

data/app/assets/stylesheets/govuk_publishing_components/components/mixins/_scale.scss

@@ -0,0 +1,5 @@
+@mixin scale($size) {
+  -webkit-transform: scale($size);  // Chrome, Opera 15+, Safari 3.1+
+  -ms-transform: scale($size);  // IE 9
+  transform: scale($size);  // Firefox 16+, IE 10+, Opera
+}

data/app/assets/stylesheets/govuk_publishing_components/settings/_app-font-url.scss

@@ -0,0 +1,7 @@
+// Custom font URL function
+// https://github.com/alphagov/govuk-frontend/blob/9f05cea739d14d4cbf18e79b17228045ca84b3ba/packages/govuk-frontend/src/govuk/settings/_assets.scss#L57-L82
+
+@function app-font-url($filename) {
+  @return url("#{$filename}");
+}
+$govuk-font-url-function: "app-font-url";

data/app/assets/stylesheets/govuk_publishing_components/settings/_app-image-url.scss

@@ -0,0 +1,7 @@
+// Custom image URL function
+// https://github.com/alphagov/govuk-frontend/blob/9f05cea739d14d4cbf18e79b17228045ca84b3ba/packages/govuk-frontend/src/govuk/settings/_assets.scss#L30-L55
+
+@function app-image-url($filename) {
+  @return url("#{$filename}");
+}
+$govuk-image-url-function: "app-image-url";

data/app/assets/stylesheets/govuk_publishing_components/settings/_colours.scss

@@ -0,0 +1,5 @@
+$govuk-new-organisation-colours: true;
+
+$govuk-suppressed-warnings: (
+  organisation-colours
+);

data/app/assets/stylesheets/govuk_publishing_components/settings/_index.scss

@@ -0,0 +1,4 @@
+@import "app-font-url";
+@import "app-image-url";
+@import "colours";
+@import "typography";

data/app/assets/stylesheets/govuk_publishing_components/settings/_typography.scss

@@ -0,0 +1 @@
+$govuk-new-typography-scale: true;

data/app/assets/stylesheets/govuk_publishing_components/specific-components.scss

@@ -0,0 +1,11 @@
+@import "base";
+
+@import "govuk/core/index";
+@import "govuk/objects/index";
+@import "govuk/utilities/index";
+@import "govuk/overrides/index";
+
+@import "govuk_publishing_components/components/helpers/brand-colours";
+@import "govuk_publishing_components/components/helpers/contents-list-helper";
+@import "govuk_publishing_components/lib/link";
+@import "govuk_publishing_components/lib/print_support";

data/app/models/govuk_publishing_components/audit_applications.rb

@@ -18,7 +18,7 @@ module GovukPublishingComponents
 
         find_components = /(?<=govuk_publishing_components\/components\/)[a-zA-Z_-]+(?=['"])/
 
-        @find_all_stylesheets = /@import ["']{1}govuk_publishing_components\/all_components/ # if using the all stylesheets option
+        @find_all_stylesheets = /@import ["']{1}govuk_publishing_components\/all-components/ # if using the all stylesheets option
         find_stylesheets = /(?<=@import ["']{1}govuk_publishing_components\/components\/)(?!print\/)+[a-zA-Z_-]+(?=['"])/
 
         @find_all_javascripts = /\/\/ *= require govuk_publishing_components\/all_components/

data/lib/govuk_publishing_components/presenters/big_number_helper.rb

@@ -22,7 +22,7 @@ module GovukPublishingComponents
       # Currently the only small symbol used with big numbers are pluses so they are specifically targetted in the below code
       def number_has_plus_suffix?
         if @number.is_a? String
-          @number.ends_with?("+")
+          @number.end_with?("+")
         end
       end
     end

data/lib/govuk_publishing_components/presenters/machine_readable/page.rb

@@ -28,15 +28,15 @@ module GovukPublishingComponents
       end
 
       def has_image?
-        content_item.dig("details", "image").present?
+        header_area_image.present?
       end
 
       def image_url
-        content_item.dig("details", "image", "high_resolution_url") || content_item.dig("details", "image", "url")
+        header_area_image_url_from_sources || header_area_image&.dig("high_resolution_url") || header_area_image&.dig("url")
       end
 
       def image_alt_text
-        content_item.dig("details", "image", "alt_text")
+        header_area_image&.dig("alt_text")
       end
 
       def image_placeholders
@@ -70,6 +70,26 @@ module GovukPublishingComponents
       def withdrawn?
         content_item["withdrawn_notice"].present?
       end
+
+    private
+
+      def header_area_image_url_from_sources
+        return if header_area_image.blank?
+
+        header_area_image.dig("sources", "s960") || header_area_image.dig("sources", "s300")
+      end
+
+      def header_area_image
+        get_image_in_priority_order || content_item.dig("details", "image")
+      end
+
+      def get_image_in_priority_order
+        images = content_item.dig("details", "images")
+
+        return unless images.present? && images.is_a?(Array)
+
+        images.find { |i| i["type"] == "lead" } || images.find { |i| i["type"].present? }
+      end
     end
   end
 end

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "64.2.0".freeze
+  VERSION = "65.1.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 64.2.0
+  version: 65.1.0
 platform: ruby
 authors:
 - GOV.UK Dev
@@ -540,9 +540,8 @@ files:
 - app/assets/javascripts/govuk_publishing_components/vendor/lux/lux-measurer.js
 - app/assets/javascripts/govuk_publishing_components/vendor/lux/lux-reporter.js
 - app/assets/stylesheets/component_guide/application.scss
-- app/assets/stylesheets/govuk_publishing_components/_all_components.scss
-- app/assets/stylesheets/govuk_publishing_components/_individual_component_support.scss
-- app/assets/stylesheets/govuk_publishing_components/component_support.scss
+- app/assets/stylesheets/govuk_publishing_components/_base.scss
+- app/assets/stylesheets/govuk_publishing_components/all-components.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_accordion.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_action-link.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_add-another.scss
@@ -653,15 +652,22 @@ files:
 - app/assets/stylesheets/govuk_publishing_components/components/govspeak/_typography.scss
 - app/assets/stylesheets/govuk_publishing_components/components/govspeak/_warning-callout.scss
 - app/assets/stylesheets/govuk_publishing_components/components/helpers/_brand-colours.scss
+- app/assets/stylesheets/govuk_publishing_components/components/helpers/_colours.scss
 - app/assets/stylesheets/govuk_publishing_components/components/helpers/_contents-list-helper.scss
-- app/assets/stylesheets/govuk_publishing_components/components/helpers/_govuk-frontend-settings.scss
-- app/assets/stylesheets/govuk_publishing_components/components/helpers/_link.scss
 - app/assets/stylesheets/govuk_publishing_components/components/helpers/_markdown-typography.scss
-- app/assets/stylesheets/govuk_publishing_components/components/mixins/_css3.scss
 - app/assets/stylesheets/govuk_publishing_components/components/mixins/_grid-helper.scss
+- app/assets/stylesheets/govuk_publishing_components/components/mixins/_index.scss
 - app/assets/stylesheets/govuk_publishing_components/components/mixins/_margins.scss
-- app/assets/stylesheets/govuk_publishing_components/govuk_frontend_support.scss
+- app/assets/stylesheets/govuk_publishing_components/components/mixins/_prefixed-transform.scss
+- app/assets/stylesheets/govuk_publishing_components/components/mixins/_scale.scss
+- app/assets/stylesheets/govuk_publishing_components/lib/_link.scss
 - app/assets/stylesheets/govuk_publishing_components/lib/_print_support.scss
+- app/assets/stylesheets/govuk_publishing_components/settings/_app-font-url.scss
+- app/assets/stylesheets/govuk_publishing_components/settings/_app-image-url.scss
+- app/assets/stylesheets/govuk_publishing_components/settings/_colours.scss
+- app/assets/stylesheets/govuk_publishing_components/settings/_index.scss
+- app/assets/stylesheets/govuk_publishing_components/settings/_typography.scss
+- app/assets/stylesheets/govuk_publishing_components/specific-components.scss
 - app/controllers/govuk_publishing_components/application_controller.rb
 - app/controllers/govuk_publishing_components/applications_page_controller.rb
 - app/controllers/govuk_publishing_components/audit_controller.rb
@@ -2118,7 +2124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.7
+rubygems_version: 4.0.8
 specification_version: 4
 summary: A gem to document components in GOV.UK frontend applications
 test_files: []

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

@@ -1,8 +0,0 @@
-// This flag stops the font from being included in this components's
-// stylesheet - the font is being served by Static across all of GOV.UK, so is
-// not needed here.
-$govuk-include-default-font-face: false;
-
-// Each component needs access to the variables, functions, and mixins from
-// GOVUK Frontend.
-@import "govuk_frontend_support";

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

@@ -1,14 +0,0 @@
-// This file should be included in an application prior to specific components
-// It provides supporting gem component helpers and mixins
-// and everything else from govuk-frontend not included in govuk_frontend_support
-@import "govuk/core/index";
-@import "govuk/objects/index";
-@import "govuk/utilities/index";
-@import "govuk/overrides/index";
-
-@import "govuk_publishing_components/components/helpers/brand-colours";
-@import "govuk_publishing_components/components/helpers/link";
-@import "govuk_publishing_components/components/mixins/margins";
-@import "govuk_publishing_components/components/mixins/css3";
-
-@import "govuk_publishing_components/lib/print_support";

data/app/assets/stylesheets/govuk_publishing_components/components/helpers/_govuk-frontend-settings.scss

@@ -1,17 +0,0 @@
-// Custom image URL function
-// https://github.com/alphagov/govuk-frontend/blob/9f05cea739d14d4cbf18e79b17228045ca84b3ba/packages/govuk-frontend/src/govuk/settings/_assets.scss#L30-L55
-
-@function app-image-url($filename) {
-  @return url("#{$filename}");
-}
-// Custom font URL function
-// https://github.com/alphagov/govuk-frontend/blob/9f05cea739d14d4cbf18e79b17228045ca84b3ba/packages/govuk-frontend/src/govuk/settings/_assets.scss#L57-L82
-
-@function app-font-url($filename) {
-  @return url("#{$filename}");
-}
-
-$govuk-image-url-function: "app-image-url";
-$govuk-font-url-function: "app-font-url";
-$govuk-new-typography-scale: true;
-$govuk-new-organisation-colours: true;