From 23ca5c93044a7b3088d7a96fbabc6ab7724770b4 Mon Sep 17 00:00:00 2001
From: Max Lehmann <max.lehmann@digital.cabinet-office.gov.uk>
Date: Thu, 5 Dec 2019 08:48:11 +0000
Subject: [PATCH 01/10] Use compatibility flag and remove manual fixes for gems

---
 app/assets/stylesheets/application.scss | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 544da17cd..b245e7ed5 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -1,5 +1,5 @@
 // The main application stylesheet
-
+$govuk-compatibility-govuktemplate: true;
 $govuk-typography-use-rem: false;
 
 // Components from govuk_publishing_components gem
@@ -47,16 +47,4 @@ $govuk-typography-use-rem: false;
 @import 'views/help-page';
 @import "views/guide";
 
-// TODO: This style overrides one coming from govuk-template
-// which turns the focused text colour blue instead of the expected black
-// on all components with its global 'a:link:focus' declaration. This
-// code should be removed when govuk-template is no longer used.
 
-a[class^="gem-c-"],
-*[class^="gem-c-"] a
- {
-  &:focus {
-    color: $govuk-focus-text-colour !important;
-    text-decoration: none;
-  }
-}

From 428e8a4533493d4bed5c2ae4fbf3d8b83c63ce23 Mon Sep 17 00:00:00 2001
From: Max Lehmann <max.lehmann@digital.cabinet-office.gov.uk>
Date: Thu, 5 Dec 2019 09:48:35 +0000
Subject: [PATCH 02/10] Explicitly turn off legacy colours

---
 app/assets/stylesheets/application.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index b245e7ed5..c57b7470c 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -1,6 +1,7 @@
 // The main application stylesheet
 $govuk-compatibility-govuktemplate: true;
 $govuk-typography-use-rem: false;
+$govuk-use-legacy-palette: false;
 
 // Components from govuk_publishing_components gem
 @import 'govuk_publishing_components/all_components';

From 8bbc4f83a37573e9aef3e0acc5b8a75565aa00bd Mon Sep 17 00:00:00 2001
From: Max Lehmann <max.lehmann@digital.cabinet-office.gov.uk>
Date: Thu, 5 Dec 2019 09:51:14 +0000
Subject: [PATCH 03/10] Remove override mixin

---
 .../mixins/_govuk-template-link-focus-override.scss      | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 app/assets/stylesheets/mixins/_govuk-template-link-focus-override.scss

diff --git a/app/assets/stylesheets/mixins/_govuk-template-link-focus-override.scss b/app/assets/stylesheets/mixins/_govuk-template-link-focus-override.scss
deleted file mode 100644
index a32091473..000000000
--- a/app/assets/stylesheets/mixins/_govuk-template-link-focus-override.scss
+++ /dev/null
@@ -1,9 +0,0 @@
-// TODO: Remove when appropriate
-// govuk_template overrides the styles set by
-// govuk-frontend 3.0.0. This mixin is intended as a temporary fix
-// to ensure focus styles are as expected in apps using govuk_template
-
-@mixin govuk-template-link-focus-override {
-  @include govuk-focused-text;
-  color: govuk-colour("black") !important;
-}

From 4502dbcb4da96430536c96870b9eb47e5d251a51 Mon Sep 17 00:00:00 2001
From: Max Lehmann <max.lehmann@digital.cabinet-office.gov.uk>
Date: Thu, 5 Dec 2019 09:47:37 +0000
Subject: [PATCH 04/10] Update back to top links

---
 app/assets/stylesheets/components/_back-to-top.scss | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/assets/stylesheets/components/_back-to-top.scss b/app/assets/stylesheets/components/_back-to-top.scss
index 0169d4475..7d110405b 100644
--- a/app/assets/stylesheets/components/_back-to-top.scss
+++ b/app/assets/stylesheets/components/_back-to-top.scss
@@ -3,11 +3,6 @@
   margin-bottom: govuk-spacing(3);
   margin-left: govuk-spacing(3);
   margin-right: govuk-spacing(3);
-
-  &:focus {
-    @include govuk-template-link-focus-override;
-  }
-
 }
 
 .app-c-back-to-top__icon {

From e3f2cb2867da39db33cdce0f3615546b7fa73c6c Mon Sep 17 00:00:00 2001
From: Max Lehmann <max.lehmann@digital.cabinet-office.gov.uk>
Date: Thu, 5 Dec 2019 09:49:13 +0000
Subject: [PATCH 05/10] Update download link

---
 app/assets/stylesheets/components/_download-link.scss | 4 ----
 app/views/components/_download-link.html.erb          | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/components/_download-link.scss b/app/assets/stylesheets/components/_download-link.scss
index 8d5a3ae54..f8529cbf9 100644
--- a/app/assets/stylesheets/components/_download-link.scss
+++ b/app/assets/stylesheets/components/_download-link.scss
@@ -4,10 +4,6 @@
   margin-top: govuk-spacing(3);
   margin-bottom: govuk-spacing(3);
 
-  &:focus {
-    @include govuk-template-link-focus-override;
-  }
-
   @include govuk-media-query($from: tablet) {
     margin-top: govuk-spacing(6);
   }
diff --git a/app/views/components/_download-link.html.erb b/app/views/components/_download-link.html.erb
index f3b7e2301..2f0bd3fc4 100644
--- a/app/views/components/_download-link.html.erb
+++ b/app/views/components/_download-link.html.erb
@@ -2,7 +2,7 @@
   link_text ||= "Download File"
 %>
 
-<a class="app-c-download-link" href="<%= href %>">
+<a class="app-c-download-link govuk-link" href="<%= href %>">
   <svg class="app-c-download-link__icon"
         aria-hidden="true"
         viewBox="0 0 25 25"

From f1ed785a63a0b7b3c76c84378b6297dfd9b03e9b Mon Sep 17 00:00:00 2001
From: Max Lehmann <max.lehmann@digital.cabinet-office.gov.uk>
Date: Thu, 5 Dec 2019 10:01:46 +0000
Subject: [PATCH 06/10] Update important metadata

---
 app/assets/stylesheets/components/_important-metadata.scss | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/assets/stylesheets/components/_important-metadata.scss b/app/assets/stylesheets/components/_important-metadata.scss
index 36c68d014..689c43e78 100644
--- a/app/assets/stylesheets/components/_important-metadata.scss
+++ b/app/assets/stylesheets/components/_important-metadata.scss
@@ -31,10 +31,6 @@
 
   .app-link {
     color: govuk-colour("white");
-
-    &:focus {
-      @include govuk-template-link-focus-override;
-    }
   }
 
 }

From 77f6bd8238bb6c4da36f22121ad304a53016544b Mon Sep 17 00:00:00 2001
From: Max Lehmann <max.lehmann@digital.cabinet-office.gov.uk>
Date: Thu, 5 Dec 2019 10:24:54 +0000
Subject: [PATCH 07/10] Update published dates

---
 .../stylesheets/components/_published-dates.scss      | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/app/assets/stylesheets/components/_published-dates.scss b/app/assets/stylesheets/components/_published-dates.scss
index 5775c0a73..3187e1e55 100644
--- a/app/assets/stylesheets/components/_published-dates.scss
+++ b/app/assets/stylesheets/components/_published-dates.scss
@@ -9,17 +9,6 @@
   .js-enabled & {
     display: inline-block;
   }
-
-  &:focus {
-    @include govuk-template-link-focus-override;
-  }
-
-}
-
-.app-c-published-dates__history-link {
-  &:focus {
-    @include govuk-template-link-focus-override;
-  }
 }
 
 .app-c-published-dates__change-history {

From 79fb936b9d8d097e6fa9848290758bb0d69c2745 Mon Sep 17 00:00:00 2001
From: Max Lehmann <max.lehmann@digital.cabinet-office.gov.uk>
Date: Thu, 5 Dec 2019 10:58:37 +0000
Subject: [PATCH 08/10] Update publisher metadata

---
 app/assets/stylesheets/components/_publisher-metadata.scss | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/components/_publisher-metadata.scss b/app/assets/stylesheets/components/_publisher-metadata.scss
index c82bcec9c..7b2d6cff2 100644
--- a/app/assets/stylesheets/components/_publisher-metadata.scss
+++ b/app/assets/stylesheets/components/_publisher-metadata.scss
@@ -4,11 +4,10 @@
   padding-top: govuk-spacing(3);
 }
 
-.app-c-publisher-metadata__other a {
-  font-weight: bold;
+.app-c-publisher-metadata__other {
 
-  &:focus {
-    @include govuk-template-link-focus-override;
+  .govuk-link {
+    font-weight: bold;
   }
 }
 

From ad5138ae48117d8a433f6a3a036a0325b00f84a5 Mon Sep 17 00:00:00 2001
From: Max Lehmann <max.lehmann@digital.cabinet-office.gov.uk>
Date: Thu, 5 Dec 2019 11:16:24 +0000
Subject: [PATCH 09/10] Update parts navigation

---
 app/assets/stylesheets/helpers/_parts.scss | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/assets/stylesheets/helpers/_parts.scss b/app/assets/stylesheets/helpers/_parts.scss
index 310af2d2e..39c653e45 100644
--- a/app/assets/stylesheets/helpers/_parts.scss
+++ b/app/assets/stylesheets/helpers/_parts.scss
@@ -24,10 +24,6 @@
     li {
       list-style: none;
       margin-bottom: 0.75em;
-
-      a:focus {
-        @include govuk-template-link-focus-override;
-      }
     }
   }
 

From 2d2ef0376b3f2f23527e2f73694d2c259a733cc3 Mon Sep 17 00:00:00 2001
From: Max Lehmann <max.lehmann@digital.cabinet-office.gov.uk>
Date: Thu, 5 Dec 2019 11:42:08 +0000
Subject: [PATCH 10/10] Fix white links focus state

---
 app/assets/stylesheets/mixins/_white-links.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/mixins/_white-links.scss b/app/assets/stylesheets/mixins/_white-links.scss
index 202aba360..99de7d32b 100644
--- a/app/assets/stylesheets/mixins/_white-links.scss
+++ b/app/assets/stylesheets/mixins/_white-links.scss
@@ -7,7 +7,7 @@
   }
 
   a:focus {
-    @include govuk-template-link-focus-override;
+    @include govuk-focused-text;
   }
 
   a:active {