From f859d4e2ff3a841fb57c84cbe8bcd12bbcdba839 Mon Sep 17 00:00:00 2001 From: Andrew Hosgood Date: Mon, 6 Nov 2023 17:53:34 +0000 Subject: [PATCH] Update Node version and tna-frontend --- .metalsmith/markdownRenderer.js | 6 ++++++ .nvmrc | 2 +- layouts/_design-system-base.njk | 1 + layouts/collection-page.njk | 14 +++++++------- lib/index.scss | 7 +++++++ package-lock.json | 8 ++++---- package.json | 2 +- 7 files changed, 27 insertions(+), 13 deletions(-) diff --git a/.metalsmith/markdownRenderer.js b/.metalsmith/markdownRenderer.js index 22ba42c..a05d253 100644 --- a/.metalsmith/markdownRenderer.js +++ b/.metalsmith/markdownRenderer.js @@ -56,6 +56,12 @@ markdownRenderer.paragraph = function (text) {

`; }; +markdownRenderer.link = function (href, title, text) { + return `${text}`; +}; + markdownRenderer.table = function (head, body) { const formatRows = (row) => row diff --git a/.nvmrc b/.nvmrc index c32828c..0a47c85 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -lts/hydrogen \ No newline at end of file +lts/iron \ No newline at end of file diff --git a/layouts/_design-system-base.njk b/layouts/_design-system-base.njk index 5368391..eb56d04 100644 --- a/layouts/_design-system-base.njk +++ b/layouts/_design-system-base.njk @@ -47,6 +47,7 @@ {% block stylesheets %} + {% endblock %} {% block cookies %} diff --git a/layouts/collection-page.njk b/layouts/collection-page.njk index 7f80f24..70d2064 100644 --- a/layouts/collection-page.njk +++ b/layouts/collection-page.njk @@ -34,7 +34,7 @@
    {%- for heading in headings %}
  1. - + {{ heading.title }}
    2. @@ -51,33 +51,33 @@
      {% if not topLevel %}
    1. - {{ groupTitle }} overview + {{ groupTitle }} overview
      2. {% endif %} {% for item in collections[group] %} {% if item.path == path %}
    2. - {{ item.title }} + {{ item.title }} {% if headings %} {# TODO: Make a marco for this recursion #}
        {%- for heading in headings %}
      1. - + {{ heading.title }} {# {%- if heading.children %}
          {%- for child in heading.children %}
        1. - + {{ child.title }} {%- if child.children %}
            {%- for childChild in child.children %}
          1. - + {{ childChild.title }}
            2. @@ -95,7 +95,7 @@ {% else %}
          2. - {{ item.title }} + {{ item.title }}
            3. {% endif %} {% endfor %} diff --git a/lib/index.scss b/lib/index.scss index 076a355..ccfd82a 100644 --- 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 index 52ef23b..70ead06 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,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", @@ -2088,9 +2088,9 @@ } }, "node_modules/@nationalarchives/frontend": { - "version": "0.1.23-prerelease", - "resolved": "https://registry.npmjs.org/@nationalarchives/frontend/-/frontend-0.1.23-prerelease.tgz", - "integrity": "sha512-acThGLqcsVsYq2aDIYTbwR/JUGE0wGq2gPOBKriOgrXHE9gHFqjlx++fJBLsmH5hdVdlx7vPEp/Nnl8lpdglQQ==", + "version": "0.1.24-prerelease", + "resolved": "https://registry.npmjs.org/@nationalarchives/frontend/-/frontend-0.1.24-prerelease.tgz", + "integrity": "sha512-kIUiDaXJeNbLKrYzngRCrdDZ6MWaswEB+CdnLnEQzq2oXYHZ1m7/5BlZvE/jYI5mMCtpRDwCgN+sc86gUaQKYQ==", "engines": { "node": "18.x", "npm": "9.x" diff --git a/package.json b/package.json index e92eb65..d669287 100644 --- 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",