From 067e4a99e834b4a73dce43828d59b6e62738e113 Mon Sep 17 00:00:00 2001 From: rasikasri <44141067+rasikasri@users.noreply.github.com> Date: Wed, 8 May 2024 09:24:39 +0100 Subject: [PATCH] GL-79: Upgrade GovUK Frontend libraries (#782) * GL-79: Upgrade GovUK Frontend libraries --- Gemfile.lock | 6 +-- app/views/layouts/application.html.erb | 41 ++++++++++--------- app/views/navbar/_main.html.erb | 6 ++- .../calculations/_options_summary.html.erb | 2 +- app/webpacker/packs/application.js | 4 +- app/webpacker/styles/application.scss | 2 +- config/webpacker.yml | 2 +- package.json | 2 +- yarn.lock | 8 ++-- 9 files changed, 38 insertions(+), 35 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 8f75a204..dad06772 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -169,7 +169,7 @@ GEM sentry-rails (~> 5.3) sentry-ruby (~> 5.3) statsd-ruby (~> 1.5) - govuk_design_system_formbuilder (4.1.1) + govuk_design_system_formbuilder (5.3.3) actionview (>= 6.1) activemodel (>= 6.1) activesupport (>= 6.1) @@ -221,7 +221,7 @@ GEM marcel (1.0.2) method_source (1.0.0) mini_mime (1.1.5) - mini_portile2 (2.8.5) + mini_portile2 (2.8.6) minitest (5.22.3) msgpack (1.7.2) multipart-post (2.3.0) @@ -238,7 +238,7 @@ GEM net-smtp (0.4.0) net-protocol nio4r (2.7.0) - nokogiri (1.16.3) + nokogiri (1.16.4) mini_portile2 (~> 2.8.2) racc (~> 1.4) opentelemetry-api (1.2.3) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 9534a471..ff919868 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -9,12 +9,10 @@ <%= tag :meta, name: 'theme-color', content: '#0b0c0c' %> <%= tag :meta, name: 'robots', content: 'noindex,nofollow' %> <%= render partial: 'layouts/google_tag_manager' %> - <%= favicon_link_tag asset_pack_path('media/images/favicon.ico') %> - <%= favicon_link_tag asset_pack_path('media/images/govuk-mask-icon.svg'), rel: 'mask-icon', type: 'image/svg', color: "#0b0c0c" %> - <%= favicon_link_tag asset_pack_path('media/images/govuk-apple-touch-icon.png'), rel: 'apple-touch-icon', type: 'image/png' %> - <%= favicon_link_tag asset_pack_path('media/images/govuk-apple-touch-icon-152x152.png'), rel: 'apple-touch-icon', type: 'image/png', size: '152x152' %> - <%= favicon_link_tag asset_pack_path('media/images/govuk-apple-touch-icon-167x167.png'), rel: 'apple-touch-icon', type: 'image/png', size: '167x167' %> - <%= favicon_link_tag asset_pack_path('media/images/govuk-apple-touch-icon-180x180.png'), rel: 'apple-touch-icon', type: 'image/png', size: '180x180' %> + <%= favicon_link_tag asset_pack_path('media/images/favicon.ico'), sizes: '48x48' %> + <%= favicon_link_tag asset_pack_path('media/images/favicon.svg'), sizes: 'any' %> + <%= favicon_link_tag asset_pack_path('media/images/govuk-icon-mask.svg'), rel: 'mask-icon', type: 'image/svg', color: "#0b0c0c" %> + <%= favicon_link_tag asset_pack_path('media/images/govuk-icon-180.png'), rel: 'apple-touch-icon', type: 'image/png' %> <%= stylesheet_pack_tag 'application', 'data-turbolinks-track': 'reload', media: 'all' %> <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload', defer: true %> @@ -22,25 +20,28 @@ <%= render partial: 'layouts/google_tag_manager_no_script' %> <%= javascript_tag nonce: true do -%> - document.body.className = ((document.body.className) ? document.body.className + ' js-enabled' : 'js-enabled'); + document.body.className += ' js-enabled' + ('noModule' in HTMLScriptElement.prototype ? ' govuk-frontend-supported' : ''); <% end -%> Skip to main content -