From 2da21a38ac3bd69793fc9e30287288b3cd7af006 Mon Sep 17 00:00:00 2001 From: Alex Jurubita Date: Tue, 9 Apr 2019 15:35:51 +0100 Subject: [PATCH 1/2] Enforce compatibility with deprecated packages for media print --- .../govuk_publishing_components/_all_components_print.scss | 2 ++ .../components/helpers/_govuk-frontend-settings.scss | 1 + 2 files changed, 3 insertions(+) diff --git a/app/assets/stylesheets/govuk_publishing_components/_all_components_print.scss b/app/assets/stylesheets/govuk_publishing_components/_all_components_print.scss index 65fa6a3a07..1ee2320973 100644 --- a/app/assets/stylesheets/govuk_publishing_components/_all_components_print.scss +++ b/app/assets/stylesheets/govuk_publishing_components/_all_components_print.scss @@ -1,6 +1,8 @@ // This is the file that the application needs to include in order to use // the components. +@import "components/helpers/govuk-frontend-settings"; + // `govuk_frontend_toolkit` @import "measurements"; @import "grid_layout"; diff --git a/app/assets/stylesheets/govuk_publishing_components/components/helpers/_govuk-frontend-settings.scss b/app/assets/stylesheets/govuk_publishing_components/components/helpers/_govuk-frontend-settings.scss index 9e94bcddc0..f56aa96812 100644 --- a/app/assets/stylesheets/govuk_publishing_components/components/helpers/_govuk-frontend-settings.scss +++ b/app/assets/stylesheets/govuk_publishing_components/components/helpers/_govuk-frontend-settings.scss @@ -1,5 +1,6 @@ $govuk-image-url-function: "image-url"; $govuk-font-url-function: "font-url"; +$govuk-compatibility-govukfrontendtoolkit: true; $govuk-compatibility-govuktemplate: true; $govuk-compatibility-govukelements: true; $govuk-typography-use-rem: false; From 5b59d67fc7bfba74394b63755ce46afad5f09427 Mon Sep 17 00:00:00 2001 From: Alex Jurubita Date: Tue, 9 Apr 2019 16:01:13 +0100 Subject: [PATCH 2/2] Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b275156c8c..2ee1001256 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 + +- Enforce compatibility with deprecated packages for media print stylesheet (PR #815) + ## 16.10.0 - Support dynamic resizing of the modal component (PR #812)