Update the ccs frontend helpers package

Crown-Commercial-Service · Mar 14, 2024 · bad468d · bad468d
1 parent e2301a8
commit bad468d
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 28 deletions.
diff --git a/Gemfile b/Gemfile
@@ -47,7 +47,7 @@ gem 'aws-sdk-ssm', '~> 1.162.0'
 gem 'rack-attack', '~> 6.7.0'
 
 # GOV.UK Frontend helpers
-gem 'ccs-frontend_helpers', '~> 0.1.2'
+gem 'ccs-frontend_helpers', '~> 0.2.0'
 
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -127,7 +127,7 @@ GEM
       racc
     builder (3.2.4)
     byebug (11.1.3)
-    ccs-frontend_helpers (0.1.2)
+    ccs-frontend_helpers (0.2.0)
       rails (>= 6.0)
     concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
@@ -396,7 +396,7 @@ DEPENDENCIES
   brakeman (~> 6.1.2)
   byebug (~> 11.1.3)
   canonical-rails!
-  ccs-frontend_helpers (~> 0.1.2)
+  ccs-frontend_helpers (~> 0.2.0)
   dotenv-rails (~> 3.1.0)
   i18n-tasks (~> 1.0.13)
   jbuilder (~> 2.11, >= 2.11.5)

diff --git a/app/javascript/packs/govuk.js b/app/javascript/packs/govuk.js
@@ -1,3 +1,3 @@
-require("govuk-frontend/govuk/all").initAll()
-require.context('govuk-frontend/govuk/assets/images', true)
+require("govuk-frontend/dist/govuk/all").initAll()
+require.context('govuk-frontend/dist/govuk/assets/images', true)
 import "./stylesheets/govuk.scss"
diff --git a/app/javascript/packs/stylesheets/govuk.scss b/app/javascript/packs/stylesheets/govuk.scss
@@ -1,9 +1,9 @@
 @import url("https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700");
 
-$govuk-assets-path: "~govuk-frontend/govuk/assets/";
+$govuk-assets-path: "~govuk-frontend/dist/govuk/assets/";
 $govuk-button-background-colour: #007e8a;
 
-@import "govuk-frontend/govuk/all";
+@import "govuk-frontend/dist/govuk/all";
 @import "accessible-autocomplete";
 
 $ccs-border-colour: #b1b4b6;
@@ -77,10 +77,8 @@ $ccs-footer-columns-to-rows-point: 501px;
   // alphagov/govuk_template includes a specific a:link:focus selector
   // designed to make unvisited links a slightly darker blue when focussed, so
   // we need to override the text colour for that combination of selectors.
-  @include govuk-compatibility(govuk_template) {
-    &:link:focus {
-      @include govuk-text-colour;
-    }
+  &:link:focus {
+    @include govuk-text-colour;
   }
 }
 

diff --git a/app/views/layouts/_logo.html.erb b/app/views/layouts/_logo.html.erb
diff --git a/app/views/layouts/_logotype.html.erb b/app/views/layouts/_logotype.html.erb
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -10,8 +10,6 @@
   <meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover">
   <meta name="theme-color" content="blue" />
 
-  <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-
   <link rel="shortcut icon" sizes="16x16 32x32 48x48" href="<%= asset_pack_url('media/images/favicon.ico') %>" type="image/x-icon" />
   <link rel="mask-icon" href="<%= asset_pack_url('media/images/govuk-mask-icon.svg') %>" color="blue">
   <link rel="apple-touch-icon" sizes="180x180" href="<%= asset_pack_url('media/images/govuk-apple-touch-icon-180x180.png') %>">

diff --git a/app/views/layouts/error.html.erb b/app/views/layouts/error.html.erb
@@ -10,8 +10,6 @@
   <meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover">
   <meta name="theme-color" content="blue" />
 
-  <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-
   <link rel="shortcut icon" sizes="16x16 32x32 48x48" href="<%= asset_pack_url('media/images/favicon.ico') %>" type="image/x-icon" />
   <link rel="mask-icon" href="<%= asset_pack_url('media/images/govuk-mask-icon.svg') %>" color="blue">
   <link rel="apple-touch-icon" sizes="180x180" href="<%= asset_pack_url('media/images/govuk-apple-touch-icon-180x180.png') %>">