From 0ff6054dac2a72f70e2f7323d7914c28d1d10a3b Mon Sep 17 00:00:00 2001
From: Tom Byers <tombaromba@gmail.com>
Date: Fri, 22 Nov 2019 17:39:48 +0000
Subject: [PATCH] Move global CSS to top of cascade

The global CSS we're keeping from the GOVUK
Template styles needs to go in the same position
as it was before, above GOVUK Elements.

This means we can't use any variables from GOVUK
Frontend in it so this changes the link colour
back to what it was (until all links get updated).
---
 app/assets/stylesheets/globals.scss | 16 ++++++++++++----
 app/assets/stylesheets/main.scss    |  4 +++-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/globals.scss b/app/assets/stylesheets/globals.scss
index 309d7a4f0..e85cf2b69 100644
--- a/app/assets/stylesheets/globals.scss
+++ b/app/assets/stylesheets/globals.scss
@@ -42,12 +42,20 @@ input[type="search"]::-webkit-search-decoration {
 // To be removed when all links follow the GOV.UK Frontend conventions:
 // https://design-system.service.gov.uk/styles/typography/#links
 a {
-  @extend %govuk-link;
+  &:link {
+    color: $link-colour;
+  }
 
-  // Stops visited links looking different, until we can add the `govuk-link--no-visited-state`
-  // class to all links we want stay the same colour after visiting
   &:visited {
-    color: $govuk-link-colour;
+    color: $link-visited-colour;
+  }
+
+  &:hover {
+    color: $link-hover-colour;
+  }
+
+  &:active {
+    color: $link-active-colour;
   }
 }
 
diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss
index d415fbda5..d6b72051b 100644
--- a/app/assets/stylesheets/main.scss
+++ b/app/assets/stylesheets/main.scss
@@ -16,6 +16,9 @@ $path: '/static/images/';
 // Dependencies from GOVU.UK Frontend Toolkit, rewritten for this application
 @import 'url-helpers';
 
+// Specific to this application, needs to go at the top of the cascade
+@import 'globals';
+
 // Dependencies from GOV.UK Elements
 // https://github.com/alphagov/govuk_elements
 @import 'elements/helpers';
@@ -35,7 +38,6 @@ $path: '/static/images/';
 @import './govuk-frontend/all';
 
 // Specific to this application
-@import 'globals';
 @import 'grids';
 @import 'components/cookie-message';
 @import 'components/site-footer';