Skip to content

Commit f12f95c

Browse files
lfdebruxlfdebrux
committed
Changes for GOV.UK Frontend 6.0.0
- Remove references to the `$govuk-new-typography-scale` feature flag - Update any light blue, turquoise or pink tags - Use `govuk-functional-colour` to access functional colours - Remove rebrand switch from template - Move rebranded assets
1 parent b888c2e commit f12f95c

File tree

17 files changed

+13
-14
lines changed

17 files changed

+13
-14
lines changed

‎app/components/form_header_component/_index.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
}
88

99
.app-header--preview-live {
10-
border-bottom-color: govuk-colour("turquoise");
10+
border-bottom-color: govuk-colour("teal");
1111
}
1212

1313
.app-header .govuk-header__link--homepage {

‎app/components/form_header_component/view.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def environment_name
4444
def colour_for_environment
4545
case environment_name
4646
when "Local"
47-
"pink"
47+
"magenta"
4848
when "Development"
4949
"green"
5050
when "Staging"

‎app/components/language_switcher_component/_index.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ $app-language-switcher-list-gap: 0.25em;
1616
@include govuk-font($size: 16);
1717
margin: 0;
1818
padding-right: $app-language-switcher-list-gap;
19-
border-right: 1px solid $govuk-border-colour;
19+
border-right: 1px solid govuk-functional-colour(border);
2020
}
2121

2222
.app-language-switcher__list-item:last-child {

‎app/components/preview_component/view.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def phase_banner_colour
2121
elsif @mode.preview_archived?
2222
"orange"
2323
else
24-
"turquoise"
24+
"teal"
2525
end
2626
end
2727

‎app/frontend/entrypoints/application.scss‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
$govuk-assets-path: "@govuk/assets/";
22
$govuk-global-styles: true;
3-
$govuk-new-typography-scale: true;
43

54
@import "pkg:govuk-frontend";
65
@import "pkg:dfe-autocomplete";

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html>
2-
<html lang="<%= locale %>" class="govuk-template govuk-template--rebranded">
2+
<html lang="<%= locale %>" class="govuk-template">
33
<head>
44
<meta charset="utf-8">
55
<title><%= yield(:title) + " – GOV.UK" %></title>
@@ -9,14 +9,14 @@
99
<%= csp_meta_tag %>
1010

1111
<meta name="theme-color" content="#1d70b8">
12-
<link rel="icon" sizes="48x48" href="<%= vite_asset_path "#{govuk_assets_path}/rebrand/images/favicon.ico" %>">
13-
<link rel="icon" sizes="any" href="<%= vite_asset_path "#{govuk_assets_path}/rebrand/images/favicon.svg" %>" type="image/svg+xml">
14-
<link rel="mask-icon" href="<%= vite_asset_path "#{govuk_assets_path}/rebrand/images/govuk-icon-mask.svg" %>" color="#1d70b8">
15-
<link rel="apple-touch-icon" href="<%= vite_asset_path "#{govuk_assets_path}/rebrand/images/govuk-icon-180.png"%>">
12+
<link rel="icon" sizes="48x48" href="<%= vite_asset_path "#{govuk_assets_path}/images/favicon.ico" %>">
13+
<link rel="icon" sizes="any" href="<%= vite_asset_path "#{govuk_assets_path}/images/favicon.svg" %>" type="image/svg+xml">
14+
<link rel="mask-icon" href="<%= vite_asset_path "#{govuk_assets_path}/images/govuk-icon-mask.svg" %>" color="#1d70b8">
15+
<link rel="apple-touch-icon" href="<%= vite_asset_path "#{govuk_assets_path}/images/govuk-icon-180.png"%>">
1616
<%# This manifest file and the icons it references are currently being served from the `public` folder. %>
1717
<%# TODO: update the build to either generate the manifest with references to fingerprinted assets, or automatically copy the manifest and its dependencies to `public`. %>
18-
<link rel="manifest" href="/rebrand/manifest.json">
19-
<meta property="og:image" content="<%= vite_asset_path "#{govuk_assets_path}/rebrand/images/govuk-opengraph-image.png" %>">
18+
<link rel="manifest" href="/manifest.json">
19+
<meta property="og:image" content="<%= vite_asset_path "#{govuk_assets_path}/images/govuk-opengraph-image.png" %>">
2020

2121
<%= vite_stylesheet_tag 'application.scss' %>
2222

public/rebrand/images/favicon.ico renamed to public/images/favicon.ico

File renamed without changes.

public/rebrand/images/favicon.svg renamed to public/images/favicon.svg

File renamed without changes.

public/rebrand/images/govuk-crest.svg renamed to public/images/govuk-crest.svg

File renamed without changes.

public/rebrand/images/govuk-icon-180.png renamed to public/images/govuk-icon-180.png

File renamed without changes.

0 commit comments

Comments
 (0)