Merge pull request #14 from tim-s-ccs/v0.2.1

V0.2.1
tim-s-ccs · Jan 25, 2022 · cc289bf · cc289bf
2 parents bc59f95 + ac33b01
commit cc289bf
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 12 deletions.
diff --git a/dist/VERSION.txt b/dist/VERSION.txt
@@ -1 +1 @@
-0.2.0
+0.2.1
diff --git a/dist/ccs-components-0.2.0.min.css → dist/ccs-components-0.2.1.min.css b/dist/ccs-components-0.2.0.min.css → dist/ccs-components-0.2.1.min.css
diff --git a/dist/ccs-components-0.2.0.min.js → dist/ccs-components-0.2.1.min.js b/dist/ccs-components-0.2.0.min.js → dist/ccs-components-0.2.1.min.js
diff --git a/dist/ccs-components-ie8-0.2.0.min.css → dist/ccs-components-ie8-0.2.1.min.css b/dist/ccs-components-ie8-0.2.0.min.css → dist/ccs-components-ie8-0.2.1.min.css
diff --git a/package/ccs/components/footer/_index.scss b/package/ccs/components/footer/_index.scss
@@ -26,7 +26,17 @@
 
   .ccs-footer__link {
     @include govuk-link-common;
-    color: $ccs-footer-text;
+
+    &:link,
+    &:visited,
+    &:hover {
+      color: $ccs-footer-text;
+    }
+
+    &:hover,
+    &:focus {
+      color: $govuk-focus-text-colour;
+    }
 
     // alphagov/govuk_template includes a specific a:link:focus selector
     // designed to make unvisited links a slightly darker blue when focussed, so

diff --git a/package/ccs/components/header/_index.scss b/package/ccs/components/header/_index.scss
@@ -111,8 +111,8 @@
       text-decoration: none;
     }
 
-    &:hover,
-    &:active {
+    &:hover:not(:focus),
+    &:active:not(:focus) {
       // Negate the added border
       margin-bottom: -1px;
       // Omitting colour will use default value of currentColor – if we
@@ -123,7 +123,6 @@
     // Remove any borders that show when focused and hovered.
     &:focus {
       margin-bottom: 0;
-      border-bottom: 0;
     }
   }
 

diff --git a/package/package.json b/package/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ts-ccs-components",
   "description": "CCS Components contains the code you need to start building a user interface for CCS platforms and services.",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "main": "ccs/all.js",
   "sass": "ccs/all.scss",
   "engines": {

diff --git a/src/ccs/components/footer/_index.scss b/src/ccs/components/footer/_index.scss
@@ -26,7 +26,17 @@
 
   .ccs-footer__link {
     @include govuk-link-common;
-    color: $ccs-footer-text;
+
+    &:link,
+    &:visited,
+    &:hover {
+      color: $ccs-footer-text;
+    }
+
+    &:hover,
+    &:focus {
+      color: $govuk-focus-text-colour;
+    }
 
     // alphagov/govuk_template includes a specific a:link:focus selector
     // designed to make unvisited links a slightly darker blue when focussed, so

diff --git a/src/ccs/components/header/_index.scss b/src/ccs/components/header/_index.scss
@@ -111,8 +111,8 @@
       text-decoration: none;
     }
 
-    &:hover,
-    &:active {
+    &:hover:not(:focus),
+    &:active:not(:focus) {
       // Negate the added border
       margin-bottom: -1px;
       // Omitting colour will use default value of currentColor – if we
@@ -123,7 +123,6 @@
     // Remove any borders that show when focused and hovered.
     &:focus {
       margin-bottom: 0;
-      border-bottom: 0;
     }
   }