@nationalarchives/frontend 0.1.10-prerelease → 0.1.11-prerelease

package/nationalarchives/components/breadcrumbs/_index.scss

@@ -1,24 +1,26 @@
-@use "../../variables/colour";
+@use "../../tools/colour";
 @use "../../tools/media";
 
 .tna-breadcrumbs {
+  padding-top: 1rem;
+  padding-bottom: 1rem;
+
   &__list {
+    margin: 0;
     padding: 0;
 
     list-style: none;
 
-    display: -ms-flexbox;
     display: flex;
     flex-wrap: wrap;
   }
 
   &__item {
-    display: -ms-flexbox;
     display: flex;
 
     + .tna-breadcrumbs__item {
       &::before {
-        margin: 0 0.5rem;
+        margin: 0 0.75rem;
 
         display: inline-block;
 
@@ -30,11 +32,10 @@
   &__link {
     display: inline-block;
 
-    // color: colour.$base-font-colour;
-    @include colour.colour-font("base-font");
+    @include colour.colour-font("font-base");
 
     &:hover {
-      color: colour.$tna-black;
+      @include colour.colour-font("font-dark");
     }
   }
 
@@ -66,4 +67,24 @@
       }
     }
   }
+
+  @mixin high-contrast {
+    &__link {
+      padding-right: 0.75rem;
+      padding-left: 0.75rem;
+
+      border: 1px transparent solid;
+      @include colour.colour-border("keyline-dark");
+    }
+  }
+
+  .tna-template--high-contrast-theme & {
+    @include high-contrast;
+  }
+
+  @media (prefers-contrast: more) {
+    .tna-template--system-theme & {
+      @include high-contrast;
+    }
+  }
 }

package/nationalarchives/components/breadcrumbs/breadcrumbs.stories.js

@@ -14,7 +14,7 @@ Object.keys(argTypes).forEach((argType) => {
 });
 
 export default {
-  title: "Components/Work in progress/Breadcrumbs",
+  title: "Work in progress/Components/Breadcrumbs",
   argTypes,
 };
 

package/nationalarchives/components/breadcrumbs/fixtures.json

@@ -19,7 +19,7 @@
           }
         ]
       },
-      "html": "<nav class=\"tna-breadcrumbs \">\n  <ol class=\"tna-breadcrumbs__list\"><li class=\"tna-breadcrumbs__item\">\n      <a href=\"#/alpha\" class=\"tna-breadcrumbs__link\" data-prefix=\"Back to\">\n        Alpha\n      </a>\n    </li><li class=\"tna-breadcrumbs__item\">\n      <a href=\"#/beta\" class=\"tna-breadcrumbs__link\" data-prefix=\"Back to\">\n        Beta\n      </a>\n    </li><li class=\"tna-breadcrumbs__item\">\n      <a href=\"#/gamma\" class=\"tna-breadcrumbs__link\" data-prefix=\"Back to\">\n        Gamma\n      </a>\n    </li></ol>\n</nav>",
+      "html": "<div class=\"tna-breadcrumbs tna-container \"><nav class=\"tna-column tna-column--full\"><ol class=\"tna-breadcrumbs__list\"><li class=\"tna-breadcrumbs__item\"><a href=\"#/alpha\" class=\"tna-breadcrumbs__link\" data-prefix=\"Back to\">Alpha</a></li><li class=\"tna-breadcrumbs__item\"><a href=\"#/beta\" class=\"tna-breadcrumbs__link\" data-prefix=\"Back to\">Beta</a></li><li class=\"tna-breadcrumbs__item\"><a href=\"#/gamma\" class=\"tna-breadcrumbs__link\" data-prefix=\"Back to\">Gamma</a></li></ol></nav></div>",
       "hidden": false
     }
   ]

package/nationalarchives/components/breadcrumbs/macro.njk

@@ -1,3 +1,3 @@
 {% macro tnaBreadcrumbs(params) %}
-  {%- include "./template.njk" -%}
+  {%- include "nationalarchives/components/breadcrumbs/template.njk" -%}
 {% endmacro %}

package/nationalarchives/components/breadcrumbs/template.njk

@@ -1,13 +1,14 @@
-{%- set breadcrumbClasses = [params.classes] if params.classes else [] -%}
-
-<nav class="tna-breadcrumbs {{ breadcrumbClasses | join(' ') }}" {%- for attribute, value in params.attributes %} {{ attribute }}="{{ value }}"{% endfor %}>
-  <ol class="tna-breadcrumbs__list">
-  {%- for item in params.items -%}
-    <li class="tna-breadcrumbs__item">
-      <a href="{{ item.href }}" class="tna-breadcrumbs__link" data-prefix="{{ params.prefix if params.prefix else 'Back to' }}" {%- if item.title %} title="{{ item.title }}"{% endif %}>
-        {{ item.text }}
-      </a>
-    </li>
-  {%- endfor -%}
-  </ol>
-</nav>
+{%- set containerClasses = [params.classes] if params.classes else [] -%}
+<div class="tna-breadcrumbs tna-container {{ containerClasses | join(' ') }}" {%- for attribute, value in params.attributes %} {{ attribute }}="{{ value }}"{% endfor %}>
+  <nav class="tna-column tna-column--full">
+    <ol class="tna-breadcrumbs__list">
+    {%- for item in params.items -%}
+      <li class="tna-breadcrumbs__item">
+        <a href="{{ item.href }}" class="tna-breadcrumbs__link" data-prefix="{{ params.prefix if params.prefix else 'Back to' }}" {%- if item.title %} title="{{ item.title }}"{% endif %}>
+          {{ item.text }}
+        </a>
+      </li>
+    {%- endfor -%}
+    </ol>
+  </nav>
+</div>

package/nationalarchives/components/button/_index.scss

@@ -1,27 +1,35 @@
-@use "../../variables/colour";
+@use "../../tools/colour";
 
 .tna-button {
   padding: 0.25rem 1rem;
 
   display: inline-block;
 
-  color: #fff;
   font-weight: 700;
   text-decoration: none;
 
-  background-color: colour.$tna-black;
+  @include colour.colour-background("button-primary-background");
 
-  border: 0.25rem colour.$tna-black solid;
+  border: 0.25rem transparent solid;
+  @include colour.colour-border("button-primary-background");
 
   transition:
     color 200ms,
     background-color 200ms,
     border-color 200ms;
 
+  cursor: pointer;
+
+  &,
+  &:link,
+  &:visited {
+    @include colour.colour-font("button-primary-text");
+  }
+
   &:hover {
-    color: colour.$tna-black;
+    @include colour.colour-font("button-primary-hover-text");
 
-    background-color: #fff;
+    @include colour.colour-background("button-primary-hover-background");
 
     transition:
       color 50ms,
@@ -30,16 +38,20 @@
   }
 
   &--secondary {
-    color: colour.$tna-black;
+    @include colour.colour-background("button-secondary-background");
 
-    background-color: colour.$tna-yellow;
+    @include colour.colour-border("button-secondary-background");
 
-    border-color: colour.$tna-yellow;
+    &,
+    &:link,
+    &:visited {
+      @include colour.colour-font("button-secondary-text");
+    }
 
     &:hover {
-      color: colour.$tna-black;
+      @include colour.colour-font("button-secondary-hover-text");
 
-      border-color: colour.$tna-black;
+      @include colour.colour-background("button-secondary-hover-background");
     }
   }
 }

package/nationalarchives/components/button/button.stories.js

@@ -17,7 +17,7 @@ Object.keys(argTypes).forEach((argType) => {
 });
 
 export default {
-  title: "Components/Work in progress/Button",
+  title: "Work in progress/Components/Button",
   argTypes,
 };
 

package/nationalarchives/components/button/fixtures.json

@@ -7,7 +7,7 @@
         "text": "Log in",
         "href": "#"
       },
-      "html": "<a href=\"#\" class=\"tna-button \">\n  Log in\n</a>",
+      "html": "<a href=\"#\" class=\"tna-button \">Log in</a>",
       "hidden": false
     },
     {
@@ -17,7 +17,7 @@
         "href": "#",
         "title": "Log in to the service"
       },
-      "html": "<a href=\"#\" class=\"tna-button \" title=\"Log in to the service\">\n  Log in\n</a>",
+      "html": "<a href=\"#\" class=\"tna-button \" title=\"Log in to the service\">Log in</a>",
       "hidden": false
     },
     {
@@ -27,7 +27,7 @@
         "href": "#",
         "secondary": true
       },
-      "html": "<a href=\"#\" class=\"tna-button tna-button--secondary\">\n  Log in\n</a>",
+      "html": "<a href=\"#\" class=\"tna-button tna-button--secondary\">Log in</a>",
       "hidden": false
     },
     {
@@ -37,7 +37,7 @@
         "href": "#",
         "classes": "button__test-class"
       },
-      "html": "<a href=\"#\" class=\"tna-button button__test-class\">\n  Log in\n</a>",
+      "html": "<a href=\"#\" class=\"tna-button button__test-class\">Log in</a>",
       "hidden": false
     },
     {
@@ -49,7 +49,7 @@
           "data-testattribute": "foobar"
         }
       },
-      "html": "<a href=\"#\" class=\"tna-button \" data-testattribute=\"foobar\">\n  Log in\n</a>",
+      "html": "<a href=\"#\" class=\"tna-button \" data-testattribute=\"foobar\">Log in</a>",
       "hidden": false
     }
   ]

package/nationalarchives/components/button/macro.njk

@@ -1,3 +1,3 @@
 {% macro tnaButton(params) %}
-  {%- include "./template.njk" -%}
+  {%- include "nationalarchives/components/button/template.njk" -%}
 {% endmacro %}

package/nationalarchives/components/card/_index.scss

@@ -1,11 +1,10 @@
-@use "../../variables/colour";
+@use "../../tools/colour";
 
 .tna-card {
+  margin-bottom: 1rem;
+
   &__inner {
-    display: -ms-flexbox;
     display: flex;
-    -ms-box-orient: vertical;
-    -ms-flex-direction: column;
     flex-direction: column;
   }
 
@@ -24,10 +23,26 @@
   }
 
   &__image-container {
+    margin-bottom: 1rem;
+
+    position: relative;
     order: 1;
   }
 
   &__image {
+    height: auto;
+  }
+
+  &__image-label {
+    padding: 0 0.5rem;
+
+    position: absolute;
+    top: 1rem;
+    left: 0;
+
+    text-transform: uppercase;
+
+    background-color: #f0a;
   }
 
   &__body {
@@ -46,9 +61,14 @@
   }
 
   &--featured {
+    @include colour.fixed;
+
     position: relative;
 
-    background-color: colour.$tna-yellow;
+    @include colour.colour-font("font-base");
+
+    // background-color: colour.$tna-yellow;
+    @include colour.colour-background("accent");
 
     .tna-card__inner {
       margin-left: 50%;
@@ -58,14 +78,21 @@
     .tna-card__heading {
       padding-bottom: 2rem;
 
-      border-bottom: 2px colour.$tna-black solid;
+      border-bottom: 2px transparent solid;
+      @include colour.colour-border("keyline-dark");
+    }
+
+    .tna-card__supertitle {
+      color: inherit;
     }
 
     .tna-card__title-link {
-      color: colour.$tna-black;
+      @include colour.colour-font("font-dark");
     }
 
     .tna-card__image-container {
+      margin-bottom: 0;
+
       position: absolute;
       inset: 0 50% 0 0;
     }
@@ -76,4 +103,21 @@
       object-fit: cover;
     }
   }
+
+  @mixin high-contrast {
+    padding: 1rem;
+
+    border: 1px transparent solid;
+    @include colour.colour-border("keyline-dark");
+  }
+
+  .tna-template--high-contrast-theme & {
+    @include high-contrast;
+  }
+
+  @media (prefers-contrast: more) {
+    .tna-template--system-theme & {
+      @include high-contrast;
+    }
+  }
 }

package/nationalarchives/components/card/card.js

@@ -0,0 +1,2 @@
+!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define("TNAFrontend",[],e):"object"==typeof exports?exports.TNAFrontend=e():(t.TNAFrontend=t.TNAFrontend||{},t.TNAFrontend["components/card/card"]=e())}(self,(()=>(()=>{"use strict";var t={d:(e,o)=>{for(var n in o)t.o(o,n)&&!t.o(e,n)&&Object.defineProperty(e,n,{enumerable:!0,get:o[n]})},o:(t,e)=>Object.prototype.hasOwnProperty.call(t,e),r:t=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})}},e={};function o(t){return o="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},o(t)}function n(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,(void 0,i=function(t,e){if("object"!==o(t)||null===t)return t;var n=t[Symbol.toPrimitive];if(void 0!==n){var r=n.call(t,"string");if("object"!==o(r))return r;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(t)}(r.key),"symbol"===o(i)?i:String(i)),r)}var i}t.r(e),t.d(e,{Card:()=>r});var r=function(){function t(e){var o=arguments.length>1&&void 0!==arguments[1]?arguments[1]:300;!function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,t),this.$module=e,this.$cardTitleLink=e&&e.querySelector(".tna-card__title-link"),this.$cardAction=e&&e.querySelector(".tna-card__action"),this.tapTimeMax=o}var e,o;return e=t,(o=[{key:"init",value:function(){this.$module&&(this.$cardTitleLink||this.$cardAction)&&!this.$module.classList.contains("tna-card--no-global-click")&&(this.touchStartTime=null)}},{key:"handleCardClick",value:function(){this.$cardTitleLink?this.$cardTitleLink.click():this.$cardAction&&this.$cardAction.click()}},{key:"handleCardTouchStart",value:function(){this.touchStartTime=new Date}},{key:"handleCardTouchEnd",value:function(){(new Date).getTime()-this.touchStartTime.getTime()<this.tapTimeMax&&this.handleCardClick()}}])&&n(e.prototype,o),Object.defineProperty(e,"prototype",{writable:!1}),t}();return e})()));
+//# sourceMappingURL=card.js.map

package/nationalarchives/components/card/card.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"components/card/card.js","mappings":"CAAA,SAA2CA,EAAMC,GAC1B,iBAAZC,SAA0C,iBAAXC,OACxCA,OAAOD,QAAUD,IACQ,mBAAXG,QAAyBA,OAAOC,IAC9CD,OAAO,cAAe,GAAIH,GACA,iBAAZC,QACdA,QAAqB,YAAID,KAEzBD,EAAkB,YAAIA,EAAkB,aAAK,CAAC,EAAGA,EAAkB,YAAE,wBAA0BC,IAChG,CATD,CASGK,MAAM,I,mBCRT,IAAIC,EAAsB,CCA1BA,EAAwB,CAACL,EAASM,KACjC,IAAI,IAAIC,KAAOD,EACXD,EAAoBG,EAAEF,EAAYC,KAASF,EAAoBG,EAAER,EAASO,IAC5EE,OAAOC,eAAeV,EAASO,EAAK,CAAEI,YAAY,EAAMC,IAAKN,EAAWC,IAE1E,ECNDF,EAAwB,CAACQ,EAAKC,IAAUL,OAAOM,UAAUC,eAAeC,KAAKJ,EAAKC,GCClFT,EAAyBL,IACH,oBAAXkB,QAA0BA,OAAOC,aAC1CV,OAAOC,eAAeV,EAASkB,OAAOC,YAAa,CAAEC,MAAO,WAE7DX,OAAOC,eAAeV,EAAS,aAAc,CAAEoB,OAAO,GAAO,G,msBCLvD,IAAMC,EAAI,WACf,SAAAA,EAAYC,GAA2B,IAAlBC,EAAUC,UAAAC,OAAA,QAAAC,IAAAF,UAAA,GAAAA,UAAA,GAAG,K,4FAAGG,CAAA,KAAAN,GACnCO,KAAKN,QAAUA,EACfM,KAAKC,eACHP,GAAWA,EAAQQ,cAAc,yBACnCF,KAAKG,YAAcT,GAAWA,EAAQQ,cAAc,qBACpDF,KAAKL,WAAaA,CACpB,C,QAoCC,O,EApCAF,G,EAAA,EAAAd,IAAA,OAAAa,MAED,WAEKQ,KAAKN,UACJM,KAAKC,gBAAmBD,KAAKG,eAC/BH,KAAKN,QAAQU,UAAUC,SAAS,+BAKlCL,KAAKM,eAAiB,KAMxB,GAAC,CAAA3B,IAAA,kBAAAa,MAED,WACMQ,KAAKC,eACPD,KAAKC,eAAeM,QACXP,KAAKG,aACdH,KAAKG,YAAYI,OAErB,GAAC,CAAA5B,IAAA,uBAAAa,MAED,WACEQ,KAAKM,eAAiB,IAAIE,IAC5B,GAAC,CAAA7B,IAAA,qBAAAa,MAED,YACmB,IAAIgB,MAAOC,UAAYT,KAAKM,eAAeG,UAC7CT,KAAKL,YAClBK,KAAKU,iBAET,M,oEAACjB,CAAA,CA3Cc,G","sources":["webpack://TNAFrontend/webpack/universalModuleDefinition","webpack://TNAFrontend/webpack/bootstrap","webpack://TNAFrontend/webpack/runtime/define property getters","webpack://TNAFrontend/webpack/runtime/hasOwnProperty shorthand","webpack://TNAFrontend/webpack/runtime/make namespace object","webpack://TNAFrontend/./src/nationalarchives/components/card/card.mjs"],"sourcesContent":["(function webpackUniversalModuleDefinition(root, factory) {\n\tif(typeof exports === 'object' && typeof module === 'object')\n\t\tmodule.exports = factory();\n\telse if(typeof define === 'function' && define.amd)\n\t\tdefine(\"TNAFrontend\", [], factory);\n\telse if(typeof exports === 'object')\n\t\texports[\"TNAFrontend\"] = factory();\n\telse\n\t\troot[\"TNAFrontend\"] = root[\"TNAFrontend\"] || {}, root[\"TNAFrontend\"][\"components/card/card\"] = factory();\n})(self, () => {\nreturn ","// The require scope\nvar __webpack_require__ = {};\n\n","// define getter functions for harmony exports\n__webpack_require__.d = (exports, definition) => {\n\tfor(var key in definition) {\n\t\tif(__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) {\n\t\t\tObject.defineProperty(exports, key, { enumerable: true, get: definition[key] });\n\t\t}\n\t}\n};","__webpack_require__.o = (obj, prop) => (Object.prototype.hasOwnProperty.call(obj, prop))","// define __esModule on exports\n__webpack_require__.r = (exports) => {\n\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\n\t\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\n\t}\n\tObject.defineProperty(exports, '__esModule', { value: true });\n};","export class Card {\n  constructor($module, tapTimeMax = 300) {\n    this.$module = $module;\n    this.$cardTitleLink =\n      $module && $module.querySelector(\".tna-card__title-link\");\n    this.$cardAction = $module && $module.querySelector(\".tna-card__action\");\n    this.tapTimeMax = tapTimeMax;\n  }\n\n  init() {\n    if (\n      !this.$module ||\n      (!this.$cardTitleLink && !this.$cardAction) ||\n      this.$module.classList.contains(\"tna-card--no-global-click\")\n    ) {\n      return;\n    }\n\n    this.touchStartTime = null;\n\n    // this.$module.addEventListener(\"touchstart\", () =>\n    //   this.handleCardTouchStart(),\n    // );\n    // this.$module.addEventListener(\"touchend\", () => this.handleCardTouchEnd());\n  }\n\n  handleCardClick() {\n    if (this.$cardTitleLink) {\n      this.$cardTitleLink.click();\n    } else if (this.$cardAction) {\n      this.$cardAction.click();\n    }\n  }\n\n  handleCardTouchStart() {\n    this.touchStartTime = new Date();\n  }\n\n  handleCardTouchEnd() {\n    const duration = new Date().getTime() - this.touchStartTime.getTime();\n    if (duration < this.tapTimeMax) {\n      this.handleCardClick();\n    }\n  }\n}\n"],"names":["root","factory","exports","module","define","amd","self","__webpack_require__","definition","key","o","Object","defineProperty","enumerable","get","obj","prop","prototype","hasOwnProperty","call","Symbol","toStringTag","value","Card","$module","tapTimeMax","arguments","length","undefined","_classCallCheck","this","$cardTitleLink","querySelector","$cardAction","classList","contains","touchStartTime","click","Date","getTime","handleCardClick"],"sourceRoot":""}

package/nationalarchives/components/card/card.mjs

@@ -0,0 +1,45 @@
+export class Card {
+  constructor($module, tapTimeMax = 300) {
+    this.$module = $module;
+    this.$cardTitleLink =
+      $module && $module.querySelector(".tna-card__title-link");
+    this.$cardAction = $module && $module.querySelector(".tna-card__action");
+    this.tapTimeMax = tapTimeMax;
+  }
+
+  init() {
+    if (
+      !this.$module ||
+      (!this.$cardTitleLink && !this.$cardAction) ||
+      this.$module.classList.contains("tna-card--no-global-click")
+    ) {
+      return;
+    }
+
+    this.touchStartTime = null;
+
+    // this.$module.addEventListener("touchstart", () =>
+    //   this.handleCardTouchStart(),
+    // );
+    // this.$module.addEventListener("touchend", () => this.handleCardTouchEnd());
+  }
+
+  handleCardClick() {
+    if (this.$cardTitleLink) {
+      this.$cardTitleLink.click();
+    } else if (this.$cardAction) {
+      this.$cardAction.click();
+    }
+  }
+
+  handleCardTouchStart() {
+    this.touchStartTime = new Date();
+  }
+
+  handleCardTouchEnd() {
+    const duration = new Date().getTime() - this.touchStartTime.getTime();
+    if (duration < this.tapTimeMax) {
+      this.handleCardClick();
+    }
+  }
+}

package/nationalarchives/components/card/card.stories.js

@@ -21,7 +21,7 @@ Object.keys(argTypes).forEach((argType) => {
 });
 
 export default {
-  title: "Components/Work in progress/Card",
+  title: "Work in progress/Components/Card",
   argTypes,
 };
 
@@ -60,21 +60,23 @@ Standard.args = {
     title: "Card title",
     level: 3,
     size: "m",
-    singleSentence: true,
+    singleSentence: false,
   },
   href: "#",
   image: {
-    src: "https://picsum.photos/id/29/640/360",
-    alt: "A placeholder image",
+    src: "https://www.nationalarchives.gov.uk/wp-content/uploads/sites/24/2023/07/tna-building-compress.jpg",
+    alt: "The National Archives office",
+    width: 1996,
+    height: 1331,
   },
   body: "<p>Card body</p>",
-  actions: [
-    {
-      text: "Card action",
-      href: "#",
-      title: "Go and do the action",
-    },
-  ],
+  // actions: [
+  //   {
+  //     text: "Card action",
+  //     href: "#",
+  //     title: "Go and do the action",
+  //   },
+  // ],
   htmlElement: "article",
   classes: "tna-card--demo",
 };
@@ -86,12 +88,14 @@ Featured.args = {
     title: "Card title",
     level: 3,
     size: "m",
-    singleSentence: true,
+    singleSentence: false,
   },
   href: "#",
   image: {
-    src: "https://picsum.photos/id/24/640/360",
-    alt: "A placeholder image",
+    src: "https://www.nationalarchives.gov.uk/wp-content/uploads/sites/24/2023/07/tna-building-compress.jpg",
+    alt: "The National Archives office",
+    width: 1996,
+    height: 1331,
   },
   body: "<p>Card body</p>",
   actions: [

package/nationalarchives/components/card/fixtures.json

@@ -10,7 +10,7 @@
         },
         "body": "<p>Card body</p>"
       },
-      "html": "<div class=\"tna-card \">\n  <div class=\"tna-card__inner\"><h3 class=\"tna-card__title tna-heading tna-heading--m\">Card title</h3><div class=\"tna-card__body\"><p>Card body</p></div></div>\n</div>",
+      "html": "<div class=\"tna-card \" data-module=\"tna-card\"><div class=\"tna-card__inner\"><h3 class=\"tna-card__title tna-heading tna-heading--m\">Card title</h3><div class=\"tna-card__body\"><p>Card body</p></div></div></div>",
       "hidden": false
     },
     {
@@ -23,7 +23,7 @@
         },
         "body": "<p>Card body</p>"
       },
-      "html": "<div class=\"tna-card \">\n  <div class=\"tna-card__inner\"><hgroup class=\"tna-card__heading tna-hgroup tna-hgroup--m\">\n        <p class=\"tna-card__supertitle tna-hgroup__supertitle\">Card supertitle</p>\n        <h3 class=\"tna-card__title tna-hgroup__title\">Card title</h3>\n      </hgroup><div class=\"tna-card__body\"><p>Card body</p></div></div>\n</div>",
+      "html": "<div class=\"tna-card \" data-module=\"tna-card\"><div class=\"tna-card__inner\"><hgroup class=\"tna-card__heading tna-hgroup tna-hgroup--m\"><p class=\"tna-card__supertitle tna-hgroup__supertitle\">Card supertitle</p><h3 class=\"tna-card__title tna-hgroup__title\">Card title</h3></hgroup><div class=\"tna-card__body\"><p>Card body</p></div></div></div>",
       "hidden": false
     },
     {
@@ -37,7 +37,7 @@
         },
         "body": "<p>Card body</p>"
       },
-      "html": "<div class=\"tna-card \">\n  <div class=\"tna-card__inner\"><hgroup class=\"tna-card__heading tna-hgroup tna-hgroup--m\">\n        <h3 class=\"tna-card__title tna-hgroup__title\">\n          <span class=\"tna-card__supertitle tna-hgroup__supertitle\">Card supertitle</span>Card title</h3>\n      </hgroup><div class=\"tna-card__body\"><p>Card body</p></div></div>\n</div>",
+      "html": "<div class=\"tna-card \" data-module=\"tna-card\"><div class=\"tna-card__inner\"><hgroup class=\"tna-card__heading tna-hgroup tna-hgroup--m\"><h3 class=\"tna-card__title tna-hgroup__title\"><span class=\"tna-card__supertitle tna-hgroup__supertitle\">Card supertitle</span>Card title</h3></hgroup><div class=\"tna-card__body\"><p>Card body</p></div></div></div>",
       "hidden": false
     },
     {
@@ -50,7 +50,7 @@
         },
         "body": "<p>Card body</p>"
       },
-      "html": "<div class=\"tna-card \">\n  <div class=\"tna-card__inner\"><h3 class=\"tna-card__title tna-heading tna-heading--m\">Card title</h3><div class=\"tna-card__body\"><p>Card body</p></div></div>\n</div>",
+      "html": "<div class=\"tna-card \" data-module=\"tna-card\"><div class=\"tna-card__inner\"><h3 class=\"tna-card__title tna-heading tna-heading--m\">Card title</h3><div class=\"tna-card__body\"><p>Card body</p></div></div></div>",
       "hidden": false
     },
     {
@@ -62,7 +62,7 @@
         },
         "body": "<p>Card body</p>"
       },
-      "html": "<div class=\"tna-card \">\n  <div class=\"tna-card__inner\"><h1 class=\"tna-card__title tna-heading tna-heading--m\">Card title</h1><div class=\"tna-card__body\"><p>Card body</p></div></div>\n</div>",
+      "html": "<div class=\"tna-card \" data-module=\"tna-card\"><div class=\"tna-card__inner\"><h1 class=\"tna-card__title tna-heading tna-heading--m\">Card title</h1><div class=\"tna-card__body\"><p>Card body</p></div></div></div>",
       "hidden": false
     },
     {
@@ -75,7 +75,7 @@
         "href": "#",
         "body": "<p>Card body</p>"
       },
-      "html": "<div class=\"tna-card \">\n  <div class=\"tna-card__inner\"><h3 class=\"tna-card__title tna-heading tna-heading--m\"><a href=\"#\" class=\"tna-card__title-link\">Card title</a></h3><div class=\"tna-card__body\"><p>Card body</p></div></div>\n</div>",
+      "html": "<div class=\"tna-card \" data-module=\"tna-card\"><div class=\"tna-card__inner\"><h3 class=\"tna-card__title tna-heading tna-heading--m\"><a href=\"#\" class=\"tna-card__title-link\">Card title</a></h3><div class=\"tna-card__body\"><p>Card body</p></div></div></div>",
       "hidden": false
     },
     {
@@ -87,7 +87,7 @@
         },
         "text": "Card body"
       },
-      "html": "<div class=\"tna-card \">\n  <div class=\"tna-card__inner\"><h3 class=\"tna-card__title tna-heading tna-heading--m\">Card title</h3><div class=\"tna-card__body\"><p>Card body</p></div></div>\n</div>",
+      "html": "<div class=\"tna-card \" data-module=\"tna-card\"><div class=\"tna-card__inner\"><h3 class=\"tna-card__title tna-heading tna-heading--m\">Card title</h3><div class=\"tna-card__body\"><p>Card body</p></div></div></div>",
       "hidden": false
     },
     {
@@ -99,11 +99,13 @@
         },
         "image": {
           "src": "https://loremflickr.com/640/360",
-          "alt": "A placeholder image"
+          "alt": "A placeholder image",
+          "width": 640,
+          "height": 360
         },
         "body": "<p>Card body</p>"
       },
-      "html": "<div class=\"tna-card \">\n  <div class=\"tna-card__inner\"><h3 class=\"tna-card__title tna-heading tna-heading--m\">Card title</h3><div class=\"tna-card__image-container\">\n      <img src=\"https://loremflickr.com/640/360\" alt=\"A placeholder image\" class=\"tna-card__image\" />\n    </div><div class=\"tna-card__body\"><p>Card body</p></div></div>\n</div>",
+      "html": "<div class=\"tna-card \" data-module=\"tna-card\"><div class=\"tna-card__inner\"><h3 class=\"tna-card__title tna-heading tna-heading--m\">Card title</h3><div class=\"tna-card__image-container\"><img src=\"https://loremflickr.com/640/360\" alt=\"A placeholder image\" width=\"640\" height=\"360\" class=\"tna-card__image\" /></div><div class=\"tna-card__body\"><p>Card body</p></div></div></div>",
       "hidden": false
     },
     {
@@ -122,7 +124,7 @@
           }
         ]
       },
-      "html": "<div class=\"tna-card \">\n  <div class=\"tna-card__inner\"><h3 class=\"tna-card__title tna-heading tna-heading--m\">Card title</h3><div class=\"tna-card__body\"><p>Card body</p></div><div class=\"tna-card__actions\"><a href=\"#\" class=\"tna-card__action tna-button\"title=\"Go and do the action\">Card action</a></div></div>\n</div>",
+      "html": "<div class=\"tna-card \" data-module=\"tna-card\"><div class=\"tna-card__inner\"><h3 class=\"tna-card__title tna-heading tna-heading--m\">Card title</h3><div class=\"tna-card__body\"><p>Card body</p></div><div class=\"tna-card__actions\"><a href=\"#\" class=\"tna-card__action tna-button\"title=\"Go and do the action\">Card action</a></div></div></div>",
       "hidden": false
     },
     {
@@ -135,7 +137,7 @@
         "body": "<p>Card body</p>",
         "classes": "card__test-class"
       },
-      "html": "<div class=\"tna-card card__test-class\">\n  <div class=\"tna-card__inner\"><h3 class=\"tna-card__title tna-heading tna-heading--m\">Card title</h3><div class=\"tna-card__body\"><p>Card body</p></div></div>\n</div>",
+      "html": "<div class=\"tna-card card__test-class\" data-module=\"tna-card\"><div class=\"tna-card__inner\"><h3 class=\"tna-card__title tna-heading tna-heading--m\">Card title</h3><div class=\"tna-card__body\"><p>Card body</p></div></div></div>",
       "hidden": false
     },
     {
@@ -150,7 +152,7 @@
           "data-testattribute": "foobar"
         }
       },
-      "html": "<div class=\"tna-card \" data-testattribute=\"foobar\">\n  <div class=\"tna-card__inner\"><h3 class=\"tna-card__title tna-heading tna-heading--m\">Card title</h3><div class=\"tna-card__body\"><p>Card body</p></div></div>\n</div>",
+      "html": "<div class=\"tna-card \" data-module=\"tna-card\" data-testattribute=\"foobar\"><div class=\"tna-card__inner\"><h3 class=\"tna-card__title tna-heading tna-heading--m\">Card title</h3><div class=\"tna-card__body\"><p>Card body</p></div></div></div>",
       "hidden": false
     }
   ]

package/nationalarchives/components/card/macro-options.json

@@ -60,6 +60,24 @@
         "type": "string",
         "required": true,
         "description": ""
+      },
+      {
+        "name": "label",
+        "type": "string",
+        "required": false,
+        "description": ""
+      },
+      {
+        "name": "width",
+        "type": "number",
+        "required": true,
+        "description": ""
+      },
+      {
+        "name": "height",
+        "type": "number",
+        "required": true,
+        "description": ""
       }
     ]
   },

package/nationalarchives/components/card/macro.njk

@@ -1,3 +1,3 @@
 {% macro tnaCard(params) %}
-  {%- include "./template.njk" -%}
+  {%- include "nationalarchives/components/card/template.njk" -%}
 {% endmacro %}