npm - @nationalarchives/frontend - Versions diffs - 0.1.64 → 0.2.0 - Mend

@nationalarchives/frontend 0.1.64 → 0.2.0

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 (270) hide show

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

@@ -8,7 +8,7 @@
 {%- set defaultSiteTitle = 'The National Archives' -%}
 <!DOCTYPE html>
-<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 }}="{{ value }}"{% endfor %}>
+<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>
@@ -37,24 +37,24 @@
     {% block stylesheets %}{% endblock %}
   </head>
-    <body class="tna-template__body{% if bodyClasses %} {{ bodyClasses }}{% endif %}"{% for attribute, value in bodyAttributes %} {{ attribute }}="{{ value }}"{% endfor %}>
+  <body class="tna-template__body{% if bodyClasses %} {{ bodyClasses }}{% endif %}"{% for attribute, value in bodyAttributes %} {{ attribute }}{% if value !== '' %}="{{ value }}"{% endif %}{% endfor %}>
     {% block bodyStart %}
       {% block cookies %}
         {{ tnaCookieBanner({
           cookiesUrl: '#/cookies'
-        }) }}
+        }) | indent(6) }}
       {% endblock %}
       {% block skipLink %}
       {{ tnaSkipLink({
         href: 'main-content',
         text: 'Skip to main content'
-      }) }}
+      }) | indent(6) }}
       {% endblock %}
     {% endblock %}
     {% block header %}
-      {{ tnaHeader({}) }}
+      {{ tnaHeader({}) | indent(4) }}
     {% endblock %}
     {% block main %}
@@ -66,7 +66,7 @@
     {% endblock %}
     {% block footer %}
-      {{ tnaFooter({}) }}
+      {{ tnaFooter({}) | indent(4) }}
     {% endblock %}
     {% block bodyEnd %}{% endblock %}

package/nationalarchives/tools/_a11y.scss CHANGED Viewed

@@ -13,3 +13,7 @@
 @mixin active-outline {
   outline-offset: 0;
 }
+@mixin no-active-outline {
+  outline-offset: a11y.$focus-outline-offset;
+}

package/nationalarchives/tools/_colour.scss CHANGED Viewed

@@ -104,58 +104,83 @@
   fill: colour-var($colour) if($important, !important, null);
 }
-@mixin thick-keyline($direction) {
-  @include colour-border(
-    "keyline",
-    borders.$thick-border-width,
-    solid,
-    $direction
-  );
+@mixin thick-keyline($direction: "") {
+  @if $direction != "" {
+    @include colour-border(
+      "keyline",
+      borders.$thick-border-width,
+      solid,
+      $direction
+    );
+  } @else {
+    @include colour-border("keyline", borders.$thick-border-width, solid);
+  }
 }
-@mixin thick-keyline-dark($direction) {
-  @include colour-border(
-    "keyline-dark",
-    borders.$thick-border-width,
-    solid,
-    $direction
-  );
+@mixin thick-keyline-dark($direction: "") {
+  @if $direction != "" {
+    @include colour-border(
+      "keyline-dark",
+      borders.$thick-border-width,
+      solid,
+      $direction
+    );
+  } @else {
+    @include colour-border("keyline-dark", borders.$thick-border-width, solid);
+  }
 }
-@mixin thick-keyline-accent($direction) {
-  @include colour-border(
-    "accent-border",
-    borders.$thick-border-width,
-    solid,
-    $direction
-  );
+@mixin thick-keyline-accent($direction: "") {
+  @if $direction != "" {
+    @include colour-border(
+      "accent-border",
+      borders.$thick-border-width,
+      solid,
+      $direction
+    );
+  } @else {
+    @include colour-border("accent-border", borders.$thick-border-width, solid);
+  }
 }
-@mixin thick-keyline-error($direction) {
-  @include colour-border(
-    "form-error",
-    borders.$thick-border-width,
-    solid,
-    $direction
-  );
+@mixin thick-keyline-error($direction: "") {
+  @if $direction != "" {
+    @include colour-border(
+      "form-error-border",
+      borders.$thick-border-width,
+      solid,
+      $direction
+    );
+  } @else {
+    @include colour-border(
+      "form-error-border",
+      borders.$thick-border-width,
+      solid
+    );
+  }
 }
-@mixin thick-keyline-brand($direction, $brandColour) {
-  border-#{$direction}: borders.$thick-border-width #{brand-colour($brandColour)}
-    solid;
+@mixin thick-keyline-brand($direction: "", $brandColour) {
+  @if $direction != "" {
+    border-#{$direction}: borders.$thick-border-width
+      #{brand-colour($brandColour)}
+      solid;
+  } @else {
+    border: borders.$thick-border-width #{brand-colour($brandColour)} solid;
+  }
 }
-// Use light theme colours (except for "form-error")
-%light {
-  @include colour-css-vars("form-error");
+// Use light theme colours (except for "form-error-border")
+%always-light {
+  @include colour-css-vars("form-error-border");
   @media (prefers-contrast: more) {
-    @include colour-css-vars-high-contrast("form-error");
+    @include colour-css-vars-high-contrast("form-error-border");
   }
 }
-@mixin light {
-  @extend %light;
+@mixin always-light {
+  @extend %always-light;
 }
 %contrast {
@@ -236,6 +261,10 @@
   --keyline-dark: var(--accent-keyline-dark);
   --accent-list-marker: var(--accent-font-base);
   --accent-border: var(--accent-font-dark);
+  --button-text: var(--accent-button-text);
+  --button-background: var(--accent-button-background);
+  --button-hover-text: var(--accent-button-hover-text);
+  --button-hover-background: var(--accent-button-hover-background);
   @include colour-background("background");
@@ -290,39 +319,6 @@
   @extend %accent-light;
 }
-// Remove accent and contrast values (except for "form-error")
-%plain {
-  @include colour-css-vars("form-error");
-  @media (prefers-contrast: more) {
-    @include colour-css-vars-high-contrast("form-error");
-  }
-  .tna-template--system-theme & {
-    @media (prefers-color-scheme: dark) {
-      @include colour-css-vars-dark("form-error");
-    }
-    @media (prefers-contrast: more) and (prefers-color-scheme: dark) {
-      @include colour-css-vars-high-contrast-dark("form-error");
-    }
-  }
-  .tna-template--dark-theme & {
-    @include colour-css-vars-dark("form-error");
-    @media (prefers-contrast: more) {
-      @include colour-css-vars-high-contrast-dark("form-error");
-    }
-  }
-  @include colour-background("background");
-}
-@mixin plain {
-  @extend %plain;
-}
 %yellow-accent {
   --accent-background: #{colour.brand-colour("yellow")} !important;
   --accent-background-light: #{colour.brand-colour("cream")} !important;
@@ -336,8 +332,8 @@
   --accent-link-visited: #{colour.brand-colour("black")} !important;
   --accent-keyline: #{colour.brand-colour("black", 0.5)} !important;
   --accent-keyline-dark: #{colour.brand-colour("black", 0.8)} !important;
-  --button-accent-text: #{colour.brand-colour("white")} !important;
-  --button-accent-background: #{colour.brand-colour("brown")} !important;
+  --button-accented-text: #{colour.brand-colour("white")} !important;
+  --button-accented-background: #{colour.brand-colour("brown")} !important;
 }
 @mixin yellow-accent {
@@ -353,7 +349,7 @@
   --accent-link-visited: #{colour.brand-colour("white")} !important;
   --accent-keyline: #{colour.brand-colour("white", 0.5)} !important;
   --accent-keyline-dark: #{colour.brand-colour("white", 0.8)} !important;
-  --button-accent-text: #{colour.brand-colour("white")} !important;
+  --button-accented-text: #{colour.brand-colour("white")} !important;
 }
 %black-accent {
@@ -361,8 +357,8 @@
   --accent-background-light: #{colour.brand-colour("light-grey")} !important;
   --accent-border: #{colour.brand-colour("black")} !important;
   --accent-list-marker: #{colour.brand-colour("grey")} !important;
-  --button-accent-text: #{colour.brand-colour("black")} !important;
-  --button-accent-background: #{colour.brand-colour("grey")} !important;
+  --button-accented-text: #{colour.brand-colour("black")} !important;
+  --button-accented-background: #{colour.brand-colour("grey")} !important;
 }
 @mixin black-accent {
@@ -375,7 +371,7 @@
   --accent-background-light: #{colour.brand-colour("pastel-pink")} !important;
   --accent-border: #{colour.brand-colour("pink")} !important;
   --accent-list-marker: #{colour.brand-colour("pink")} !important;
-  --button-accent-background: #{colour.brand-colour("maroon")} !important;
+  --button-accented-background: #{colour.brand-colour("maroon")} !important;
 }
 @mixin pink-accent {
@@ -388,7 +384,7 @@
   --accent-background-light: #{colour.brand-colour("pastel-orange")} !important;
   --accent-border: #{colour.brand-colour("orange")} !important;
   --accent-list-marker: #{colour.brand-colour("orange")} !important;
-  --button-accent-background: #{colour.brand-colour("chestnut")} !important;
+  --button-accented-background: #{colour.brand-colour("chestnut")} !important;
 }
 @mixin orange-accent {
@@ -401,7 +397,7 @@
   --accent-background-light: #{colour.brand-colour("pastel-green")} !important;
   --accent-border: #{colour.brand-colour("green")} !important;
   --accent-list-marker: #{colour.brand-colour("green")} !important;
-  --button-accent-background: #{colour.brand-colour("forest")} !important;
+  --button-accented-background: #{colour.brand-colour("forest")} !important;
 }
 @mixin green-accent {
@@ -414,7 +410,7 @@
   --accent-background-light: #{colour.brand-colour("pastel-blue")} !important;
   --accent-border: #{colour.brand-colour("blue")} !important;
   --accent-list-marker: #{colour.brand-colour("blue")} !important;
-  --button-accent-background: #{colour.brand-colour("navy")} !important;
+  --button-accented-background: #{colour.brand-colour("navy")} !important;
 }
 @mixin blue-accent {

package/nationalarchives/tools/_media.scss CHANGED Viewed

@@ -90,13 +90,3 @@ $media-tiny: "(max-width: #{$largest-tiny-device-em})";
     @content;
   }
 }
-%hide-on-print {
-  @media print {
-    display: none;
-  }
-}
-@mixin hide-on-print() {
-  @extend %hide-on-print;
-}

package/nationalarchives/utilities/_columns.scss CHANGED Viewed

@@ -1,5 +1,5 @@
-@use "../tools/grid";
 @use "../tools/media";
+@use "../tools/grid";
 .tna-columns {
   column-gap: grid.gutter-width();

package/nationalarchives/utilities/_index.scss CHANGED Viewed

@@ -5,6 +5,7 @@
 @use "debug";
 @use "forms";
 @use "global";
+@use "grid";
 @use "imports";
 @use "lists";
 @use "overrides";

package/nationalarchives/utilities/_reset.scss CHANGED Viewed

@@ -25,17 +25,11 @@ canvas {
   display: block;
 }
-video,
-canvas {
-  width: 100%;
-}
 [hidden] {
   display: none !important;
 }
 hr {
-  border-width: 1px 0 0;
-  @include colour.colour-border("keyline");
-  border-style: solid;
+  @include colour.colour-border("keyline", 0, solid);
+  border-top-width: 1px;
 }

package/nationalarchives/utilities/{_colour.scss → colour/_index.scss} RENAMED Viewed

@@ -1,7 +1,7 @@
-@use "../tools/colour";
+@use "../../tools/colour";
 .tna-template {
-  @include colour.light;
+  @include colour.always-light;
   @include colour.colour-background("background");

package/nationalarchives/utilities/{_forms.scss → forms/_index.scss} RENAMED Viewed

@@ -1,8 +1,8 @@
-@use "../utilities/typography" as typographyUtilities;
-@use "../tools/colour";
-@use "../tools/media";
-@use "../tools/spacing";
-@use "../tools/typography";
+@use "../../utilities/typography" as typographyUtilities;
+@use "../../tools/colour";
+@use "../../tools/media";
+@use "../../tools/spacing";
+@use "../../tools/typography";
 button,
 input,
@@ -93,7 +93,7 @@ select {
   &__error-message {
     margin-top: 0;
-    @include colour.colour-font("form-error");
+    @include colour.colour-font("form-error-text");
     @include typography.main-font-weight-bold;
   }
 }

package/nationalarchives/utilities/grid/macro.njk ADDED Viewed

@@ -0,0 +1,3 @@
+{% macro tnaGrid(params) %}
+  {%- include "nationalarchives/utilities/grid/template.njk" -%}
+{% endmacro %}

package/nationalarchives/{components → utilities}/grid/template.njk RENAMED Viewed

@@ -10,7 +10,7 @@
   {%- set containerClasses = containerClasses.concat('tna-container--no-padding-all') -%}
 {%- endif -%}
 {%- set classes = containerClasses | join(' ') -%}
-<{{ htmlElement }} class="tna-container{% if classes %} {{ classes }}{% endif %}" {%- for attribute, value in params.attributes %} {{ attribute }}="{{ value }}"{% endfor %}>
+<{{ htmlElement }} class="tna-container{% if classes %} {{ classes }}{% endif %}" {%- for attribute, value in params.attributes %} {{ attribute }}{% if value !== '' %}="{{ value }}"{% endif %}{% endfor %}>
 {%- for item in params.columns %}
   {%- set columnHtmlElement = item.htmlElement if item.htmlElement else 'div' -%}
   {%- set columnClasses = [item.classes] if item.classes else [] -%}

package/nationalarchives/utilities/{_lists.scss → lists/_index.scss} RENAMED Viewed

@@ -1,8 +1,14 @@
-@use "../tools/colour";
-@use "../tools/media";
-@use "../tools/spacing";
-@use "../tools/typography";
-@use "../utilities/typography" as typographyUtils;
+@use "../../tools/colour";
+@use "../../tools/media";
+@use "../../tools/spacing";
+@use "../../tools/typography";
+@use "../../utilities/typography" as typographyUtils;
+ul,
+ol {
+  margin: 0;
+  padding: 0;
+}
 .tna-ul {
   list-style-type: disc;
@@ -10,9 +16,9 @@
 .tna-ul,
 .tna-ol {
-  margin: spacing.space(1) 0 0;
+  margin-top: spacing.space(1);
-  padding: 0 0 0 spacing.space(2);
+  padding-left: spacing.space(2);
   &:first-child {
     margin-top: 0;
@@ -20,7 +26,10 @@
   &--plain {
     padding-left: 0;
+  }
+  &--plain,
+  &--no-list-style {
     list-style: none;
   }

package/nationalarchives/utilities/{_overrides.scss → overrides/_index.scss} RENAMED Viewed

@@ -1,6 +1,6 @@
 @use "sass:map";
-@use "../tools/media";
-@use "../tools/spacing";
+@use "../../tools/media";
+@use "../../tools/spacing";
 @mixin hide-on($suffix) {
   .tna-\!--hide-on-#{$suffix} {
@@ -30,3 +30,9 @@
   @include spacing.no-spacing-generator("tiny");
   @include hide-on("tiny");
 }
+.tna-\!--hide-on-print {
+  @media print {
+    display: none;
+  }
+}

package/nationalarchives/utilities/{_tables.scss → tables/_index.scss} RENAMED Viewed

@@ -1,10 +1,10 @@
 @use "sass:math";
 @use "sass:selector";
-@use "../tools/colour";
-@use "../tools/grid";
-@use "../tools/media";
-@use "../tools/spacing";
-@use "../tools/typography";
+@use "../../tools/colour";
+@use "../../tools/grid";
+@use "../../tools/media";
+@use "../../tools/spacing";
+@use "../../tools/typography";
 .tna-table {
   width: 100%;

package/nationalarchives/utilities/{_typography.scss → typography/_index.scss} RENAMED Viewed

@@ -1,10 +1,10 @@
 @use "sass:math";
 @use "sass:selector";
-@use "../variables/typography" as typographyVars;
-@use "../tools/colour";
-@use "../tools/media";
-@use "../tools/spacing";
-@use "../tools/typography";
+@use "../../variables/typography" as typographyVars;
+@use "../../tools/colour";
+@use "../../tools/media";
+@use "../../tools/spacing";
+@use "../../tools/typography";
 .tna-template {
   @include colour.colour-font("font-base");
@@ -122,6 +122,9 @@ small {
   @include colour.colour-border("accent-background", 2px);
+  -webkit-print-color-adjust: exact;
+  print-color-adjust: exact;
   .tna-background-accent & {
     @include colour.contrast;

package/nationalarchives/variables/_colour.scss CHANGED Viewed

@@ -65,7 +65,8 @@ $colour-palette-default: (
   "input-foreground": brand-colour("black"),
   "input-background": brand-colour("white"),
   "input-border": brand-colour("black"),
-  "form-error": #c00,
+  "form-error-border": #c20000,
+  "form-error-text": #c20000,
   "button-text": brand-colour("white"),
   "button-background": brand-colour("black"),
   "button-hover-text": brand-colour("black"),
@@ -95,8 +96,12 @@ $colour-palette-default: (
   "accent-link-visited": brand-colour("black"),
   "accent-keyline": brand-colour("black", 0.5),
   "accent-keyline-dark": brand-colour("black", 0.8),
-  "button-accent-text": brand-colour("black"),
-  "button-accent-background": brand-colour("grey"),
+  "accent-button-text": brand-colour("white"),
+  "accent-button-background": brand-colour("black"),
+  "accent-button-hover-text": brand-colour("black"),
+  "accent-button-hover-background": brand-colour("white"),
+  "button-accented-text": brand-colour("black"),
+  "button-accented-background": brand-colour("grey"),
 ) !default;
 /*
@@ -121,7 +126,8 @@ $colour-palette-dark: map.merge(
     "input-foreground": brand-colour("white"),
     "input-background": brand-colour("black"),
     "input-border": brand-colour("white"),
-    "form-error": #ff3d3d,
+    "form-error-border": #f00,
+    "form-error-text": #ff6b6b,
     "button-text": brand-colour("black"),
     "button-background": brand-colour("white"),
     "button-hover-text": brand-colour("white"),
@@ -169,7 +175,8 @@ $colour-palette-high-contrast-dark: map.merge(
     "font-light": brand-colour("white"),
     "icon-light": brand-colour("white", 0.75),
     "keyline": brand-colour("white"),
-    "form-error": #ff6161,
+    "form-error-border": #ff6b6b,
+    "form-error-text": #ff6b6b,
     "contrast-background": brand-colour("black"),
     "contrast-link": brand-colour("blue"),
     "contrast-link-visited": #a8f,

package/package.json CHANGED Viewed

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