@nationalarchives/frontend 0.1.9-prerelease → 0.1.10-prerelease

package/nationalarchives/utilities/_global.scss

@@ -1,6 +1,29 @@
+@use "../features";
 @use "../variables/colour";
 @use "../variables/typography";
 
+:root {
+  @include colour.colour-css-vars;
+
+  @if features.$support-colour-schemes {
+    @media (prefers-color-scheme: dark) {
+      @include colour.colour-css-vars-dark;
+    }
+
+    @media (prefers-contrast: more) {
+      @include colour.colour-css-vars-high-contrast;
+
+      * {
+        background-image: none !important;
+      }
+    }
+
+    @media (prefers-contrast: more) and (prefers-color-scheme: dark) {
+      @include colour.colour-css-vars-high-contrast-dark;
+    }
+  }
+}
+
 .tna-template {
   min-width: 320px;
   width: 100%;
@@ -12,6 +35,54 @@
 
   font-size: #{typography.$base-font-size-px}px;
 
+  @include colour.colour-background("page-background");
+
+  &--back-accent {
+    accent-color: colour.$tna-black;
+  }
+
+  &--yellow-accent {
+    accent-color: colour.$tna-yellow;
+  }
+
+  &--pink-accent {
+    accent-color: colour.$tna-pink;
+  }
+
+  &--orange-accent {
+    accent-color: colour.$tna-orange;
+  }
+
+  &--green-accent {
+    accent-color: colour.$tna-green;
+  }
+
+  &--blue-accent {
+    accent-color: colour.$tna-blue;
+  }
+
+  @if features.$support-colour-schemes {
+    &--light-theme {
+      @include colour.colour-css-vars;
+    }
+
+    &--dark-theme {
+      @include colour.colour-css-vars-dark;
+    }
+
+    &--high-contrast-theme {
+      @include colour.colour-css-vars-high-contrast;
+
+      * {
+        background-image: none !important;
+      }
+
+      &.tna-template--dark-theme {
+        @include colour.colour-css-vars-high-contrast-dark;
+      }
+    }
+  }
+
   @media (prefers-reduced-motion) {
     * {
       animation: none !important;
@@ -25,7 +96,7 @@
   margin: 0;
   padding: 0;
 
-  background-color: #fff;
+  // background-color: #fff;
 
   overflow: auto;
 }
@@ -49,6 +120,28 @@ canvas {
 }
 
 *:focus {
-  outline: 0.3125rem colour.$focus-colour solid;
+  // outline: 0.3125rem colour.$focus-colour solid;
+  outline: 0.3125rem solid;
+  @include colour.colour-outline("focus-outline");
   outline-offset: 0.125rem;
 }
+
+.tna-visually-hidden {
+  width: 1px !important;
+  height: 1px !important;
+  margin: 0 !important;
+  padding: 0 !important;
+
+  position: absolute !important;
+  top: -9999px !important;
+  left: -9999px !important;
+  z-index: -1 !important;
+
+  overflow: hidden !important;
+
+  clip: rect(0, 0, 0, 0) !important;
+
+  border: 0 !important;
+
+  background-color: transparent !important;
+}

package/nationalarchives/utilities/_typography.scss

@@ -10,15 +10,27 @@
 .tna-template {
   font-family: typography.$font-family-main;
   font-weight: typography.$font-weight-main;
-  color: colour.$base-font-colour;
+  // color: colour.$base-font-colour;
+  @include colour.colour-font("base-font");
   -moz-osx-font-smoothing: grayscale;
   -webkit-font-smoothing: antialiased;
   text-rendering: optimizeLegibility;
   -webkit-text-size-adjust: none;
   direction: ltr;
 
+  h1,
+  h2,
+  h3,
+  h4,
+  h5,
+  h6,
+  ul,
+  ol {
+    margin-top: 0;
+  }
+
   p {
-    margin: 0 0 2rem;
+    margin: 0 0 1.5rem;
 
     &:last-child {
       margin-bottom: 0;
@@ -34,145 +46,145 @@
       text-decoration-thickness: 3px;
     }
   }
+}
 
-  .tna-template__body {
-    @include tools.relative-font-size(16);
-    line-height: 1.6;
-  }
+.tna-template__body {
+  @include tools.relative-font-size(16);
+  line-height: 1.6;
+}
 
-  .tna-ul,
-  .tna-ol {
-    padding-left: 2rem;
+.tna-ul,
+.tna-ol {
+  padding-left: 2rem;
 
-    li::marker {
-      color: #f0a;
-      font-weight: 700;
-    }
+  li::marker {
+    color: #f0a;
+    font-weight: 700;
   }
 
-  .tna-ul--plain,
-  .tna-ol--plain {
+  &--plain {
     padding-left: 0;
 
     list-style: none;
   }
+}
 
-  .tna-heading {
-    margin-top: 0;
-    margin-bottom: 1.5rem;
-
-    color: colour.$tna-black;
-    font-family: typography.$font-family-heading;
-    font-weight: typography.$font-weight-heading;
+.tna-heading {
+  margin-bottom: 1.5rem;
 
-    &:last-child {
-      margin-bottom: 0;
-    }
+  color: colour.$tna-black;
+  font-family: typography.$font-family-heading;
+  font-weight: typography.$font-weight-heading;
 
-    &--xl {
-      @include tools.relative-font-size(64);
-      line-height: 1;
+  &:last-child {
+    margin-bottom: 0;
+  }
 
-      @include media.on-medium {
-        @include tools.relative-font-size(42);
-      }
+  &--xl {
+    @include tools.relative-font-size(64);
+    line-height: 1;
 
-      @include media.on-mobile {
-        @include tools.relative-font-size(36);
-      }
+    @include media.on-medium {
+      @include tools.relative-font-size(42);
     }
 
-    &--l {
-      @include tools.relative-font-size(32);
-      line-height: 1.2;
+    @include media.on-mobile {
+      @include tools.relative-font-size(36);
+    }
+  }
 
-      @include media.on-medium {
-        @include tools.relative-font-size(26);
-      }
+  &--l {
+    @include tools.relative-font-size(32);
+    line-height: 1.2;
 
-      @include media.on-mobile {
-        @include tools.relative-font-size(24);
-      }
+    @include media.on-medium {
+      @include tools.relative-font-size(26);
     }
 
-    &--m {
-      @include tools.relative-font-size(20);
-      line-height: 1.4;
+    @include media.on-mobile {
+      @include tools.relative-font-size(24);
     }
+  }
 
-    &--s {
-      @include tools.relative-font-size(18);
-      line-height: 1.6;
-    }
+  &--m {
+    @include tools.relative-font-size(20);
+    line-height: 1.4;
   }
 
-  .tna-hgroup {
-    margin-bottom: 2rem;
+  &--s {
+    @include tools.relative-font-size(18);
+    line-height: 1.6;
+  }
+}
 
-    &:last-child {
-      margin-bottom: 0;
-    }
+.tna-hgroup {
+  margin-bottom: 2rem;
 
-    &__supertitle {
-      margin: 0;
+  &:last-child {
+    margin-bottom: 0;
+  }
 
-      color: colour.$base-font-colour;
-      @include tools.relative-font-size(14);
-      font-family: typography.$font-family-detail;
-      font-weight: typography.$font-weight-detail;
-      text-transform: uppercase;
+  &__supertitle {
+    margin: 0;
 
-      // .tna-hgroup & {
-      //   margin: 0;
-      // }
-    }
+    // color: colour.$base-font-colour;
+    @include colour.colour-font("base-font");
+    @include tools.relative-font-size(14);
+    font-family: typography.$font-family-detail;
+    font-weight: typography.$font-weight-detail;
+    text-transform: uppercase;
+
+    // .tna-hgroup & {
+    //   margin: 0;
+    // }
+  }
 
-    &__title {
-      margin: 0;
+  &__title {
+    margin: 0;
 
-      color: colour.$tna-black;
+    color: colour.$tna-black;
 
-      .tna-hgroup__supertitle {
-        display: block;
+    .tna-hgroup__supertitle {
+      display: block;
 
-        color: colour.$base-font-colour;
-      }
+      // color: colour.$base-font-colour;
+      @include colour.colour-font("base-font");
     }
+  }
 
-    &--xl {
-      .tna-hgroup__supertitle {
-      }
+  &--xl {
+    .tna-hgroup__supertitle {
+    }
 
-      .tna-hgroup__title {
-        @include tools.relative-font-size(64);
-      }
+    .tna-hgroup__title {
+      @include tools.relative-font-size(64);
     }
+  }
 
-    &--l {
-      .tna-hgroup__supertitle {
-      }
+  &--l {
+    .tna-hgroup__supertitle {
+    }
 
-      .tna-hgroup__title {
-        @include tools.relative-font-size(32);
-      }
+    .tna-hgroup__title {
+      @include tools.relative-font-size(32);
     }
+  }
 
-    &--m {
-      .tna-hgroup__supertitle {
-      }
+  &--m {
+    .tna-hgroup__supertitle {
+    }
 
-      .tna-hgroup__title {
-        @include tools.relative-font-size(20);
-      }
+    .tna-hgroup__title {
+      @include tools.relative-font-size(20);
     }
+  }
 
-    &--s {
-      .tna-hgroup__supertitle {
-      }
+  &--s {
+    .tna-hgroup__supertitle {
+    }
 
-      .tna-hgroup__title {
-        @include tools.relative-font-size(18);
-      }
+    .tna-hgroup__title {
+      @include tools.relative-font-size(18);
     }
   }
 }

package/nationalarchives/variables/_all.scss

@@ -1,3 +1,4 @@
+@use "assets";
 @use "colour";
 @use "grid";
 @use "media";

package/nationalarchives/variables/_assets.scss

@@ -0,0 +1 @@
+$tna-assets-path: "/assets" !default;

package/nationalarchives/variables/_colour.scss

@@ -1,11 +1,95 @@
+@use "sass:map";
+
 $tna-black: #000;
 $tna-yellow: #fc0;
 $tna-pink: #fe1d57;
 $tna-orange: #fd3f03;
 $tna-green: #86bc25;
 $tna-blue: #00b0ff;
+$dark: #26262a;
+
+$page-background: #fff;
+$base-font: #343338;
+$focus-outline: #004c7e;
+$keyline: #ccc;
+
+$colour-palette-default: (
+  "page-background": $page-background,
+  "base-font": $base-font,
+  "dark-font": $tna-black,
+  "focus-outline": $focus-outline,
+  "keyline": $keyline,
+);
+
+$colour-palette-dark: map.merge(
+  $colour-palette-default,
+  (
+    "page-background": $dark,
+    "base-font": #eee,
+    "dark-font": #fff,
+    "focus-outline": $tna-yellow,
+    "keyline": #444,
+  )
+);
+
+$colour-palette-high-contrast: map.merge(
+  $colour-palette-default,
+  (
+    "base-font": $tna-black,
+    "focus-outline": #f0a,
+    "keyline": $tna-black,
+  )
+);
+
+$colour-palette-high-contrast-dark: map.merge(
+  $colour-palette-dark,
+  (
+    "page-background": $tna-black,
+    "base-font": #fff,
+    "keyline": #fff,
+  )
+);
+
+@mixin colour-css-vars() {
+  @each $name, $value in $colour-palette-default {
+    --#{$name}: #{$value};
+  }
+}
+
+@mixin colour-css-vars-dark() {
+  @each $name, $value in $colour-palette-dark {
+    --#{$name}: #{$value};
+  }
+}
+
+@mixin colour-css-vars-high-contrast() {
+  @each $name, $value in $colour-palette-high-contrast {
+    --#{$name}: #{$value};
+  }
+}
+
+@mixin colour-css-vars-high-contrast-dark() {
+  @each $name, $value in $colour-palette-high-contrast-dark {
+    --#{$name}: #{$value};
+  }
+}
+
+@mixin colour-font($colour) {
+  color: map.get($colour-palette-default, $colour);
+  color: var(--#{$colour});
+}
+
+@mixin colour-background($colour) {
+  background-color: map.get($colour-palette-default, $colour);
+  background-color: var(--#{$colour});
+}
+
+@mixin colour-border($colour) {
+  border-color: map.get($colour-palette-default, $colour);
+  border-color: var(--#{$colour});
+}
 
-$dark: #26262a !default;
-$base-font-colour: #343338 !default;
-$focus-colour: #004c7e !default;
-$keyline-colour: #ccc !default;
+@mixin colour-outline($colour) {
+  outline-color: map.get($colour-palette-default, $colour);
+  outline-color: var(--#{$colour});
+}

package/nationalarchives/variables/_media.scss

@@ -1,12 +1,40 @@
-$largest-medium-device: 1024px !default;
-$largest-small-device: 768px !default;
-$largest-tiny-device: 480px !default;
+@use "sass:math";
+@use "./typography";
 
-$media-large: "(min-width: #{$largest-medium-device + 1px})" !default;
-$media-lt-large: "(max-width: #{$largest-medium-device})" !default;
-$media-medium: "(min-width: #{$largest-small-device + 1px}) and (max-width: #{$largest-medium-device})" !default;
-$media-gt-mobile: "(min-width: #{$largest-small-device + 1px})" !default;
-$media-mobile: "(max-width: #{$largest-small-device})" !default;
-$media-small: "(min-width: #{$largest-tiny-device + 1px}) and (max-width: #{$largest-small-device})" !default;
-$media-gt-tiny: "(min-width: #{$largest-tiny-device + 1px})" !default;
-$media-tiny: "(max-width: #{$largest-tiny-device})" !default;
+$largest-medium-device-px: 1024 !default;
+$largest-small-device-px: 768 !default;
+$largest-tiny-device-px: 480 !default;
+
+$smallest-large-device-em: #{math.div(
+    $largest-medium-device-px + 1,
+    typography.$base-font-size-px
+  )}em;
+$largest-medium-device-em: #{math.div(
+    $largest-medium-device-px,
+    typography.$base-font-size-px
+  )}em;
+$smallest-medium-device-em: #{math.div(
+    $largest-small-device-px + 1,
+    typography.$base-font-size-px
+  )}em;
+$largest-small-device-em: #{math.div(
+    $largest-small-device-px,
+    typography.$base-font-size-px
+  )}em;
+$smallest-small-device-em: #{math.div(
+    $largest-tiny-device-px + 1,
+    typography.$base-font-size-px
+  )}em;
+$largest-tiny-device-em: #{math.div(
+    $largest-tiny-device-px,
+    typography.$base-font-size-px
+  )}em;
+
+$media-large: "(min-width: #{$smallest-large-device-em})";
+$media-lt-large: "(max-width: #{$largest-medium-device-em})";
+$media-medium: "(min-width: #{$smallest-medium-device-em}) and (max-width: #{$largest-medium-device-em})";
+$media-gt-mobile: "(min-width: #{$smallest-medium-device-em})";
+$media-mobile: "(max-width: #{$largest-small-device-em})";
+$media-small: "(min-width: #{$smallest-small-device-em}) and (max-width: #{$largest-small-device-em})";
+$media-gt-tiny: "(min-width: #{$smallest-small-device-em})";
+$media-tiny: "(max-width: #{$largest-tiny-device-em})";

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nationalarchives/frontend",
-  "version": "0.1.9-prerelease",
+  "version": "0.1.10-prerelease",
   "description": "The National Archives frontend styles",
   "scripts": {
     "start": "storybook dev -p 6006",
     "build": "storybook build -o storybook",
-    "test": "test-storybook --stories-json && node tasks/test-fixtures.js",
-    "lint": "prettier --check '{src,.storybook,tasks}/**/*.{js,mjs,scss,json}' && stylelint 'src/**/*.scss' && eslint 'src/**/*.mjs'",
-    "lint:fix": "prettier --write '{src,.storybook,tasks}/**/*.{js,mjs,scss,json}' && stylelint --fix 'src/**/*.scss' && eslint --fix 'src/**/*.mjs'",
+    "test": "test-storybook --verbose --stories-json && node tasks/test-fixtures.js",
+    "lint": "prettier --check '{src,.storybook,tasks}/**/*.{js,mjs,scss,json,html}' && stylelint 'src/**/*.scss' && eslint 'src/**/*.mjs'",
+    "lint:fix": "prettier --write '{src,.storybook,tasks}/**/*.{js,mjs,scss,json,html}' && stylelint --fix 'src/**/*.scss' && eslint --fix 'src/**/*.mjs'",
     "package:sass": "sass --style=compressed --quiet-deps src/nationalarchives/all.scss package/nationalarchives/all.css",
     "package:scripts": "webpack"
   },
@@ -42,22 +42,24 @@
     "@babel/core": "^7.19.1",
     "@babel/preset-env": "^7.22.5",
     "@mdx-js/react": "^2.1.3",
-    "@storybook/addon-a11y": "^7.0.22",
-    "@storybook/addon-docs": "^7.0.22",
-    "@storybook/addon-essentials": "^7.0.22",
-    "@storybook/addon-interactions": "^7.0.23",
-    "@storybook/addon-links": "^7.0.22",
-    "@storybook/addon-mdx-gfm": "^7.0.22",
-    "@storybook/html": "^7.0.22",
-    "@storybook/html-webpack5": "^7.0.22",
+    "@storybook/addon-a11y": "^7.0.27",
+    "@storybook/addon-docs": "^7.0.27",
+    "@storybook/addon-essentials": "^7.0.27",
+    "@storybook/addon-interactions": "^7.0.27",
+    "@storybook/addon-links": "^7.0.27",
+    "@storybook/addon-mdx-gfm": "^7.0.27",
+    "@storybook/html": "^7.0.27",
+    "@storybook/html-webpack5": "^7.0.27",
     "@storybook/jest": "^0.1.0",
     "@storybook/test-runner": "^0.11.0",
     "@storybook/testing-library": "^0.2.0",
     "babel-loader": "^9.0.1",
+    "chromatic": "^6.19.9",
     "copy-webpack-plugin": "^11.0.0",
     "css-loader": "^6.7.1",
     "diff": "^5.1.0",
     "eslint": "^8.43.0",
+    "eslint-plugin-storybook": "^0.6.12",
     "glob": "^10.2.7",
     "jest-image-snapshot": "^6.1.0",
     "nunjucks": "^3.2.3",
@@ -67,7 +69,7 @@
     "sass": "^1.54.9",
     "sass-loader": "^13.0.2",
     "simple-nunjucks-loader": "^3.2.0",
-    "storybook": "^7.0.22",
+    "storybook": "^7.0.27",
     "style-loader": "^3.3.1",
     "stylelint": "^15.9.0",
     "stylelint-config-standard-scss": "^10.0.0",

package/nationalarchives/stories/development/structure.mdx

@@ -1,7 +0,0 @@
-import { Meta } from "@storybook/blocks";
-
-<Meta title="Development/Structure" />
-
-# Project structure
-
-[Technical details]