From 4c29d29a87b6b5e0d35b3b2766d672ebb1eec758 Mon Sep 17 00:00:00 2001 From: Ian James Date: Wed, 6 Jul 2022 12:31:57 +0100 Subject: [PATCH 1/2] Remove stylesheets and JavaScript served by Static --- app/assets/javascripts/application.js | 2 -- app/assets/stylesheets/application.scss | 11 ----------- app/assets/stylesheets/print.scss | 1 - 3 files changed, 14 deletions(-) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 55897cec8..3a439839d 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -1,9 +1,7 @@ //= require govuk_publishing_components/lib //= require govuk_publishing_components/components/accordion -//= require govuk_publishing_components/components/button //= require govuk_publishing_components/components/details //= require govuk_publishing_components/components/error-summary -//= require govuk_publishing_components/components/feedback //= require govuk_publishing_components/components/govspeak //= require govuk_publishing_components/components/metadata //= require govuk_publishing_components/components/print-link diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index bbcebe931..81fa46257 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -6,32 +6,23 @@ $govuk-new-link-styles: true; // Components from govuk_publishing_components gem @import "govuk_publishing_components/govuk_frontend_support"; -@import "govuk_publishing_components/component_support"; @import "govuk_publishing_components/components/accordion"; @import "govuk_publishing_components/components/attachment"; @import "govuk_publishing_components/components/back-link"; @import "govuk_publishing_components/components/big-number"; -@import "govuk_publishing_components/components/breadcrumbs"; -@import "govuk_publishing_components/components/button"; @import "govuk_publishing_components/components/contents-list"; @import "govuk_publishing_components/components/contextual-sidebar"; @import "govuk_publishing_components/components/details"; @import "govuk_publishing_components/components/devolved-nations"; @import "govuk_publishing_components/components/document-list"; -@import "govuk_publishing_components/components/error-message"; @import "govuk_publishing_components/components/error-summary"; -@import "govuk_publishing_components/components/feedback"; @import "govuk_publishing_components/components/fieldset"; @import "govuk_publishing_components/components/govspeak"; @import "govuk_publishing_components/components/govspeak-html-publication"; -@import "govuk_publishing_components/components/heading"; -@import "govuk_publishing_components/components/hint"; @import "govuk_publishing_components/components/image-card"; -@import "govuk_publishing_components/components/input"; @import "govuk_publishing_components/components/inset-text"; @import "govuk_publishing_components/components/inverse-header"; -@import "govuk_publishing_components/components/label"; @import "govuk_publishing_components/components/lead-paragraph"; @import "govuk_publishing_components/components/metadata"; @import "govuk_publishing_components/components/notice"; @@ -48,9 +39,7 @@ $govuk-new-link-styles: true; @import "govuk_publishing_components/components/step-by-step-nav-related"; @import "govuk_publishing_components/components/subscription-links"; @import "govuk_publishing_components/components/success-alert"; -@import "govuk_publishing_components/components/title"; @import "govuk_publishing_components/components/translation-nav"; -@import "govuk_publishing_components/components/skip-link"; // government-frontend mixins @import "mixins/margins"; diff --git a/app/assets/stylesheets/print.scss b/app/assets/stylesheets/print.scss index 21235304a..af2ef37cc 100644 --- a/app/assets/stylesheets/print.scss +++ b/app/assets/stylesheets/print.scss @@ -1,5 +1,4 @@ @import "govuk_publishing_components/govuk_frontend_support"; -@import "govuk_publishing_components/components/print/button"; @import "govuk_publishing_components/components/print/contents-list"; @import "govuk_publishing_components/components/print/govspeak"; @import "govuk_publishing_components/components/print/govspeak-html-publication"; From 9933e366a04bf73e9a60b2c56f40ecfe3b8abbbf Mon Sep 17 00:00:00 2001 From: Ian James Date: Wed, 6 Jul 2022 12:38:53 +0100 Subject: [PATCH 2/2] Add missing stylesheets to the print stylesheet Both the accordion and organisation logo components have print stylesheets, which weren't being included in this app's print stylesheet. --- app/assets/stylesheets/print.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/assets/stylesheets/print.scss b/app/assets/stylesheets/print.scss index af2ef37cc..422df5eb7 100644 --- a/app/assets/stylesheets/print.scss +++ b/app/assets/stylesheets/print.scss @@ -1,7 +1,9 @@ @import "govuk_publishing_components/govuk_frontend_support"; +@import "govuk_publishing_components/components/print/accordion"; @import "govuk_publishing_components/components/print/contents-list"; @import "govuk_publishing_components/components/print/govspeak"; @import "govuk_publishing_components/components/print/govspeak-html-publication"; +@import "govuk_publishing_components/components/print/organisation-logo"; @import "govuk_publishing_components/components/print/step-by-step-nav"; @import "govuk_publishing_components/components/print/step-by-step-nav-header"; @import "govuk_publishing_components/components/print/title";