From 308f9980d3eff6ed60aadcdb2ee85a28a7434ba0 Mon Sep 17 00:00:00 2001
From: Tom Byers <tombaromba@gmail.com>
Date: Wed, 16 Sep 2020 14:43:48 +0100
Subject: [PATCH] Fixes for focus issues on /templates page(s)

Includes:
- fixes for the cancel button, when selecting a
  template type (after clicking 'New template')
- making the folder icon black, to match the text,
  on template list items
---
 app/assets/stylesheets/components/message.scss            | 4 ++++
 .../components/stick-at-top-when-scrolling.scss           | 8 +++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/components/message.scss b/app/assets/stylesheets/components/message.scss
index d783f7d5b..07691834d 100644
--- a/app/assets/stylesheets/components/message.scss
+++ b/app/assets/stylesheets/components/message.scss
@@ -147,6 +147,10 @@ $message-type-bottom-spacing: govuk-spacing(4);
       background-image: file-url('folder-blue-bold-hover.svg');
     }
 
+    &:focus {
+      background-image: file-url('folder-black-bold.svg');
+    }
+
   }
 
   &-template {
diff --git a/app/assets/stylesheets/components/stick-at-top-when-scrolling.scss b/app/assets/stylesheets/components/stick-at-top-when-scrolling.scss
index 14afd4352..acadbbe16 100644
--- a/app/assets/stylesheets/components/stick-at-top-when-scrolling.scss
+++ b/app/assets/stylesheets/components/stick-at-top-when-scrolling.scss
@@ -145,11 +145,9 @@ $sticky-padding: govuk-spacing(4);
     color: $link-hover-colour;
   }
 
-  &:focus,
-  &:active, {
-    background: $yellow;
-    color: $govuk-blue;
-    outline: none;
+  &:focus {
+    /* override default box shadow to stop it looking so large vertically */
+    box-shadow: inset 0 -4px $govuk-focus-text-colour;
   }
 
 }