npm - @nationalarchives/frontend - Versions diffs - 0.34.1 → 0.35.1 - Mend

@nationalarchives/frontend 0.34.1 → 0.35.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (55) hide show

package/nationalarchives/templates/layouts/_generic.njk CHANGED Viewed

@@ -1,9 +1,9 @@
 {# Based on https://github.com/alphagov/govuk-frontend/blob/8b6bf304b9fc891f64459c25a08f3d623f3fea72/packages/govuk-frontend/src/govuk/template.njk #}
-{%- from 'nationalarchives/components/cookie-banner/macro.njk' import tnaCookieBanner -%}
-{%- from 'nationalarchives/components/footer/macro.njk' import tnaFooter -%}
-{%- from 'nationalarchives/components/header/macro.njk' import tnaHeader -%}
-{%- from 'nationalarchives/components/skip-link/macro.njk' import tnaSkipLink -%}
+{%- from "nationalarchives/components/cookie-banner/macro.njk" import tnaCookieBanner -%}
+{%- from "nationalarchives/components/footer/macro.njk" import tnaFooter -%}
+{%- from "nationalarchives/components/header/macro.njk" import tnaHeader -%}
+{%- from "nationalarchives/components/skip-link/macro.njk" import tnaSkipLink -%}
 {%- set defaultSiteTitle = 'The National Archives' -%}
@@ -11,7 +11,7 @@
 <html lang="{{ htmlLang | default('en') }}" class="tna-template{% if theme and theme != 'light' %} tna-template--{{ theme }}-theme{% endif %}{% if themeAccent %} tna-template--{{ themeAccent }}-accent{% endif %}{% if htmlClasses %} {{ htmlClasses }}{% endif %}"{% for attribute, value in htmlAttributes %} {{ attribute }}{% if value !== '' %}="{{ value }}"{% endif %}{% endfor %}>
   <head>
     <meta charset="utf-8">
-    <title>{% block pageTitle %}{% if pageTitle %}{{ pageTitle }} - {{ siteTitle or defaultSiteTitle }}{% else %}{{ siteTitle or defaultSiteTitle }}{% endif %}{% endblock %}</title>
+    <title>{% block pageTitle %}{% if pageTitle %}{{ pageTitle }} - {{ siteTitle or defaultSiteTitle }}{% else %}{{ siteTitle or defaultSiteTitle }}{% endif %}{% endblock pageTitle %}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover">
     <meta name="theme-color" content="{{ themeColor | default('#010101') }}">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -31,11 +31,11 @@
     <link rel="apple-touch-icon" sizes="256x256" href="{{ assetPath | default('/assets/') }}images/icon-256x256.png">
     <link rel="apple-touch-icon" sizes="512x512" href="{{ assetPath | default('/assets/') }}images/icon-512x512.png">
     <link rel="apple-touch-icon" sizes="1024x1024" href="{{ assetPath | default('/assets/') }}images/icon-1024x1024.png">
-    {% endblock %}
+    {% endblock headIcons %}
-    {% block head %}{% endblock %}
+    {% block head %}{% endblock head %}
-    {% block stylesheets %}{% endblock %}
+    {% block stylesheets %}{% endblock stylesheets %}
   </head>
   <body class="tna-template__body{% if bodyClasses %} {{ bodyClasses }}{% endif %}"{% for attribute, value in bodyAttributes %} {{ attribute }}{% if value !== '' %}="{{ value }}"{% endif %}{% endfor %}>
     {% block bodyStart %}
@@ -45,32 +45,32 @@
         {{ tnaCookieBanner({
           cookiesUrl: '#/cookies'
         }) | indent(6) }}
-      {% endblock %}
+      {% endblock cookies %}
       {% block skipLink %}
       {{ tnaSkipLink({
         href: 'main-content',
         text: 'Skip to main content'
       }) | indent(6) }}
-      {% endblock %}
-    {% endblock %}
+      {% endblock skipLink %}
+    {% endblock bodyStart %}
     {% block header %}
       {{ tnaHeader({}) | indent(4) }}
-    {% endblock %}
+    {% endblock header %}
     {% block main %}
-      {% block beforeContent %}{% endblock %}
+      {% block beforeContent %}{% endblock beforeContent %}
       <main class="tna-main{% if mainClasses %} {{ mainClasses }}{% endif %}" id="main-content">
-        {% block content %}{% endblock %}
+        {% block content %}{% endblock content %}
       </main>
-      {% block afterContent %}{% endblock %}
-    {% endblock %}
+      {% block afterContent %}{% endblock afterContent %}
+    {% endblock main %}
     {% block footer %}
       {{ tnaFooter({}) | indent(4) }}
-    {% endblock %}
+    {% endblock footer %}
-    {% block bodyEnd %}{% endblock %}
+    {% block bodyEnd %}{% endblock bodyEnd %}
   </body>
 </html>

package/nationalarchives/templates/{email.njk → layouts/email.njk} RENAMED Viewed

@@ -1,6 +1,6 @@
-{%- from 'nationalarchives/components/button/macro.njk' import tnaButton -%}
-{%- from 'nationalarchives/components/panel/macro.njk' import tnaPanel -%}
-{% from "nationalarchives/templates/partials/logo.njk" import tnaLogo %}
+{%- from "nationalarchives/components/button/macro.njk" import tnaButton -%}
+{%- from "nationalarchives/components/panel/macro.njk" import tnaPanel -%}
+{%- from "nationalarchives/templates/partials/logo/macro.njk" import tnaLogo -%}
 <!DOCTYPE html>
 <html lang="en" class="tna-template tna-template--green-accent tna-template--system-theme">

package/nationalarchives/templates/partials/logo/macro.njk ADDED Viewed

@@ -0,0 +1,3 @@
+{% macro tnaLogo(params) %}
+  {%- include "nationalarchives/templates/partials/logo/template.njk" -%}
+{% endmacro %}

package/nationalarchives/templates/partials/logo/template.njk ADDED Viewed

@@ -0,0 +1,9 @@
+<span class="tna-logo{% if params.solid %} tna-logo--solid{% endif %}{% if params.adornable %} tna-logo--adornable{% endif %}">
+  <svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 160 160" width="{{ params.size or '96' }}" height="{{ params.size or '96' }}" aria-hidden="true" focusable="false">
+    <path class="tna-logo__background" fill="transparent" d="M0 0h160v160H0z" />
+    <g class="tna-logo__foreground" fill="currentColor">
+      <path d="M1.9 107.2h156.3V158H1.9v-50.8zm0-52.7h156.3v50.8H1.9V54.5zm0-52.6h77.2v50.8H1.9V1.9zm79 0h77.2v50.8H80.9V1.9zm0-1.9H0v160h160V0H80.9z" />
+      <path d="M21.3 19.5h-5.4v-3h14.3v3h-5.4v18.4h-3.5zM31.6 16.5H35v9h8.4v-9h3.4v21.4h-3.4v-9.3H35v9.3h-3.4zM50.9 16.5h12.2v3h-8.8v6.1h7.4v3h-7.4v6.3h8.8v3H50.9zM19.7 69.2h3.8l6.4 12.5c.6 1.1 1.1 2.7 1.6 4h.2c-.2-1.7-.3-3.6-.3-4.8V69.2h3.5v21.4h-3.7l-6.3-12.3c-.7-1.4-1.2-2.7-1.7-4.2H23c.2 1.4.3 3.3.3 5v11.5h-3.5c-.1 0-.1-21.4-.1-21.4zM47.8 82.6l-1.7-6.3c-.3-1.1-.6-2.2-.9-3.8H45c-.3 1.6-.5 2.6-.8 3.8l-1.7 6.3h5.3zM43 69.2h4.2l6.2 21.4h-3.5l-1.5-5.2h-6.6l-1.4 5.2h-3.6L43 69.2zM57.2 72.3h-5.4v-3.1H66v3.1h-5.4v18.4h-3.4zM67.8 69.2h3.5v21.4h-3.5zM87.5 80c0-5.3-1.7-8-4.8-8-3.2 0-4.8 2.7-4.8 8 0 5.2 1.6 7.9 4.8 7.9 3.2 0 4.8-2.7 4.8-7.9m-13.3 0c0-7 3-11.1 8.5-11.1 5.4 0 8.4 4.1 8.4 11.1 0 6.9-3 11-8.4 11s-8.5-4.1-8.5-11M94.3 69.2H98l6.4 12.5c.6 1.1 1.2 2.7 1.7 4h.2c-.2-1.7-.3-3.6-.3-4.8V69.2h3.4v21.4h-3.7l-6.3-12.3c-.7-1.4-1.2-2.7-1.7-4.2h-.2c.2 1.4.3 3.3.3 5v11.5h-3.5V69.2zM122.4 82.6l-1.7-6.3c-.3-1.1-.6-2.2-.9-3.8h-.2c-.3 1.6-.5 2.6-.8 3.8l-1.7 6.3h5.3zm-4.8-13.4h4.2l6.2 21.4h-3.5l-1.5-5.2h-6.6l-1.4 5.2h-3.6l6.2-21.4zM129.9 69.2h3.5v18.4h8.4v3.1h-11.9zM26.9 135.2l-1.7-6.3c-.3-1.1-.6-2.2-.9-3.8h-.2c-.3 1.6-.5 2.6-.8 3.8l-1.7 6.3h5.3zm-4.8-13.4h4.2l6.2 21.4H29l-1.5-5.2h-6.6l-1.4 5.2h-3.6l6.2-21.4zM39.9 132.5c2.5 0 3.4-1.6 3.4-3.9 0-2.2-1-3.8-3.4-3.8h-2.7v7.7h2.7zm-6.1-10.7h6.4c4.5 0 6.7 2.4 6.7 6.6 0 3.1-1.5 5.6-3.7 6.3v.2c1 1.1 4 7.5 4.8 7.9v.5h-3.8c-1-.6-3.6-7.2-4.4-7.8h-2.5v7.8h-3.5v-21.5zM52.9 132.5c0 5.3 1.9 8 4.8 8s4-2 4-5.2l3.5.1c0 .2.1.4.1.6 0 4.4-2.1 7.5-7.5 7.5-5.2 0-8.5-3.9-8.5-11.1 0-7.1 3.3-11 8.5-11 6.4 0 7.5 4.6 7.5 7.2 0 .3 0 .7-.1.9l-3.5.1c0-3.3-1.2-5.2-4-5.2-2.9.2-4.8 2.9-4.8 8.1M68 121.8h3.5v9.1h8.3v-9.1h3.5v21.5h-3.5v-9.4h-8.3v9.4H68zM87.9 121.8h3.5v21.4h-3.5zM94.2 121.8h3.6l3.2 12.3c.5 1.9.8 3.6 1.1 5.6h.2c.3-2 .6-3.7 1.1-5.6l3.2-12.3h3.6l-6.1 21.4H100l-5.8-21.4zM112.7 121.8H125v3.1h-8.8v6h7.4v3h-7.4v6.3h8.8v3.1h-12.3zM130.4 136c0 .2-.1.5-.1.8 0 1.9.8 3.7 3.4 3.7 2.1 0 3.3-1.2 3.3-2.9 0-1.6-.7-2.4-2.2-3l-3.4-1.3c-2.4-.9-4.2-2.4-4.2-5.7 0-3.5 2.3-6.1 6.6-6.1 5.5 0 6.4 3.6 6.4 5.9 0 .3 0 .7-.1 1.1l-3.4.1c0-.2.1-.5.1-.7 0-1.7-.6-3.2-3-3.2-2.1 0-3 1.2-3 2.8 0 1.7.9 2.5 2.2 2.9l3.5 1.3c2.6 1 4.3 2.6 4.3 5.8 0 3.6-2.4 6.1-7 6.1-5.9 0-6.8-3.9-6.8-6.5 0-.3 0-.6.1-1l3.3-.1z" />
+    </g>
+  </svg>
+</span>

package/nationalarchives/templates/{layouts/_prototype-kit.njk → prototype-kit/_base.njk} RENAMED Viewed

@@ -1,4 +1,4 @@
-{% extends 'nationalarchives/templates/layouts/_generic.njk' %}
+{%- extends "nationalarchives/templates/layouts/_generic.njk" -%}
 {% set assetPath = '/plugin-assets/%40nationalarchives%2Ffrontend/nationalarchives/assets/' %}
@@ -6,7 +6,7 @@
   {% include 'govuk-prototype-kit/includes/stylesheets-plugins.njk' ignore missing %}
   <link rel="stylesheet" href="https://use.typekit.net/hkj3kuz.css">
   <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Open+Sans:wght@400..700&family=Roboto+Mono:wght@400..500&display=swap">
-{% endblock %}
+{% endblock stylesheets %}
 {% block bodyEnd %}
   {% include 'govuk-prototype-kit/includes/scripts.njk' ignore missing %}
@@ -32,4 +32,4 @@
       });
     }
   </script>
-{% endblock %}
+{% endblock bodyEnd %}

package/nationalarchives/templates/{error-page-not-found.njk → prototype-kit/error-page-not-found.njk} RENAMED Viewed

@@ -1,4 +1,4 @@
-{% extends 'nationalarchives/templates/layouts/_prototype-kit.njk' %}
+{%- extends "nationalarchives/templates/prototype-kit/_base.njk" -%}
 {% set pageTitle = 'Page not found' %}
 {% set theme = 'light' %}
@@ -17,4 +17,4 @@
     </div>
   </div>
 </div>
-{% endblock %}
+{% endblock content %}

package/nationalarchives/templates/{index-grid.njk → prototype-kit/index-grid.njk} RENAMED Viewed

@@ -1,8 +1,8 @@
-{% extends 'nationalarchives/templates/layouts/_prototype-kit.njk' %}
+{%- extends "nationalarchives/templates/prototype-kit/_base.njk" -%}
-{% from 'nationalarchives/components/breadcrumbs/macro.njk' import tnaBreadcrumbs %}
-{% from 'nationalarchives/components/card/macro.njk' import tnaCard %}
-{% from 'nationalarchives/components/index-grid/macro.njk' import tnaIndexGrid %}
+{%- from "nationalarchives/components/breadcrumbs/macro.njk" import tnaBreadcrumbs -%}
+{%- from "nationalarchives/components/card/macro.njk" import tnaCard -%}
+{%- from "nationalarchives/components/index-grid/macro.njk" import tnaIndexGrid -%}
 {% set pageTitle = 'Index list page' %}
 {% set theme = 'light' %}
@@ -22,7 +22,7 @@
     }) }}
   </div>
 </div>
-{% endblock %}
+{% endblock beforeContent %}
 {% block content %}
 <div class="tna-background-accent tna-!--padding-vertical-xl">
@@ -143,4 +143,4 @@
     columnsTiny: 1
   }) }}
 </section>
-{% endblock %}
+{% endblock content %}

package/nationalarchives/templates/{list.njk → prototype-kit/list.njk} RENAMED Viewed

@@ -1,7 +1,7 @@
-{% extends 'nationalarchives/templates/layouts/_prototype-kit.njk' %}
+{%- extends "nationalarchives/templates/prototype-kit/_base.njk" -%}
-{% from 'nationalarchives/components/breadcrumbs/macro.njk' import tnaBreadcrumbs %}
-{% from 'nationalarchives/components/card/macro.njk' import tnaCard %}
+{%- from "nationalarchives/components/breadcrumbs/macro.njk" import tnaBreadcrumbs -%}
+{%- from "nationalarchives/components/card/macro.njk" import tnaCard -%}
 {% set pageTitle = 'List page' %}
 {% set theme = 'light' %}
@@ -21,7 +21,7 @@
     }) }}
   </div>
 </div>
-{% endblock %}
+{% endblock beforeContent %}
 {% block content %}
 <div class="tna-background-accent tna-!--padding-vertical-xl">
@@ -49,4 +49,4 @@
     {%- endfor %}
   </ul>
 </nav>
-{% endblock %}
+{% endblock content %}

package/nationalarchives/templates/{plain.njk → prototype-kit/plain.njk} RENAMED Viewed

@@ -1,6 +1,6 @@
-{% extends 'nationalarchives/templates/layouts/_prototype-kit.njk' %}
+{%- extends "nationalarchives/templates/prototype-kit/_base.njk" -%}
-{% from 'nationalarchives/components/breadcrumbs/macro.njk' import tnaBreadcrumbs %}
+{%- from "nationalarchives/components/breadcrumbs/macro.njk" import tnaBreadcrumbs -%}
 {% set pageTitle = 'Plain page' %}
 {% set theme = 'light' %}
@@ -18,7 +18,7 @@
     classes: 'tna-column tna-column--full tna-!--padding-vertical-s'
   }) }}
 </div>
-{% endblock %}
+{% endblock beforeContent %}
 {% block content %}
 <div class="tna-section">
@@ -32,4 +32,4 @@
     </div>
   </div>
 </div>
-{% endblock %}
+{% endblock content %}

package/nationalarchives/utilities/grid/macro-options.json CHANGED Viewed

@@ -135,7 +135,8 @@
         "name": "noPadding",
         "type": "boolean",
         "required": false,
-        "description": ""
+        "description": "",
+        "default": false
       },
       {
         "name": "classes",
@@ -155,19 +156,22 @@
     "name": "maxWidth",
     "type": "boolean",
     "required": false,
-    "description": ""
+    "description": "",
+    "default": false
   },
   {
     "name": "noPadding",
     "type": "boolean",
     "required": false,
-    "description": ""
+    "description": "",
+    "default": false
   },
   {
     "name": "nested",
     "type": "boolean",
     "required": false,
-    "description": ""
+    "description": "",
+    "default": false
   },
   {
     "name": "htmlElement",

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@nationalarchives/frontend",
-  "version": "0.34.1",
+  "version": "0.35.1",
   "description": "The National Archives frontend styles",
   "scripts": {
     "start": "storybook dev -p 6006",

package/nationalarchives/templates/partials/logo.njk DELETED Viewed

@@ -1,11 +0,0 @@
-{% macro tnaLogo(params) %}
-  <span class="tna-logo{% if params.solid %} tna-logo--solid{% endif %}{% if params.adornable %} tna-logo--adornable{% endif %}">
-    <svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 160 160" width="{{ params.size or '96' }}" height="{{ params.size or '96' }}" aria-hidden="true" focusable="false">
-      <path class="tna-logo__background" fill="transparent" d="M0 0h160v160H0z" />
-      <g class="tna-logo__foreground" fill="currentColor">
-        <path d="M1.9 107.2h156.3V158H1.9v-50.8zm0-52.7h156.3v50.8H1.9V54.5zm0-52.6h77.2v50.8H1.9V1.9zm79 0h77.2v50.8H80.9V1.9zm0-1.9H0v160h160V0H80.9z" />
-        <path d="M21.3 19.5h-5.4v-3h14.3v3h-5.4v18.4h-3.5zM31.6 16.5H35v9h8.4v-9h3.4v21.4h-3.4v-9.3H35v9.3h-3.4zM50.9 16.5h12.2v3h-8.8v6.1h7.4v3h-7.4v6.3h8.8v3H50.9zM19.7 69.2h3.8l6.4 12.5c.6 1.1 1.1 2.7 1.6 4h.2c-.2-1.7-.3-3.6-.3-4.8V69.2h3.5v21.4h-3.7l-6.3-12.3c-.7-1.4-1.2-2.7-1.7-4.2H23c.2 1.4.3 3.3.3 5v11.5h-3.5c-.1 0-.1-21.4-.1-21.4zM47.8 82.6l-1.7-6.3c-.3-1.1-.6-2.2-.9-3.8H45c-.3 1.6-.5 2.6-.8 3.8l-1.7 6.3h5.3zM43 69.2h4.2l6.2 21.4h-3.5l-1.5-5.2h-6.6l-1.4 5.2h-3.6L43 69.2zM57.2 72.3h-5.4v-3.1H66v3.1h-5.4v18.4h-3.4zM67.8 69.2h3.5v21.4h-3.5zM87.5 80c0-5.3-1.7-8-4.8-8-3.2 0-4.8 2.7-4.8 8 0 5.2 1.6 7.9 4.8 7.9 3.2 0 4.8-2.7 4.8-7.9m-13.3 0c0-7 3-11.1 8.5-11.1 5.4 0 8.4 4.1 8.4 11.1 0 6.9-3 11-8.4 11s-8.5-4.1-8.5-11M94.3 69.2H98l6.4 12.5c.6 1.1 1.2 2.7 1.7 4h.2c-.2-1.7-.3-3.6-.3-4.8V69.2h3.4v21.4h-3.7l-6.3-12.3c-.7-1.4-1.2-2.7-1.7-4.2h-.2c.2 1.4.3 3.3.3 5v11.5h-3.5V69.2zM122.4 82.6l-1.7-6.3c-.3-1.1-.6-2.2-.9-3.8h-.2c-.3 1.6-.5 2.6-.8 3.8l-1.7 6.3h5.3zm-4.8-13.4h4.2l6.2 21.4h-3.5l-1.5-5.2h-6.6l-1.4 5.2h-3.6l6.2-21.4zM129.9 69.2h3.5v18.4h8.4v3.1h-11.9zM26.9 135.2l-1.7-6.3c-.3-1.1-.6-2.2-.9-3.8h-.2c-.3 1.6-.5 2.6-.8 3.8l-1.7 6.3h5.3zm-4.8-13.4h4.2l6.2 21.4H29l-1.5-5.2h-6.6l-1.4 5.2h-3.6l6.2-21.4zM39.9 132.5c2.5 0 3.4-1.6 3.4-3.9 0-2.2-1-3.8-3.4-3.8h-2.7v7.7h2.7zm-6.1-10.7h6.4c4.5 0 6.7 2.4 6.7 6.6 0 3.1-1.5 5.6-3.7 6.3v.2c1 1.1 4 7.5 4.8 7.9v.5h-3.8c-1-.6-3.6-7.2-4.4-7.8h-2.5v7.8h-3.5v-21.5zM52.9 132.5c0 5.3 1.9 8 4.8 8s4-2 4-5.2l3.5.1c0 .2.1.4.1.6 0 4.4-2.1 7.5-7.5 7.5-5.2 0-8.5-3.9-8.5-11.1 0-7.1 3.3-11 8.5-11 6.4 0 7.5 4.6 7.5 7.2 0 .3 0 .7-.1.9l-3.5.1c0-3.3-1.2-5.2-4-5.2-2.9.2-4.8 2.9-4.8 8.1M68 121.8h3.5v9.1h8.3v-9.1h3.5v21.5h-3.5v-9.4h-8.3v9.4H68zM87.9 121.8h3.5v21.4h-3.5zM94.2 121.8h3.6l3.2 12.3c.5 1.9.8 3.6 1.1 5.6h.2c.3-2 .6-3.7 1.1-5.6l3.2-12.3h3.6l-6.1 21.4H100l-5.8-21.4zM112.7 121.8H125v3.1h-8.8v6h7.4v3h-7.4v6.3h8.8v3.1h-12.3zM130.4 136c0 .2-.1.5-.1.8 0 1.9.8 3.7 3.4 3.7 2.1 0 3.3-1.2 3.3-2.9 0-1.6-.7-2.4-2.2-3l-3.4-1.3c-2.4-.9-4.2-2.4-4.2-5.7 0-3.5 2.3-6.1 6.6-6.1 5.5 0 6.4 3.6 6.4 5.9 0 .3 0 .7-.1 1.1l-3.4.1c0-.2.1-.5.1-.7 0-1.7-.6-3.2-3-3.2-2.1 0-3 1.2-3 2.8 0 1.7.9 2.5 2.2 2.9l3.5 1.3c2.6 1 4.3 2.6 4.3 5.8 0 3.6-2.4 6.1-7 6.1-5.9 0-6.8-3.9-6.8-6.5 0-.3 0-.6.1-1l3.3-.1z" />
-      </g>
-    </svg>
-  </span>
-{% endmacro %}