Skip to content

Commit c9a8461

Browse files
tim-s-ccstim-s-ccs
committed
Update the ccs frontend helpers package
1 parent e2301a8 commit c9a8461

11 files changed

+29
-48
lines changed

‎Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ gem 'aws-sdk-ssm', '~> 1.162.0'
4747
gem 'rack-attack', '~> 6.7.0'
4848

4949
# GOV.UK Frontend helpers
50-
gem 'ccs-frontend_helpers', '~> 0.1.2'
50+
gem 'ccs-frontend_helpers', '~> 0.2.0'
5151

5252
group :development, :test do
5353
# Call 'byebug' anywhere in the code to stop execution and get a debugger console

‎Gemfile.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ GEM
127127
racc
128128
builder (3.2.4)
129129
byebug (11.1.3)
130-
ccs-frontend_helpers (0.1.2)
130+
ccs-frontend_helpers (0.2.0)
131131
rails (>= 6.0)
132132
concurrent-ruby (1.2.3)
133133
connection_pool (2.4.1)
@@ -396,7 +396,7 @@ DEPENDENCIES
396396
brakeman (~> 6.1.2)
397397
byebug (~> 11.1.3)
398398
canonical-rails!
399-
ccs-frontend_helpers (~> 0.1.2)
399+
ccs-frontend_helpers (~> 0.2.0)
400400
dotenv-rails (~> 3.1.0)
401401
i18n-tasks (~> 1.0.13)
402402
jbuilder (~> 2.11, >= 2.11.5)

‎app/javascript/packs/govuk.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
require("govuk-frontend/govuk/all").initAll()
2-
require.context('govuk-frontend/govuk/assets/images', true)
1+
require("govuk-frontend/dist/govuk/all").initAll()
2+
require.context('govuk-frontend/dist/govuk/assets/images', true)
33
import "./stylesheets/govuk.scss"

‎app/javascript/packs/stylesheets/govuk.scss

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
@import url("https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700");
22

3-
$govuk-assets-path: "~govuk-frontend/govuk/assets/";
3+
$govuk-assets-path: "~govuk-frontend/dist/govuk/assets/";
44
$govuk-button-background-colour: #007e8a;
55

6-
@import "govuk-frontend/govuk/all";
6+
@import "govuk-frontend/dist/govuk/all";
77
@import "accessible-autocomplete";
88

99
$ccs-border-colour: #b1b4b6;
@@ -77,10 +77,8 @@ $ccs-footer-columns-to-rows-point: 501px;
7777
// alphagov/govuk_template includes a specific a:link:focus selector
7878
// designed to make unvisited links a slightly darker blue when focussed, so
7979
// we need to override the text colour for that combination of selectors.
80-
@include govuk-compatibility(govuk_template) {
81-
&:link:focus {
82-
@include govuk-text-colour;
83-
}
80+
&:link:focus {
81+
@include govuk-text-colour;
8482
}
8583
}
8684

‎app/views/layouts/_logo.html.erb

-10
This file was deleted.

‎app/views/layouts/_logotype.html.erb

-3
This file was deleted.

‎app/views/layouts/application.html.erb

+10-12
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,14 @@
88
<%= csp_meta_tag %>
99

1010
<meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover">
11-
<meta name="theme-color" content="blue" />
11+
<meta name="theme-color" content="#0b0c0c" />
1212

13-
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
14-
15-
<link rel="shortcut icon" sizes="16x16 32x32 48x48" href="<%= asset_pack_url('media/images/favicon.ico') %>" type="image/x-icon" />
16-
<link rel="mask-icon" href="<%= asset_pack_url('media/images/govuk-mask-icon.svg') %>" color="blue">
17-
<link rel="apple-touch-icon" sizes="180x180" href="<%= asset_pack_url('media/images/govuk-apple-touch-icon-180x180.png') %>">
18-
<link rel="apple-touch-icon" sizes="167x167" href="<%= asset_pack_url('media/images/govuk-apple-touch-icon-167x167.png') %>">
19-
<link rel="apple-touch-icon" sizes="152x152" href="<%= asset_pack_url('media/images/govuk-apple-touch-icon-152x152.png') %>">
20-
<link rel="apple-touch-icon" href="<%= asset_pack_url('media/images/govuk-apple-touch-icon.png') %>">
13+
<link rel="icon" sizes="48x48" href="<%= asset_pack_url('media/images/favicon.ico') %>">
14+
<link rel="icon" sizes="any" href="<%= asset_pack_url('media/images/favicon.svg') %>" type="image/svg+xml">
15+
<link rel="mask-icon" href="<%= asset_pack_url('media/images/govuk-icon-mask.svg') %>" color="#0b0c0c">
16+
<link rel="apple-touch-icon" sizes="180x180" href="<%= asset_pack_url('media/images/govuk-icon-180.png') %>">
17+
<link rel="apple-touch-icon" sizes="192x192" href="<%= asset_pack_url('media/images/govuk-icon-192.png') %>">
18+
<link rel="apple-touch-icon" sizes="512x512" href="<%= asset_pack_url('media/images/govuk-icon-512.png') %>">
2119

2220
<%= stylesheet_pack_tag 'govuk' %>
2321

@@ -30,11 +28,11 @@
3028
<%= canonical_tag %>
3129
</head>
3230

33-
<body class="govuk-template__body app-body-class" data-test="My value" data-other="report:details">
31+
<body class="govuk-template__body">
3432
<%= render partial: '/shared/google/tag_manager_body' if PmpIdam.google_tag_manager_tracking_id.present? %>
3533

3634
<%= javascript_tag nonce: true do -%>
37-
document.body.className = ((document.body.className) ? document.body.className + ' js-enabled' : 'js-enabled');
35+
document.body.className += ' js-enabled' + ('noModule' in HTMLScriptElement.prototype ? ' govuk-frontend-supported' : '');
3836
<% end -%>
3937

4038
<div id="wrapper">
@@ -52,7 +50,7 @@
5250
<%= render partial: '/layouts/footer' %>
5351
</div>
5452

55-
<%= javascript_pack_tag 'govuk', 'data-turbolinks-track': 'reload' %>
53+
<%= javascript_pack_tag 'govuk', 'data-turbolinks-track': 'reload', type: 'module' %>
5654
</body>
5755

5856
</html>

‎app/views/layouts/error.html.erb

+10-12
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,14 @@
88
<%= csp_meta_tag %>
99

1010
<meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover">
11-
<meta name="theme-color" content="blue" />
11+
<meta name="theme-color" content="#0b0c0c" />
1212

13-
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
14-
15-
<link rel="shortcut icon" sizes="16x16 32x32 48x48" href="<%= asset_pack_url('media/images/favicon.ico') %>" type="image/x-icon" />
16-
<link rel="mask-icon" href="<%= asset_pack_url('media/images/govuk-mask-icon.svg') %>" color="blue">
17-
<link rel="apple-touch-icon" sizes="180x180" href="<%= asset_pack_url('media/images/govuk-apple-touch-icon-180x180.png') %>">
18-
<link rel="apple-touch-icon" sizes="167x167" href="<%= asset_pack_url('media/images/govuk-apple-touch-icon-167x167.png') %>">
19-
<link rel="apple-touch-icon" sizes="152x152" href="<%= asset_pack_url('media/images/govuk-apple-touch-icon-152x152.png') %>">
20-
<link rel="apple-touch-icon" href="<%= asset_pack_url('media/images/govuk-apple-touch-icon.png') %>">
13+
<link rel="icon" sizes="48x48" href="<%= asset_pack_url('media/images/favicon.ico') %>">
14+
<link rel="icon" sizes="any" href="<%= asset_pack_url('media/images/favicon.svg') %>" type="image/svg+xml">
15+
<link rel="mask-icon" href="<%= asset_pack_url('media/images/govuk-icon-mask.svg') %>" color="#0b0c0c">
16+
<link rel="apple-touch-icon" sizes="180x180" href="<%= asset_pack_url('media/images/govuk-icon-180.png') %>">
17+
<link rel="apple-touch-icon" sizes="192x192" href="<%= asset_pack_url('media/images/govuk-icon-192.png') %>">
18+
<link rel="apple-touch-icon" sizes="512x512" href="<%= asset_pack_url('media/images/govuk-icon-512.png') %>">
2119

2220
<%= stylesheet_pack_tag 'govuk' %>
2321

@@ -30,11 +28,11 @@
3028
<%= canonical_tag %>
3129
</head>
3230

33-
<body class="govuk-template__body app-body-class error-box" data-test="My value" data-other="report:details">
31+
<body class="govuk-template__body">
3432
<%= render partial: '/shared/google/tag_manager_body' if PmpIdam.google_tag_manager_tracking_id.present? %>
3533

3634
<%= javascript_tag nonce: true do -%>
37-
document.body.className = ((document.body.className) ? document.body.className + ' js-enabled' : 'js-enabled');
35+
document.body.className += ' js-enabled' + ('noModule' in HTMLScriptElement.prototype ? ' govuk-frontend-supported' : '');
3836
<% end -%>
3937

4038
<div class="error-content">
@@ -52,7 +50,7 @@
5250

5351
<%= render partial: '/layouts/footer' %>
5452

55-
<%= javascript_pack_tag 'govuk', 'data-turbolinks-track': 'reload' %>
53+
<%= javascript_pack_tag 'govuk', 'data-turbolinks-track': 'reload', type: 'module' %>
5654
</body>
5755

5856
</html>

‎public/apple-touch-icon-precomposed.png

Whitespace-only changes.

‎public/apple-touch-icon.png

Whitespace-only changes.

‎public/favicon.ico

Whitespace-only changes.

0 commit comments

Comments
 (0)