npm - @nationalarchives/frontend - Versions diffs - 0.1.14-prerelease → 0.1.16-prerelease - Mend

@nationalarchives/frontend 0.1.14-prerelease → 0.1.16-prerelease

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

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

@@ -1,5 +1,5 @@
 {# Based on https://github.com/alphagov/govuk-frontend/blob/8b6bf304b9fc891f64459c25a08f3d623f3fea72/packages/govuk-frontend/src/govuk/template.njk #}
-{#% from "./components/skip-link/macro.njk" import tnaSkipLink -%#}
+{% from "./components/skip-link/macro.njk" import tnaSkipLink -%}
 <!DOCTYPE html>
 <html lang="{{ htmlLang | default('en-GB') }}" class="tna-template {{ htmlClasses }}">
   <head>
@@ -23,15 +23,17 @@
     {% block stylesheets %}{% endblock %}
   </head>
     <body class="tna-template__body {{ bodyClasses }}" {%- for attribute, value in bodyAttributes %} {{attribute}}="{{value}}"{% endfor %}>
-    {% block skipLink %}
-    {#{ govukSkipLink({
-      href: '#main-content',
-      text: 'Skip to main content'
-    }) }#}
+    {% block bodyStart %}
+      {% block cookies %}{% endblock %}
+      {% block skipLink %}
+      {{ tnaSkipLink({
+        href: '#main-content',
+        text: 'Skip to main content'
+      }) }}
+      {% endblock %}
     {% endblock %}
-    {% block bodyStart %}{% endblock %}
     {% block header %}{% endblock %}
     {% block main %}

package/nationalarchives/tools/_colour.scss CHANGED Viewed

@@ -1,6 +1,11 @@
 @use "sass:map";
 @use "../features";
 @use "../variables/colour";
+@use "../tools/media";
+@function brand-colour($colour) {
+  @return map.get(colour.$colour-palette-brand, $colour);
+}
 @mixin colour-css-vars() {
   @each $name, $value in colour.$colour-palette-default {
@@ -26,38 +31,87 @@
   }
 }
-@mixin colour-font($colour) {
+@mixin colour-font($colour, $important: false) {
   color: map.get(colour.$colour-palette-default, $colour);
-  color: var(--#{$colour});
+  @if $colour == "accent" {
+    color: var(--#{$colour}, var(--accent-default))
+      if($important, !important, null);
+  } @else {
+    color: var(--#{$colour}) if($important, !important, null);
+  }
 }
-@mixin colour-background($colour) {
+@mixin colour-background($colour, $important: false) {
   background-color: map.get(colour.$colour-palette-default, $colour);
-  background-color: var(--#{$colour});
+  @if $colour == "accent" {
+    background-color: var(--#{$colour}, var(--accent-default))
+      if($important, !important, null);
+  } @else {
+    background-color: var(--#{$colour}) if($important, !important, null);
+  }
 }
-@mixin colour-border($colour) {
-  border-color: map.get(colour.$colour-palette-default, $colour);
-  border-color: var(--#{$colour});
+@mixin colour-border(
+  $colour,
+  $width: "",
+  $style: solid,
+  $direction: "",
+  $important: false
+) {
+  @if $direction != "" {
+    @if $width != "" {
+      $property: border-#{$direction};
+      border-#{$direction}: $width
+        map.get(colour.$colour-palette-default, $colour)
+        $style
+        if($important, !important, null);
+      border-#{$direction}: $width
+        var(--#{$colour})
+        $style
+        if($important, !important, null);
+    } @else {
+      border-#{$direction}-color: map.get(
+          colour.$colour-palette-default,
+          $colour
+        )
+        if($important, !important, null);
+      border-#{$direction}-color: var(--#{$colour})
+        if($important, !important, null);
+    }
+  } @else {
+    @if $width != "" {
+      border: $width
+        map.get(colour.$colour-palette-default, $colour)
+        $style
+        if($important, !important, null);
+      border: $width var(--#{$colour}) $style if($important, !important, null);
+    } @else {
+      border-color: map.get(colour.$colour-palette-default, $colour)
+        if($important, !important, null);
+      border-color: var(--#{$colour}) if($important, !important, null);
+    }
+  }
 }
-@mixin colour-outline($colour) {
-  outline-color: map.get(colour.$colour-palette-default, $colour);
-  outline-color: var(--#{$colour});
+@mixin colour-outline($colour, $important: false) {
+  outline-color: map.get(colour.$colour-palette-default, $colour)
+    if($important, !important, null);
+  outline-color: var(--#{$colour}) if($important, !important, null);
 }
-@mixin colour-fill($colour) {
-  fill: map.get(colour.$colour-palette-default, $colour);
-  fill: var(--#{$colour});
+@mixin colour-fill($colour, $important: false) {
+  fill: map.get(colour.$colour-palette-default, $colour)
+    if($important, !important, null);
+  fill: var(--#{$colour}) if($important, !important, null);
 }
 @mixin fixed {
   @include colour-css-vars;
-  @include colour-font("font-base");
+  // @include colour-font("font-base");
 }
-@mixin invert {
+%invert {
   --font-base: var(--contrast-font-base);
   --font-dark: var(--contrast-font-dark);
   --font-light: var(--contrast-font-light);
@@ -66,10 +120,33 @@
   --keyline: var(--contrast-keyline);
   --keyline-dark: var(--contrast-keyline-dark);
-  @include colour-font("contrast-font-base");
+  // @include colour-font("contrast-font-base");
   @include colour-background("contrast-background");
 }
+@mixin invert {
+  @extend %invert;
+}
+%invert-on-mobile {
+  @include media.on-mobile {
+    --font-base: var(--contrast-font-base);
+    --font-dark: var(--contrast-font-dark);
+    --font-light: var(--contrast-font-light);
+    --link: var(--contrast-link);
+    --link-visited: var(--contrast-link-visited);
+    --keyline: var(--contrast-keyline);
+    --keyline-dark: var(--contrast-keyline-dark);
+    // @include colour-font("contrast-font-base");
+    @include colour-background("contrast-background");
+  }
+}
+@mixin invert-on-mobile {
+  @extend %invert-on-mobile;
+}
 @mixin uninvert {
   @include colour-css-vars;
@@ -105,3 +182,15 @@
     @include colour-css-vars-high-contrast-dark;
   }
 }
+@mixin on-high-contrast {
+  .tna-template--high-contrast-theme & {
+    @content;
+  }
+  @media (prefers-contrast: more) {
+    .tna-template--system-theme & {
+      @content;
+    }
+  }
+}

package/nationalarchives/tools/_index.scss CHANGED Viewed

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

package/nationalarchives/tools/_typography.scss CHANGED Viewed

@@ -5,9 +5,17 @@
   font-size: #{math.div($fontSizePx, typography.$base-font-size-px)}rem;
 }
+@mixin main-font-weight {
+  font-weight: typography.$font-weight-main;
+}
+@mixin main-font-weight-bold {
+  font-weight: typography.$font-weight-main-bold;
+}
 @mixin main-font {
   font-family: typography.$font-family-main;
-  font-weight: typography.$font-weight-main;
+  @include main-font-weight;
 }
 @mixin heading-font {
@@ -18,4 +26,8 @@
 @mixin detail-font {
   font-family: typography.$font-family-detail;
   font-weight: typography.$font-weight-detail;
+  @include relative-font-size(14);
+  text-transform: uppercase;
+  line-height: #{math.div(typography.$base-font-size-px, 14)};
+  // line-height: 1;
 }

package/nationalarchives/utilities/_debug.scss CHANGED Viewed

@@ -1,11 +1,51 @@
 @use "../features";
+/*
+ * ==========================================
+ * WCAG 2.2 SC 2.5.8
+ * https://www.w3.org/WAI/WCAG22/Understanding/target-size-minimum
+ * ------------------------------------------
+ * AA - Small green circles should not intersect
+ * ------------------------------------------
+ */
 @if features.$debug-interactable-areas {
   a,
   button,
   label[for] {
     background-color: rgba(#f0a, 0.25) !important;
-    box-shadow: 0 0 0 1px #f0a !important;
+    box-shadow:
+      0 0 0 2px #f0a,
+      0 0 0.5rem #f0a !important;
+    position: relative;
+    &::before {
+      width: 20px;
+      height: 20px;
+      display: block;
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      background-color: rgba(#0f3, 0.25) !important;
+      border-radius: 100%;
+      outline: 2px #0f3 solid;
+      outline-offset: 10px;
+      box-shadow:
+        0 0 0 2px #0f3,
+        0 0 0.5rem #0f3 !important;
+      transform: translateX(-50%) translateY(-50%);
+      content: "";
+    }
+    .tna-template--dark-theme & {
+    }
   }
 }

package/nationalarchives/utilities/_global.scss CHANGED Viewed

@@ -98,11 +98,11 @@
   overflow: auto;
-  &:has(.tna-header):has(#main[role="main"]):has(.tna-footer) {
+  &:has(.tna-header):has(#main-content[role="main"]):has(.tna-footer) {
     display: flex;
     flex-direction: column;
-    #main[role="main"] {
+    #main-content[role="main"] {
       flex: 1;
     }
   }
@@ -134,11 +134,15 @@ canvas {
 }
 hr {
-  margin: 1rem;
+  margin: 3rem 0;
   border-width: 1px 0 0;
   @include colour.colour-border("keyline");
-  border-style: solid;
+  border-style: dashed;
+  @include colour.on-high-contrast {
+    border-style: solid;
+  }
 }
 .tna-visually-hidden {
@@ -159,4 +163,9 @@ hr {
   border: 0 !important;
   background-color: transparent !important;
+  &::before,
+  &::after {
+    content: "\00a0";
+  }
 }

package/nationalarchives/utilities/_index.scss CHANGED Viewed

@@ -1,3 +1,4 @@
 @forward "debug";
 @forward "global";
+@forward "overrides";
 @forward "typography";

package/nationalarchives/utilities/_overrides.scss ADDED Viewed

@@ -0,0 +1,30 @@
+@use "../variables/spacing";
+@use "../tools/media";
+@each $property in margin, padding {
+  @each $direction in top, bottom {
+    .tna-\!--no-#{$property}-#{$direction},
+    .tna-\!--no-#{$property}-vertical {
+      #{$property}-#{$direction}: 0 !important;
+    }
+  }
+}
+@mixin overrides($spacing) {
+  @each $property in margin, padding {
+    @each $direction in top, bottom {
+      @each $size, $amount in $spacing {
+        .tna-\!--#{$property}-#{$direction}-#{$size},
+        .tna-\!--#{$property}-vertical-#{$size} {
+          #{$property}-#{$direction}: #{$amount}rem !important;
+        }
+      }
+    }
+  }
+}
+@include overrides(spacing.$spacing);
+@include media.on-mobile {
+  @include overrides(spacing.$spacing-mobile);
+}

package/nationalarchives/utilities/_typography.scss CHANGED Viewed

@@ -1,9 +1,10 @@
+@use "sass:math";
 @use "../tools/colour";
 @use "../tools/media";
 @use "../tools/typography";
-// Temporary - will eventually bundle font files into package
-@import "https://fonts.googleapis.com/css2?family=Open+Sans:wght@400;700&family=Roboto+Mono:wght@400;700&display=swap";
+// TODO: Temporary - will eventually bundle font files into package
+@import "https://fonts.googleapis.com/css2?family=Open+Sans:wght@500;700&family=Roboto+Mono:wght@400&display=swap";
 @import "https://use.typekit.net/hkj3kuz.css";
 .tna-template {
@@ -19,7 +20,8 @@
 .tna-template__body {
   color: inherit;
   @include typography.relative-font-size(18);
-  line-height: 1.6;
+  // line-height: 1.6;
+  line-height: #{math.div(16, 18) * 2};
 }
 h1,
@@ -33,6 +35,16 @@ ol {
   margin-top: 0;
 }
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+strong {
+  @include typography.main-font-weight-bold;
+}
 p {
   margin: 0 0 1.5rem;
@@ -43,23 +55,26 @@ p {
 a {
   @include colour.colour-font("link");
+  text-decoration-thickness: 1.5px;
   &:visited {
     @include colour.colour-font("link-visited");
   }
+  &:hover,
   &:active {
-    text-decoration-thickness: 4px;
-  }
-  &:hover {
-    text-decoration-thickness: 3px;
+    text-decoration-thickness: 3.5px;
   }
 }
 .tna-ul,
 .tna-ol {
-  padding-left: 2rem;
+  margin: 0 0 2rem;
+  padding: 0 0 0 2rem;
+  &:last-child {
+    margin-bottom: 0;
+  }
   li::marker {
     @include colour.colour-font("accent");
@@ -121,22 +136,20 @@ a {
 }
 .tna-hgroup {
-  margin-bottom: 2rem;
+  margin-bottom: 1rem;
   &:last-child {
     margin-bottom: 0;
   }
   &__supertitle {
-    margin: 0;
+    margin: 0 0 0.5rem;
     @include colour.colour-font("font-base");
-    @include typography.relative-font-size(14);
     @include typography.detail-font;
-    text-transform: uppercase;
     .tna-hgroup & {
-      margin: 0;
+      // margin: 0;
     }
   }
@@ -153,57 +166,52 @@ a {
   }
   &--xl {
-    .tna-hgroup__supertitle {
-    }
     .tna-hgroup__title {
       @include typography.relative-font-size(64);
+      line-height: 1;
     }
   }
   &--l {
-    .tna-hgroup__supertitle {
-    }
     .tna-hgroup__title {
       @include typography.relative-font-size(32);
+      line-height: 1.2;
     }
   }
   &--m {
-    .tna-hgroup__supertitle {
-    }
     .tna-hgroup__title {
       @include typography.relative-font-size(20);
+      line-height: 1.4;
     }
   }
   &--s {
-    .tna-hgroup__supertitle {
-    }
     .tna-hgroup__title {
       @include typography.relative-font-size(18);
+      line-height: 1.6;
     }
   }
 }
 .tna-blockquote {
-  margin: 0;
+  margin: 0 0 2rem;
   padding: 1rem 1rem 1rem 2rem;
-  border-left: 0.35rem solid;
-  @include colour.colour-border("keyline");
-  quotes: "“" "”" "‘" "’";
+  @include colour.colour-border("keyline", 0.35rem, solid, left);
-  &::before {
-    float: left;
+  // quotes: "“" "”" "‘" "’";
-    content: open-quote;
+  &:last-child {
+    margin-bottom: 0;
   }
+  // &::before {
+  //   float: left;
+  //   content: open-quote;
+  // }
   &__quote {
     font-weight: 700;
   }