From d939c19222c69efdca328d1158614ec0b55a308d Mon Sep 17 00:00:00 2001 From: Tom Byers Date: Tue, 7 Jan 2020 12:55:21 +0000 Subject: [PATCH] Remove govuk_template compatibility flag We removed govuk_template when we moved to the GOVUK Frontend template.njk for our base layout. The flag was originally turned on under the assumption that the global CSS govuk_template adds would be present in our cascade. It fixes issues that CSS causes with the GOVUK Frontend CSS further down. This was mostly wrong, as we did remove the govuk_template code, but our situation is a bit different because when we removed it, we copied across some global styles it introduces to prevent problems with our own CSS. One of the side-effects of turning on this flag was that the Transport font was not being applied. This turns the flag off again, which replaces the font, and hard-codes in the fix having this flag would have brought in: a darker colour for link text when focused. --- app/assets/stylesheets/globals.scss | 5 ----- app/assets/stylesheets/govuk-frontend/_all.scss | 1 - 2 files changed, 6 deletions(-) diff --git a/app/assets/stylesheets/globals.scss b/app/assets/stylesheets/globals.scss index 8db4a7fc7..8863601cd 100644 --- a/app/assets/stylesheets/globals.scss +++ b/app/assets/stylesheets/globals.scss @@ -67,11 +67,6 @@ a { background-color: $focus-colour; outline: 3px solid $focus-colour; } - - /* Make links slightly darker when focused to improve contrast. */ - &:link:focus { - color: darken( $link-colour, 2.5%) - } } // Each selector, and then the whole block when only one remains, to be removed when the diff --git a/app/assets/stylesheets/govuk-frontend/_all.scss b/app/assets/stylesheets/govuk-frontend/_all.scss index e91af0467..1f013e2c6 100644 --- a/app/assets/stylesheets/govuk-frontend/_all.scss +++ b/app/assets/stylesheets/govuk-frontend/_all.scss @@ -6,7 +6,6 @@ // https://github.com/alphagov/govuk-frontend/blob/master/docs/installation/compatibility.md#turn-on-compatibility-mode // to be removed when these frameworks are removed. $govuk-compatibility-govukfrontendtoolkit: true; -$govuk-compatibility-govuktemplate: true; $govuk-compatibility-govukelements: true; // set asset URL root to match that of application