Update Node version and tna-frontend

nationalarchives · Nov 6, 2023 · f859d4e · f859d4e
1 parent 5b46b34
commit f859d4e
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 13 deletions.
diff --git a/.metalsmith/markdownRenderer.js b/.metalsmith/markdownRenderer.js
@@ -56,6 +56,12 @@ markdownRenderer.paragraph = function (text) {
   </p>`;
 };
 
+markdownRenderer.link = function (href, title, text) {
+  return `<a href="${href}" class="tna-link--no-visited-state"${
+    title ? ` title="${title}"` : ""
+  }>${text}</a>`;
+};
+
 markdownRenderer.table = function (head, body) {
   const formatRows = (row) =>
     row

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-lts/hydrogen
+lts/iron
diff --git a/layouts/_design-system-base.njk b/layouts/_design-system-base.njk
@@ -47,6 +47,7 @@
 
 {% block stylesheets %}
   <link rel="stylesheet" href="/design-system/css/index.css">
+  <link rel="stylesheet" href="https://use.typekit.net/hkj3kuz.css">
 {% endblock %}
 
 {% block cookies %}

diff --git a/layouts/collection-page.njk b/layouts/collection-page.njk
@@ -34,7 +34,7 @@
       <ol class="tna-ol tna-ol--plain- tna-!--hide-on-large tna-!--hide-on-medium">
         {%- for heading in headings %}
         <li>
-          <a href="#{{ heading.href }}">
+          <a href="#{{ heading.href }}" class="tna-link--no-visited-state">
             {{ heading.title }}
           </a>
         </li>
@@ -51,33 +51,33 @@
       <ol class="tna-ds-sidebar">
       {% if not topLevel %}
         <li class="tna-ds-sidebar__item">
-          <a href="/design-system/{{ group }}" class="tna-ds-sidebar__link">{{ groupTitle }} overview</a>
+          <a href="/design-system/{{ group }}" class="tna-ds-sidebar__link tna-link--no-visited-state">{{ groupTitle }} overview</a>
         </li>
       {% endif %}
       {% for item in collections[group] %}
         {% if item.path == path %}
         <li class="tna-ds-sidebar__item tna-ds-sidebar__item--current">
-          <a href="/design-system/{{ item.path }}" class="tna-ds-sidebar__link">{{ item.title }}</a>
+          <a href="/design-system/{{ item.path }}" class="tna-ds-sidebar__link tna-link--no-visited-state">{{ item.title }}</a>
           {% if headings %}
           {# TODO: Make a marco for this recursion #}
           <ol class="tna-ds-sidebar__sections tna-!--hide-on-small tna-!--hide-on-tiny">
             {%- for heading in headings %}
             <li class="tna-ds-sidebar__section">
-              <a href="#{{ heading.href }}" class="tna-ds-sidebar__section-link">
+              <a href="#{{ heading.href }}" class="tna-ds-sidebar__section-link tna-link--no-visited-state">
                 {{ heading.title }}
               </a>
               {# {%- if heading.children %}
               <ol class="tna-ds-sidebar__sections">
                 {%- for child in heading.children %}
                 <li class="tna-ds-sidebar__section">
-                  <a href="#{{ child.href }}" class="tna-ds-sidebar__section-link">
+                  <a href="#{{ child.href }}" class="tna-ds-sidebar__section-link tna-link--no-visited-state">
                     {{ child.title }}
                   </a>
                   {%- if child.children %}
                   <ol class="tna-ds-sidebar__sections">
                     {%- for childChild in child.children %}
                     <li class="tna-ds-sidebar__section">
-                      <a href="#{{ childChild.href }}" class="tna-ds-sidebar__section-link">
+                      <a href="#{{ childChild.href }}" class="tna-ds-sidebar__section-link tna-link--no-visited-state">
                         {{ childChild.title }}
                       </a>
                     </li>
@@ -95,7 +95,7 @@
         </li>
         {% else %}
         <li class="tna-ds-sidebar__item">
-          <a href="/design-system/{{ item.path }}" class="tna-ds-sidebar__link">{{ item.title }}</a>
+          <a href="/design-system/{{ item.path }}" class="tna-ds-sidebar__link tna-link--no-visited-state">{{ item.title }}</a>
         </li>
         {% endif %}
       {% endfor %}

diff --git a/lib/index.scss b/lib/index.scss
@@ -319,6 +319,13 @@ table {
     line-height: 1.5rem;
     text-align: center;
 
+    &,
+    &:link,
+    &:visited,
+    &:active {
+      @include colour.colour-font("link");
+    }
+
     &::after {
       display: none;
     }

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -40,7 +40,7 @@
     "@metalsmith/markdown": "^1.10.0",
     "@metalsmith/permalinks": "^2.5.1",
     "@metalsmith/sass": "^1.6.0",
-    "@nationalarchives/frontend": "^0.1.23-prerelease",
+    "@nationalarchives/frontend": "0.1.24-prerelease",
     "glob": "^10.3.4",
     "gray-matter": "^4.0.3",
     "js-beautify": "^1.14.8",