diff --git a/app/assets/stylesheets/govuk_publishing_components/_all_components.scss b/app/assets/stylesheets/govuk_publishing_components/_all_components.scss index 92e0cec681..20085a0dcb 100644 --- a/app/assets/stylesheets/govuk_publishing_components/_all_components.scss +++ b/app/assets/stylesheets/govuk_publishing_components/_all_components.scss @@ -8,7 +8,7 @@ $govuk-new-link-styles: true; @import "govuk_publishing_components/component_support"; // Include all govuk frontend components -@import "dist/govuk/components/all"; +@import "govuk/components/all"; // components @import "components/accordion"; diff --git a/app/assets/stylesheets/govuk_publishing_components/component_support.scss b/app/assets/stylesheets/govuk_publishing_components/component_support.scss index 9f88fc9924..964f3d3b35 100644 --- a/app/assets/stylesheets/govuk_publishing_components/component_support.scss +++ b/app/assets/stylesheets/govuk_publishing_components/component_support.scss @@ -1,10 +1,10 @@ // 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 "dist/govuk/core/all"; -@import "dist/govuk/objects/all"; -@import "dist/govuk/utilities/all"; -@import "dist/govuk/overrides/all"; +@import "govuk/core/all"; +@import "govuk/objects/all"; +@import "govuk/utilities/all"; +@import "govuk/overrides/all"; @import "govuk_publishing_components/components/helpers/brand-colours"; @import "govuk_publishing_components/components/helpers/link"; diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_accordion.scss b/app/assets/stylesheets/govuk_publishing_components/components/_accordion.scss index 05db8a985f..1d7e52384d 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_accordion.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_accordion.scss @@ -1,6 +1,6 @@ @import "govuk_publishing_components/individual_component_support"; @import "mixins/prefixed-transform"; -@import "dist/govuk/components/accordion/accordion"; +@import "govuk/components/accordion/accordion"; // Prevent elements inside the button from receiving click events .gem-c-accordion__show-all > * { diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_back-link.scss b/app/assets/stylesheets/govuk_publishing_components/components/_back-link.scss index cfa6563e73..a813235eff 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_back-link.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_back-link.scss @@ -1,2 +1,2 @@ @import "govuk_publishing_components/individual_component_support"; -@import "dist/govuk/components/back-link/back-link"; +@import "govuk/components/back-link/back-link"; diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_breadcrumbs.scss b/app/assets/stylesheets/govuk_publishing_components/components/_breadcrumbs.scss index 23a8392a92..de60d531df 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_breadcrumbs.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_breadcrumbs.scss @@ -1,5 +1,5 @@ @import "govuk_publishing_components/individual_component_support"; -@import "dist/govuk/components/breadcrumbs/breadcrumbs"; +@import "govuk/components/breadcrumbs/breadcrumbs"; .gem-c-breadcrumbs--inverse .govuk-breadcrumbs__list-item .govuk-breadcrumbs__link { &:link, diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_button.scss b/app/assets/stylesheets/govuk_publishing_components/components/_button.scss index 2e04d5a5c8..26d472a694 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_button.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_button.scss @@ -1,5 +1,5 @@ @import "govuk_publishing_components/individual_component_support"; -@import "dist/govuk/components/button/button"; +@import "govuk/components/button/button"; // Because govuk-frontend adds a responsive bottom margin by default for each component // we reset it to zero so we can set it separately using `gem-c-button--bottom-margin` diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_character-count.scss b/app/assets/stylesheets/govuk_publishing_components/components/_character-count.scss index af24e82411..0a9c767726 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_character-count.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_character-count.scss @@ -1,2 +1,2 @@ @import "govuk_publishing_components/individual_component_support"; -@import "dist/govuk/components/character-count/character-count"; +@import "govuk/components/character-count/character-count"; diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_checkboxes.scss b/app/assets/stylesheets/govuk_publishing_components/components/_checkboxes.scss index 4849353999..7ddc075695 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_checkboxes.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_checkboxes.scss @@ -1,5 +1,5 @@ @import "govuk_publishing_components/individual_component_support"; -@import "dist/govuk/components/checkboxes/checkboxes"; +@import "govuk/components/checkboxes/checkboxes"; .govuk-checkboxes--nested { margin-left: -(govuk-spacing(4) + 2px); // 22px diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_cookie-banner.scss b/app/assets/stylesheets/govuk_publishing_components/components/_cookie-banner.scss index 5308d4dfb6..ed66926c16 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_cookie-banner.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_cookie-banner.scss @@ -1,5 +1,5 @@ @import "govuk_publishing_components/individual_component_support"; -@import "dist/govuk/components/cookie-banner/cookie-banner"; +@import "govuk/components/cookie-banner/cookie-banner"; .gem-c-cookie-banner .govuk-button-group[hidden] { display: none; diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_date-input.scss b/app/assets/stylesheets/govuk_publishing_components/components/_date-input.scss index 72cc8eba1e..fb13416004 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_date-input.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_date-input.scss @@ -1,5 +1,5 @@ @import "govuk_publishing_components/individual_component_support"; -@import "dist/govuk/components/date-input/date-input"; +@import "govuk/components/date-input/date-input"; // Add spacing between input items on narrow containers when they collapse under each other .govuk-date-input { diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_details.scss b/app/assets/stylesheets/govuk_publishing_components/components/_details.scss index 0bd8b6071d..d795472a32 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_details.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_details.scss @@ -1,2 +1,2 @@ @import "govuk_publishing_components/individual_component_support"; -@import "dist/govuk/components/details/details"; +@import "govuk/components/details/details"; diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_error-message.scss b/app/assets/stylesheets/govuk_publishing_components/components/_error-message.scss index b3943ac942..b0ae361681 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_error-message.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_error-message.scss @@ -1,2 +1,2 @@ @import "govuk_publishing_components/individual_component_support"; -@import "dist/govuk/components/error-message/error-message"; +@import "govuk/components/error-message/error-message"; diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_error-summary.scss b/app/assets/stylesheets/govuk_publishing_components/components/_error-summary.scss index 7251a8cb12..1919004e28 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_error-summary.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_error-summary.scss @@ -1,5 +1,5 @@ @import "govuk_publishing_components/individual_component_support"; -@import "dist/govuk/components/error-summary/error-summary"; +@import "govuk/components/error-summary/error-summary"; .gem-c-error-summary__list-item { @include govuk-font($size: 19, $weight: bold); diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_fieldset.scss b/app/assets/stylesheets/govuk_publishing_components/components/_fieldset.scss index d1ec4f9364..a713180baf 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_fieldset.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_fieldset.scss @@ -1,2 +1,2 @@ @import "govuk_publishing_components/individual_component_support"; -@import "dist/govuk/components/fieldset/fieldset"; +@import "govuk/components/fieldset/fieldset"; diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_file-upload.scss b/app/assets/stylesheets/govuk_publishing_components/components/_file-upload.scss index c1991f4b16..21cc17f9c1 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_file-upload.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_file-upload.scss @@ -1,2 +1,2 @@ @import "govuk_publishing_components/individual_component_support"; -@import "dist/govuk/components/file-upload/file-upload"; +@import "govuk/components/file-upload/file-upload"; diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_hint.scss b/app/assets/stylesheets/govuk_publishing_components/components/_hint.scss index 97f743ae68..f364e6e3a0 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_hint.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_hint.scss @@ -1,2 +1,2 @@ @import "govuk_publishing_components/individual_component_support"; -@import "dist/govuk/components/hint/hint"; +@import "govuk/components/hint/hint"; diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_input.scss b/app/assets/stylesheets/govuk_publishing_components/components/_input.scss index 17c3d6a7eb..d9a7268541 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_input.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_input.scss @@ -1,5 +1,5 @@ @import "govuk_publishing_components/individual_component_support"; -@import "dist/govuk/components/input/input"; +@import "govuk/components/input/input"; $search-icon-size: 40px; diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_inset-text.scss b/app/assets/stylesheets/govuk_publishing_components/components/_inset-text.scss index aa26d373c6..0961a30ae5 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_inset-text.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_inset-text.scss @@ -1,2 +1,2 @@ @import "govuk_publishing_components/individual_component_support"; -@import "dist/govuk/components/inset-text/inset-text"; +@import "govuk/components/inset-text/inset-text"; diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_label.scss b/app/assets/stylesheets/govuk_publishing_components/components/_label.scss index 9614d186b8..596316c79a 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_label.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_label.scss @@ -1,2 +1,2 @@ @import "govuk_publishing_components/individual_component_support"; -@import "dist/govuk/components/label/label"; +@import "govuk/components/label/label"; diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_layout-footer.scss b/app/assets/stylesheets/govuk_publishing_components/components/_layout-footer.scss index 3cf19dbb4d..891bcc2db5 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_layout-footer.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_layout-footer.scss @@ -1,5 +1,5 @@ @import "govuk_publishing_components/individual_component_support"; -@import "dist/govuk/components/footer/footer"; +@import "govuk/components/footer/footer"; .gem-c-layout-footer--border { border-top: govuk-spacing(2) solid govuk-colour("blue"); diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_layout-header.scss b/app/assets/stylesheets/govuk_publishing_components/components/_layout-header.scss index d786b4ee89..bdfdda4ffd 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_layout-header.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_layout-header.scss @@ -1,7 +1,7 @@ @import "govuk_publishing_components/components/search"; @import "govuk_publishing_components/components/skip-link"; -@import "dist/govuk/components/header/header"; -@import "dist/govuk/components/tag/tag"; +@import "govuk/components/header/header"; +@import "govuk/components/tag/tag"; .gem-c-layout-header--production .govuk-header__container { border-bottom-color: govuk-colour("red", $legacy: "bright-red"); diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_notice.scss b/app/assets/stylesheets/govuk_publishing_components/components/_notice.scss index 9c4f48182f..7f99c56b98 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_notice.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_notice.scss @@ -1,5 +1,5 @@ @import "govuk_publishing_components/individual_component_support"; -@import "dist/govuk/components/notification-banner/notification-banner"; +@import "govuk/components/notification-banner/notification-banner"; .gem-c-notice { @include govuk-responsive-margin(8, "bottom"); diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_panel.scss b/app/assets/stylesheets/govuk_publishing_components/components/_panel.scss index 1bf8034859..b2d75fdf51 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_panel.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_panel.scss @@ -1,5 +1,5 @@ @import "govuk_publishing_components/individual_component_support"; -@import "dist/govuk/components/panel/panel"; +@import "govuk/components/panel/panel"; .gem-c-panel__prepend { @include govuk-font($size: 24, $weight: bold); diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_phase-banner.scss b/app/assets/stylesheets/govuk_publishing_components/components/_phase-banner.scss index e5587f05f0..01f8395f76 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_phase-banner.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_phase-banner.scss @@ -1,5 +1,5 @@ @import "govuk_publishing_components/individual_component_support"; -@import "dist/govuk/components/phase-banner/phase-banner"; +@import "govuk/components/phase-banner/phase-banner"; .gem-c-phase-banner { .govuk-phase-banner__content__app-name { diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_previous-and-next-navigation.scss b/app/assets/stylesheets/govuk_publishing_components/components/_previous-and-next-navigation.scss index 36db0deb3e..7608354a91 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_previous-and-next-navigation.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_previous-and-next-navigation.scss @@ -1,2 +1,2 @@ @import "govuk_publishing_components/individual_component_support"; -@import "dist/govuk/components/pagination/pagination"; +@import "govuk/components/pagination/pagination"; diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_radio.scss b/app/assets/stylesheets/govuk_publishing_components/components/_radio.scss index e1c5402c04..57ec9700fc 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_radio.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_radio.scss @@ -1,5 +1,5 @@ @import "govuk_publishing_components/individual_component_support"; -@import "dist/govuk/components/radios/radios"; +@import "govuk/components/radios/radios"; .gem-c-radio__heading-text { margin: 0 0 govuk-spacing(4) 0; diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_select.scss b/app/assets/stylesheets/govuk_publishing_components/components/_select.scss index 034aba63fc..0a75809faa 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_select.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_select.scss @@ -1,5 +1,5 @@ @import "govuk_publishing_components/individual_component_support"; -@import "dist/govuk/components/select/select"; +@import "govuk/components/select/select"; .gem-c-select__select--full-width { min-width: 100%; diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_skip-link.scss b/app/assets/stylesheets/govuk_publishing_components/components/_skip-link.scss index f3ee7a347f..8a3afff025 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_skip-link.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_skip-link.scss @@ -1,2 +1,2 @@ @import "govuk_publishing_components/individual_component_support"; -@import "dist/govuk/components/skip-link/skip-link"; +@import "govuk/components/skip-link/skip-link"; diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_success-alert.scss b/app/assets/stylesheets/govuk_publishing_components/components/_success-alert.scss index ef21f5ff62..9ef67d3d4c 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_success-alert.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_success-alert.scss @@ -1,5 +1,5 @@ @import "govuk_publishing_components/individual_component_support"; -@import "dist/govuk/components/notification-banner/notification-banner"; +@import "govuk/components/notification-banner/notification-banner"; .gem-c-success-alert__message { @include govuk-font(19, $weight: bold); diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_summary-list.scss b/app/assets/stylesheets/govuk_publishing_components/components/_summary-list.scss index 18092c1329..2678766249 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_summary-list.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_summary-list.scss @@ -1,5 +1,5 @@ @import "govuk_publishing_components/individual_component_support"; -@import "dist/govuk/components/summary-list/summary-list"; +@import "govuk/components/summary-list/summary-list"; .gem-c-summary-list { border-bottom: 1px solid $govuk-border-colour; diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_table.scss b/app/assets/stylesheets/govuk_publishing_components/components/_table.scss index 9b29c885a3..36fd81462c 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_table.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_table.scss @@ -1,5 +1,5 @@ @import "govuk_publishing_components/individual_component_support"; -@import "dist/govuk/components/table/table"; +@import "govuk/components/table/table"; $table-border-width: 1px; $table-border-colour: govuk-colour("mid-grey", $legacy: "grey-2"); diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_tabs.scss b/app/assets/stylesheets/govuk_publishing_components/components/_tabs.scss index 601061ecb3..8e2bc4f0a4 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_tabs.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_tabs.scss @@ -1,5 +1,5 @@ @import "govuk_publishing_components/individual_component_support"; -@import "dist/govuk/components/tabs/tabs"; +@import "govuk/components/tabs/tabs"; .js-enabled { .gem-c-tabs__panel--no-border { diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_textarea.scss b/app/assets/stylesheets/govuk_publishing_components/components/_textarea.scss index d783c69af9..bdd730a889 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_textarea.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_textarea.scss @@ -1,5 +1,5 @@ @import "govuk_publishing_components/individual_component_support"; -@import "dist/govuk/components/textarea/textarea"; +@import "govuk/components/textarea/textarea"; .gem-c-textarea { .govuk-textarea { diff --git a/app/assets/stylesheets/govuk_publishing_components/components/_warning-text.scss b/app/assets/stylesheets/govuk_publishing_components/components/_warning-text.scss index 1c63f46733..6b962a2a51 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/_warning-text.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/_warning-text.scss @@ -1,5 +1,5 @@ @import "govuk_publishing_components/individual_component_support"; -@import "dist/govuk/components/warning-text/warning-text"; +@import "govuk/components/warning-text/warning-text"; .gem-c-warning-text .govuk-warning-text__text { margin: 0; diff --git a/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_button.scss b/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_button.scss index 934e6384f2..4bad6c948d 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_button.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_button.scss @@ -1,7 +1,7 @@ // stylelint-disable scss/at-extend-no-missing-placeholder .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 { - @import "dist/govuk/components/button/button"; + @import "govuk/components/button/button"; // Some links in Govspeak should look like buttons[1] when using: // ``` diff --git a/app/assets/stylesheets/govuk_publishing_components/govuk_frontend_support.scss b/app/assets/stylesheets/govuk_publishing_components/govuk_frontend_support.scss index 686efa0a01..504933a5d4 100644 --- a/app/assets/stylesheets/govuk_publishing_components/govuk_frontend_support.scss +++ b/app/assets/stylesheets/govuk_publishing_components/govuk_frontend_support.scss @@ -1,7 +1,7 @@ // 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 "dist/govuk/base"; +@import "govuk/base"; @import "components/mixins/margins"; // TODO: remove this focus override when govuk_template is no longer used