Update GOV UK sass import statements

DFE-Digital · Mar 13, 2024 · 26099ea · 26099ea
1 parent e85ff04
commit 26099ea
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/app/assets/stylesheets/application.sass.scss b/app/assets/stylesheets/application.sass.scss
@@ -1,8 +1,9 @@
 $govuk-global-styles: true;
 $govuk-new-link-styles: true;
+$govuk-new-typography-scale: true;
 $govuk-assets-path: "/";
 
-@import "govuk-frontend/govuk/all";
+@import "govuk-frontend/dist/govuk/all";
 
 .hub-results {
   border-top: 1px solid govuk-colour("mid-grey");

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -18,12 +18,12 @@
     <%= tag :meta, name: 'viewport', content: 'width=device-width, initial-scale=1' %>
     <%= tag :meta, property: 'og:image', content: asset_path('images/govuk-opengraph-image.png') %>
     <%= tag :meta, name: 'theme-color', content: '#0b0c0c' %>
-    <%= favicon_link_tag asset_path('images/favicon.ico') %>
-    <%= favicon_link_tag asset_path('images/govuk-mask-icon.svg'), rel: 'mask-icon', type: 'image/svg', color: "#0b0c0c" %>
-    <%= favicon_link_tag asset_path('images/govuk-apple-touch-icon.png'), rel: 'apple-touch-icon', type: 'image/png' %>
-    <%= favicon_link_tag asset_path('images/govuk-apple-touch-icon-152x152.png'), rel: 'apple-touch-icon', type: 'image/png', size: '152x152' %>
-    <%= favicon_link_tag asset_path('images/govuk-apple-touch-icon-167x167.png'), rel: 'apple-touch-icon', type: 'image/png', size: '167x167' %>
-    <%= favicon_link_tag asset_path('images/govuk-apple-touch-icon-180x180.png'), rel: 'apple-touch-icon', type: 'image/png', size: '180x180' %>
+    <%= favicon_link_tag asset_path('images/favicon.ico'), size: '48x48' %>
+    <%= favicon_link_tag asset_path('images/favicon.ico'), type: 'image/svg+xml', size: 'any' %>
+    <%= favicon_link_tag asset_path('images/govuk-icon-mask.svg'), rel: 'mask-icon', type: 'image/svg', color: "#0b0c0c" %>
+    <%= favicon_link_tag asset_path('images/govuk-icon-180.png'), rel: 'apple-touch-icon', type: 'image/png' %>
+    <%= favicon_link_tag asset_path('images/govuk-icon-192.png'), rel: 'apple-touch-icon', type: 'image/png', size: '192x192' %>
+    <%= favicon_link_tag asset_path('images/govuk-icon-512.png'), rel: 'apple-touch-icon', type: 'image/png', size: '512x512' %>
 
     <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %>
     <%= javascript_include_tag "application", "data-turbo-track": "reload", defer: true %>

diff --git a/config/application.rb b/config/application.rb
@@ -31,7 +31,7 @@ class Application < Rails::Application
     # config.time_zone = "Central Time (US & Canada)"
     # config.eager_load_paths << Rails.root.join("extras")
 
-    config.assets.paths << Rails.root.join('node_modules/govuk-frontend/govuk/assets')
+    config.assets.paths << Rails.root.join('node_modules/govuk-frontend/dist/govuk/assets')
 
     config.exceptions_app = routes
   end

diff --git a/spec/fixtures/vcr_cassettes/geocoder.yml b/spec/fixtures/vcr_cassettes/geocoder.yml
@@ -151,4 +151,4 @@ http_interactions:
           } ]
         }
   recorded_at: Thu, 07 Mar 2024 11:38:13 GMT
-recorded_with: VCR 6.2.0
+recorded_with: VCR 6.2.0