From baf0767392ba08e934a2975bf9a991314fefb408 Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 11 Feb 2021 12:31:31 +0000 Subject: [PATCH 1/3] Update govuk_frontend_support.scss Prefer the equivalent `govuk/base` imports for simplicity --- .../govuk_publishing_components/govuk_frontend_support.scss | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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 2342620bdd..2bed5dea7e 100644 --- a/app/assets/stylesheets/govuk_publishing_components/govuk_frontend_support.scss +++ b/app/assets/stylesheets/govuk_publishing_components/govuk_frontend_support.scss @@ -1,9 +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 "govuk/settings/all"; -@import "govuk/tools/all"; -@import "govuk/helpers/all"; +@import "govuk/base"; $govuk-colours-organisations: map-merge( $govuk-colours-organisations, ( From e8c0e6b510335788419fb3b31fec8e0ad864480a Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 11 Feb 2021 12:32:55 +0000 Subject: [PATCH 2/3] Remove FCDO colour This wes introduced in https://github.com/alphagov/govuk-frontend/pull/1918 and is no longer needed since govuk-frontend 3.9.0 --- .../govuk_frontend_support.scss | 8 -------- 1 file changed, 8 deletions(-) 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 2bed5dea7e..f526dc5f5b 100644 --- a/app/assets/stylesheets/govuk_publishing_components/govuk_frontend_support.scss +++ b/app/assets/stylesheets/govuk_publishing_components/govuk_frontend_support.scss @@ -2,11 +2,3 @@ // It provides govuk-frontend but adds no weight to the compiled CSS @import "components/helpers/govuk-frontend-settings"; @import "govuk/base"; -$govuk-colours-organisations: map-merge( - $govuk-colours-organisations, - ( - "foreign-commonwealth-development-office": ( - colour: #012169 - ) - ) -); From 9b053ac2f9d4710d60657a82cdad7aab9872ecab Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 11 Feb 2021 18:17:13 +0000 Subject: [PATCH 3/3] Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e2378d8de..90530405d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ useful summary for people upgrading their application, not a replication of the commit log. +## Unreleased + +* Update `govuk-frontend` base SCSS imports ([PR #1922](https://github.com/alphagov/govuk_publishing_components/pull/1922)) + ## 24.1.0 * Update `data-module` on layout header and footer ([PR #1913](https://github.com/alphagov/govuk_publishing_components/pull/1913))