diff --git a/CHANGELOG.md b/CHANGELOG.md index b781e661..5f0b831e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ ## Unreleased +### New features + +- Update the Crown logo and govuk-frontend + + See [pull request #344: Upgrade govuk-frontend and the crown logo](https://github.com/alphagov/tech-docs-gem/pull/344) for more details. + +https://github.com/alphagov/tech-docs-gem/pull/344 + ## 3.4.0 ### New features diff --git a/lib/assets/stylesheets/_govuk_tech_docs.scss b/lib/assets/stylesheets/_govuk_tech_docs.scss index 3080ec35..4006d118 100644 --- a/lib/assets/stylesheets/_govuk_tech_docs.scss +++ b/lib/assets/stylesheets/_govuk_tech_docs.scss @@ -1,3 +1,10 @@ +// IE8 support is removed in govuk-frontend v5 +// but as we still use IE8 mixin and generate a +// separate stylesheet, we'll supress the warning for now +// https://frontend.design-system.service.gov.uk/sass-api-reference/#govuk-suppressed-warnings +$govuk-suppressed-warnings: ( + ie8 +); $govuk-assets-path: "/assets/govuk/assets/" !default; // Include only the bits of GOV.UK Frontend we need @@ -20,3 +27,9 @@ $govuk-new-link-styles: true; @import "core"; @import "vendor/fixedsticky"; + +// manual Tudor Crown spacing adjustment from govuk-frontend 4.8 +.govuk-header__logotype-crown[width="32"] { + top: -3px; + margin-right: 2px; +} diff --git a/lib/source/favicon.ico b/lib/source/favicon.ico index da3760d3..20129a0b 100644 Binary files a/lib/source/favicon.ico and b/lib/source/favicon.ico differ diff --git a/lib/source/layouts/_header.erb b/lib/source/layouts/_header.erb index 0493287f..9bb7bd0e 100644 --- a/lib/source/layouts/_header.erb +++ b/lib/source/layouts/_header.erb @@ -7,21 +7,19 @@ <% end %> <% if config[:tech_docs][:show_govuk_logo] %> - - + GOV.UK diff --git a/package-lock.json b/package-lock.json index 60d5b363..f656391b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,7 +7,7 @@ "name": "tech-docs-gem", "license": "MIT", "dependencies": { - "govuk-frontend": "^4.4.1" + "govuk-frontend": "~4.7.0" }, "devDependencies": { "standard": "^14.3.4" @@ -1053,9 +1053,9 @@ } }, "node_modules/govuk-frontend": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-4.4.1.tgz", - "integrity": "sha512-Jm1LUWiH9vy47b6HSH/ksSb4ueBrtTTgyLBk+3X2qqAmmFUc1AXWLSYHid07YYu1tvn9RnodWk5Bac5Ywqk6tA==", + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-4.7.0.tgz", + "integrity": "sha512-0OsdCusF5qvLWwKziU8zqxiC0nq6WP0ZQuw51ymZ/1V0tO71oIKMlSLN2S9bm8RcEGSoidPt2A34gKxePrLjvg==", "engines": { "node": ">= 4.2.0" } @@ -3508,9 +3508,9 @@ } }, "govuk-frontend": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-4.4.1.tgz", - "integrity": "sha512-Jm1LUWiH9vy47b6HSH/ksSb4ueBrtTTgyLBk+3X2qqAmmFUc1AXWLSYHid07YYu1tvn9RnodWk5Bac5Ywqk6tA==" + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-4.7.0.tgz", + "integrity": "sha512-0OsdCusF5qvLWwKziU8zqxiC0nq6WP0ZQuw51ymZ/1V0tO71oIKMlSLN2S9bm8RcEGSoidPt2A34gKxePrLjvg==" }, "graceful-fs": { "version": "4.2.6", diff --git a/package.json b/package.json index 63ed809a..7326e95c 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "lint": "standard" }, "dependencies": { - "govuk-frontend": "^4.4.1" + "govuk-frontend": "~4.7.0" }, "devDependencies": { "standard": "^14.3.4"