Fix linting and test errors

nationalarchives · Nov 9, 2023 · 00fc210 · 00fc210
1 parent f5d0572
commit 00fc210
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,7 +16,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-- Moved TypeKit Supria Sans stylesheet to `govuk-prototype-kit.config.json`
 - Change many instances of Font Awesome icons to a fixed width
 - Adjusted the width of the hero caption
 - Removed margin and padding from all elements by default

diff --git a/govuk-prototype-kit.config.json b/govuk-prototype-kit.config.json
@@ -9,8 +9,7 @@
     "/nationalarchives/assets"
   ],
   "stylesheets": [
-    "/nationalarchives/prototype-kit.css",
-    "https://use.typekit.net/hkj3kuz.css"
+    "/nationalarchives/prototype-kit.css"
   ],
   "templates": [
     {

diff --git a/src/nationalarchives/components/cookie-banner/fixtures.json b/src/nationalarchives/components/cookie-banner/fixtures.json
@@ -27,15 +27,6 @@
       "html": "<div class=\"tna-cookie-banner \" role=\"region\" aria-label=\"Cookie usage\" data-module=\"tna-cookie-banner\" data-policies=\"custom\" data-preferenceskey=\"cookies_preferences_set\" hidden><div class=\"tna-container\"><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--prompt\"><h2 class=\"tna-heading-m\">This website uses cookies</h2><p>We use some essential cookies to make this service work.</p><p>We'd also like to use analytics cookies so we can understand how you use the service and make improvements.</p><div class=\"tna-button-group\"><button class=\"tna-button \" value=\"accept\">Accept cookies</button><button class=\"tna-button \" value=\"reject\">Reject cookies</button><a href=\"/cookies\" class=\"tna-button tna-button--plain\" role=\"button\">Set cookie preferences</a></div></div><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--accepted\" tabindex=\"0\" hidden><p>You have accepted optional cookies. You can change your cookie settings on the <a href=\"/cookies\">Cookies page</a>.</p><div class=\"tna-button-group\"><button class=\"tna-button \" value=\"close\">Close this message</button></div></div><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--rejected\" tabindex=\"0\" hidden><p>You have rejected optional cookies. You can change your cookie settings on the <a href=\"/cookies\">Cookies page</a>.</p><div class=\"tna-button-group\"><button class=\"tna-button \" value=\"close\">Close this message</button></div></div></div></div>",
       "hidden": false
     },
-    {
-      "name": "add scripts on accept",
-      "options": {
-        "cookiesUrl": "/cookies",
-        "loadScriptsOnAccept": "my-usage-script.js"
-      },
-      "html": "<div class=\"tna-cookie-banner \" role=\"region\" aria-label=\"Cookie usage\" data-module=\"tna-cookie-banner\" data-policies=\"usage,settings\" data-preferenceskey=\"cookies_preferences_set\" data-acceptscripts=\"my-usage-script.js\" hidden><div class=\"tna-container\"><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--prompt\"><h2 class=\"tna-heading-m\">This website uses cookies</h2><p>We use some essential cookies to make this service work.</p><p>We'd also like to use analytics cookies so we can understand how you use the service and make improvements.</p><div class=\"tna-button-group\"><button class=\"tna-button \" value=\"accept\">Accept cookies</button><button class=\"tna-button \" value=\"reject\">Reject cookies</button><a href=\"/cookies\" class=\"tna-button tna-button--plain\" role=\"button\">Set cookie preferences</a></div></div><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--accepted\" tabindex=\"0\" hidden><p>You have accepted optional cookies. You can change your cookie settings on the <a href=\"/cookies\">Cookies page</a>.</p><div class=\"tna-button-group\"><button class=\"tna-button \" value=\"close\">Close this message</button></div></div><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--rejected\" tabindex=\"0\" hidden><p>You have rejected optional cookies. You can change your cookie settings on the <a href=\"/cookies\">Cookies page</a>.</p><div class=\"tna-button-group\"><button class=\"tna-button \" value=\"close\">Close this message</button></div></div></div></div>",
-      "hidden": false
-    },
     {
       "name": "with classes",
       "options": {

diff --git a/src/nationalarchives/templates/layouts/_prototype-kit.njk b/src/nationalarchives/templates/layouts/_prototype-kit.njk
@@ -4,6 +4,7 @@
 
 {% block stylesheets %}
   {% include "govuk-prototype-kit/includes/stylesheets-plugins.njk" %}
+  <link rel="stylesheet" type="text/css" href="https://use.typekit.net/hkj3kuz.css">
 {% endblock %}
 
 {% block bodyEnd %}

diff --git a/src/nationalarchives/utilities/_tables.scss b/src/nationalarchives/utilities/_tables.scss
@@ -27,8 +27,7 @@
   &__head {
   }
 
-  &__head &__header {
-    @include colour.colour-border("keyline-dark", 0.25rem, solid, bottom);
+  &__header {
   }
 
   &__body {
@@ -37,6 +36,9 @@
   &__row {
   }
 
+  &__cell {
+  }
+
   &__header,
   &__cell {
     padding: 0.25rem 1rem;
@@ -52,10 +54,8 @@
     }
   }
 
-  &__header {
-  }
-
-  &__cell {
+  &__head &__header {
+    @include colour.colour-border("keyline-dark", 0.25rem, solid, bottom);
   }
 
   p {