diff --git a/Gemfile.lock b/Gemfile.lock index 87bd7d7f8..66baceb21 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -103,6 +103,7 @@ GEM crass (1.0.6) csv (3.2.5) dalli (3.2.3) + date (3.3.1) debug_inspector (1.1.0) docile (1.4.0) domain_name (0.5.20190701) @@ -134,7 +135,7 @@ GEM govuk_personalisation (0.12.0) plek (>= 1.9.0) rails (>= 6, < 8) - govuk_publishing_components (33.1.0) + govuk_publishing_components (34.0.0) govuk_app_config govuk_personalisation (>= 0.7.0) kramdown @@ -203,11 +204,12 @@ GEM ruby-progressbar mocha (2.0.2) ruby2_keywords (>= 0.0.5) - net-imap (0.3.1) + net-imap (0.3.2) + date net-protocol net-pop (0.1.2) net-protocol - net-protocol (0.2.0) + net-protocol (0.2.1) timeout net-smtp (0.3.3) net-protocol diff --git a/app/assets/stylesheets/print.scss b/app/assets/stylesheets/print.scss index 422df5eb7..e20c3e258 100644 --- a/app/assets/stylesheets/print.scss +++ b/app/assets/stylesheets/print.scss @@ -1,11 +1,2 @@ -@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"; @import "print/html-publication"; @import "print/language_support"; diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 95ed603b6..db6cdc318 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -13,7 +13,7 @@ <% end %> - <%= stylesheet_link_tag "application", integrity: false %> + <%= stylesheet_link_tag "application", :media => "all", integrity: false %> <% if Rails.env.test? && params[:medium] == 'print' %> <%= stylesheet_link_tag "print.css", :media => "screen", integrity: false %> <% else %> diff --git a/config/initializers/govuk_publishing_components.rb b/config/initializers/govuk_publishing_components.rb index ce76ccb19..5321b45fd 100644 --- a/config/initializers/govuk_publishing_components.rb +++ b/config/initializers/govuk_publishing_components.rb @@ -1,4 +1,3 @@ GovukPublishingComponents.configure do |c| c.component_guide_title = "Government Frontend Component Guide" - c.application_print_stylesheet = "print" end