Revert "Fix button typeface and remove :link selectors"

This reverts commit bda73ad.
nationalarchives · Jul 25, 2024 · f427944 · f427944
1 parent bda73ad
commit f427944
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,13 +14,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Deprecated
 ### Removed
-
-- Removed styling for links with the `:link` pseudo class - all `<a>` elements should posess an `href` attribute by default
-
 ### Fixed
 
 - Further fixed gallery component layout when CSS loads but JS fails
-- Buttons using the `<button>` element now have the correct typeface (they were using the browser default)
 
 ### Security
 

diff --git a/src/nationalarchives/components/breadcrumbs/breadcrumbs.scss b/src/nationalarchives/components/breadcrumbs/breadcrumbs.scss
@@ -50,6 +50,7 @@
     display: inline-block;
 
     &,
+    &:link,
     &:visited {
       @include colour.colour-font("font-base");
     }
@@ -93,6 +94,7 @@
   @include colour.on-high-contrast {
     &__link {
       &,
+      &:link,
       &:visited {
         @include colour.colour-font("link");
       }

diff --git a/src/nationalarchives/components/button/button.scss b/src/nationalarchives/components/button/button.scss
@@ -23,7 +23,7 @@ $button-border-width: 4px !default;
   cursor: pointer;
 
   @include typography.font-size(18);
-  @include typography.main-font(true);
+  @include typography.main-font-weight-bold;
 
   @include colour.colour-background("button-background");
 
@@ -33,6 +33,7 @@ $button-border-width: 4px !default;
   print-color-adjust: exact;
 
   &,
+  &:link,
   &:visited {
     @include colour.colour-font("button-text");
   }
@@ -68,6 +69,7 @@ $button-border-width: 4px !default;
     border-color: transparent;
 
     &,
+    &:link,
     &:visited {
       @include colour.colour-font("link");
     }
@@ -88,6 +90,7 @@ $button-border-width: 4px !default;
     @include colour.colour-border("button-accented-background");
 
     &,
+    &:link,
     &:visited {
       @include colour.colour-font("button-accented-text");
     }
@@ -189,6 +192,7 @@ $button-border-width: 4px !default;
     @include colour.colour-border("button-background");
 
     &,
+    &:link,
     &:visited {
       @include colour.colour-font("button-text");
     }

diff --git a/src/nationalarchives/components/error-summary/error-summary.scss b/src/nationalarchives/components/error-summary/error-summary.scss
@@ -30,6 +30,7 @@
     @include typography.main-font-weight-bold;
 
     &,
+    &:link,
     &:visited {
       @include colour.colour-font("form-error-text");
     }

diff --git a/src/nationalarchives/components/global-header/global-header.scss b/src/nationalarchives/components/global-header/global-header.scss
@@ -46,6 +46,7 @@
 
     &--link {
       &,
+      &:link,
       &:visited {
         @include colour.colour-font("font-base");
       }
@@ -184,6 +185,7 @@
     @include colour.colour-border("keyline", 0.5px, solid, bottom);
 
     &,
+    &:link,
     &:visited {
       @include colour.colour-font("font-base");
     }
@@ -215,6 +217,7 @@
     text-decoration: none;
 
     &,
+    &:link,
     &:visited {
       @include colour.colour-font("font-light");
     }

diff --git a/src/nationalarchives/components/header/header.scss b/src/nationalarchives/components/header/header.scss
@@ -40,6 +40,7 @@
     @include typography.font-size(16);
 
     &,
+    &:link,
     &:visited {
       @include colour.colour-font("font-base");
     }
@@ -73,6 +74,7 @@
 
     &--link {
       &,
+      &:link,
       &:visited {
         color: inherit;
       }
@@ -218,13 +220,15 @@
     text-decoration: none;
 
     &,
+    &:link,
     &:visited {
       @include colour.colour-font("font-light");
     }
 
     &:hover,
     &--selected {
       &,
+      &:link,
       &:visited {
         @include colour.colour-font("font-base");
         @include typography.interacted-text-decoration;
@@ -278,6 +282,7 @@
     }
 
     &,
+    &:link,
     &:visited {
       color: inherit;
     }
@@ -357,6 +362,7 @@
 
     &__top-navigation-item-link {
       &,
+      &:link,
       &:visited {
         @include colour.colour-font("font-light");
       }

diff --git a/src/nationalarchives/components/index-grid/index-grid.scss b/src/nationalarchives/components/index-grid/index-grid.scss
@@ -64,6 +64,7 @@
 
     .tna-index-grid__item:hover & {
       &,
+      &:link,
       &:visited {
         @include typography.interacted-text-decoration;
       }

diff --git a/src/nationalarchives/components/quick-filters/quick-filters.scss b/src/nationalarchives/components/quick-filters/quick-filters.scss
@@ -46,6 +46,7 @@
     @include colour.colour-border("keyline", 1px);
 
     &,
+    &:link,
     &:visited {
       @include colour.colour-font("font-base");
     }
@@ -57,6 +58,7 @@
 
   &__item--selected &__link {
     &,
+    &:link,
     &:visited,
     &:hover {
       @include colour.accent;

diff --git a/src/nationalarchives/components/skip-link/skip-link.scss b/src/nationalarchives/components/skip-link/skip-link.scss
@@ -25,6 +25,7 @@
   clip-path: inset(50%) !important;
 
   &,
+  &:link,
   &:visited {
     @include colour.colour-font("button-text", $important: true);
   }

diff --git a/src/nationalarchives/components/tabs/tabs.scss b/src/nationalarchives/components/tabs/tabs.scss
@@ -43,6 +43,7 @@
     @include typography.heading-font;
 
     &,
+    &:link,
     &:visited {
       @include colour.colour-font("font-dark");
     }

diff --git a/src/nationalarchives/global-header-package.scss b/src/nationalarchives/global-header-package.scss
@@ -160,6 +160,7 @@ hr {
 
 .tna-button {
   &,
+  &:link,
   &:visited {
     text-decoration: none;
   }
@@ -181,6 +182,7 @@ hr {
 
       &-link {
         &,
+        &:link,
         &:visited {
           display: block;
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,6 +30,7 @@ @@
         @include typography.main-font-weight-bold;
         &,
+        &:link,
         &:visited {
           @include colour.colour-font("form-error-text");
         }
@@ Expand Down @@