npm - @nationalarchives/frontend - Versions diffs - 0.1.34 → 0.1.36 - Mend

@nationalarchives/frontend 0.1.34 → 0.1.36

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

package/nationalarchives/stories/utilities/colour-schemes/colour-themes.stories.js CHANGED Viewed

@@ -5,7 +5,6 @@ import Card from "../../../components/card/template.njk";
 import Checkboxes from "../../../components/checkboxes/template.njk";
 import FeaturedRecords from "../../../components/featured-records/template.njk";
 import Footer from "../../../components/footer/template.njk";
-import CookieBanner from "../../../components/cookie-banner/template.njk";
 import Gallery from "../../../components/gallery/template.njk";
 import Header from "../../../components/header/template.njk";
 import Hero from "../../../components/hero/template.njk";
@@ -92,13 +91,6 @@ const Template = ({ theme, accent }) => {
               : ""
   }">
   <div class="tna-template__body tna-template__body--padded">
-    <!--
-    ${CookieBanner({
-      params: {
-        cookiesUrl: "#",
-      },
-    })}
-    -->
     ${SkipLink({
       params: {
         href: "main-content",
@@ -1068,7 +1060,6 @@ const Template = ({ theme, accent }) => {
                   headingSize: "l",
                   id: "search1",
                   name: "q",
-                  formGroupClasses: "tna-search-field--no-border",
                 },
               })}
               ${TextInput({

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

@@ -9,7 +9,7 @@
 {% set pageTitle = '' %}
 <!DOCTYPE html>
-<html lang="{{ htmlLang | default('en-GB') }}" class="tna-template tna-template--{{ theme | default('system') }}-theme tna-template--{{ themeAccent | default('black') }}-accent {{ htmlClasses }}"{% for attribute, value in htmlAttributes %} {{attribute}}="{{value}}"{% endfor %}>
+<html lang="{{ htmlLang | default('en') }}" class="tna-template tna-template--{{ theme | default('system') }}-theme tna-template--{{ themeAccent | default('black') }}-accent {{ htmlClasses }}"{% for attribute, value in htmlAttributes %} {{attribute}}="{{value}}"{% endfor %}>
   <head>
     <meta charset="utf-8">
     <title>{% block pageTitle %}{% if pageTitle %}{{ pageTitle }} - {{ siteTitle }}{% else %}{{ siteTitle }}{% endif %}{% endblock %}</title>
@@ -20,10 +20,18 @@
     {% block headIcons %}
     <link rel="shortcut icon" sizes="16x16 32x32 48x48" href="{{ assetPath | default('/assets') }}/images/favicon.ico" type="image/x-icon">
     <link rel="mask-icon" href="{{ assetPath | default('/assets') }}/images/mask-icon.svg" color="{{ themeColor | default('#000000') }}">
-    <link rel="apple-touch-icon" sizes="180x180" href="{{ assetPath | default('/assets') }}/images/apple-touch-icon-180x180.png">
-    <link rel="apple-touch-icon" sizes="167x167" href="{{ assetPath | default('/assets') }}/images/apple-touch-icon-167x167.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="{{ assetPath | default('/assets') }}/images/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" href="{{ assetPath | default('/assets') }}/images/apple-touch-icon.png">
+    <link rel="apple-touch-icon" sizes="48x48" href="{{ assetPath | default('/assets') }}/images/icon-48x48.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="{{ assetPath | default('/assets') }}/images/icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="96x96" href="{{ assetPath | default('/assets') }}/images/icon-96x96.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="{{ assetPath | default('/assets') }}/images/icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="{{ assetPath | default('/assets') }}/images/icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="{{ assetPath | default('/assets') }}/images/icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="167x167" href="{{ assetPath | default('/assets') }}/images/icon-167x167.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="{{ assetPath | default('/assets') }}/images/icon-180x180.png">
+    <link rel="apple-touch-icon" sizes="192x192" href="{{ assetPath | default('/assets') }}/images/icon-192x192.png">
+    <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 %}
     {% block head %}{% endblock %}
@@ -37,7 +45,8 @@
     {% block bodyStart %}
       {% block cookies %}
         {{ tnaCookieBanner({
-          url: '#'
+          cookiesUrl: '#',
+          cookiesPath: "/tna-frontend/"
         }) }}
       {% endblock %}

package/nationalarchives/tools/_colour.scss CHANGED Viewed

@@ -150,18 +150,38 @@
   fill: var(--#{$colour}) if($important, !important, null);
 }
+%light {
+  @include colour-css-vars;
+  @media (prefers-contrast: more) {
+    @include colour-css-vars-high-contrast;
+  }
+}
+@mixin light {
+  @extend %light;
+}
+%dark {
+  @include colour-css-vars-dark;
+  @media (prefers-contrast: more) {
+    @include colour-css-vars-high-contrast-dark;
+  }
+}
+@mixin dark {
+  @extend %dark;
+}
 %plain {
   .tna-template--system-theme & {
-    @include colour-css-vars;
+    @extend %light;
     @media (prefers-color-scheme: dark) {
       @include colour-css-vars-dark;
     }
-    @media (prefers-contrast: more) {
-      @include colour-css-vars-high-contrast;
-    }
     @media (prefers-contrast: more) and (prefers-color-scheme: dark) {
       @include colour-css-vars-high-contrast-dark;
     }
@@ -190,22 +210,6 @@
   @extend %plain;
 }
-@mixin light {
-  @include colour-css-vars;
-  @media (prefers-contrast: more) {
-    @include colour-css-vars-high-contrast;
-  }
-}
-@mixin dark {
-  @include colour-css-vars-dark;
-  @media (prefers-contrast: more) {
-    @include colour-css-vars-high-contrast-dark;
-  }
-}
 %contrast {
   --background: var(--contrast-background);
   --font-base: var(--contrast-font-base);

package/nationalarchives/utilities/_colour.scss CHANGED Viewed

@@ -1,8 +1,8 @@
 @use "../tools/colour";
-:root {
-  @include colour.colour-css-vars;
-}
+// :root {
+//   @include colour.colour-css-vars;
+// }
 .tna-template {
   @include colour.colour-background("page-background");

package/nationalarchives/utilities/_forms.scss CHANGED Viewed

@@ -71,7 +71,6 @@
     &--xs {
       font-size: 1em;
       @include typography.main-font;
-      // @include typography.main-font-weight-bold;
     }
   }

package/nationalarchives/utilities/_lists.scss CHANGED Viewed

@@ -94,15 +94,12 @@
   &--plain {
     dt {
       padding-top: 0;
-      // padding-bottom: 0;
       padding-left: 0;
     }
     dd {
-      // margin-bottom: 0.5rem;
       padding-top: 0;
       padding-right: 0;
-      // padding-bottom: 0;
     }
   }

package/nationalarchives/utilities/_typography.scss CHANGED Viewed

@@ -17,13 +17,13 @@
     // font-display: swap;
   }
-  @font-face {
-    font-family: "Open Sans";
-    src: url("#{assets.$tna-font-path}/OpenSans-Italic.ttf");
-    font-weight: typographyVars.$main-font-weight;
-    font-style: italic;
-    // font-display: swap;
-  }
+  // @font-face {
+  //   font-family: "Open Sans";
+  //   src: url("#{assets.$tna-font-path}/OpenSans-Italic.ttf");
+  //   font-weight: typographyVars.$main-font-weight;
+  //   font-style: italic;
+  //   // font-display: swap;
+  // }
   @font-face {
     font-family: "Open Sans";
@@ -87,9 +87,16 @@ strong {
 p {
   @include spacing.space-above;
-  + p {
+  + p/*,
+  + .tna-ul,
+  + .tna-ol,
+  + .tna-blockquote*/ {
     margin-top: 1rem;
   }
+  // + :is(p, .tna-ul, .tna-ol, .tna-blockquote) {
+  //   margin-top: 1rem;
+  // }
 }
 a {
@@ -223,7 +230,7 @@ small {
       display: inline-block;
       &::after {
-        padding-left: 0.25rem;
+        padding-left: 0.5rem;
         display: inline-block;
@@ -234,7 +241,7 @@ small {
       &:hover {
         &::after {
-          padding-left: 0.5rem;
+          padding-left: 0.75rem;
         }
       }
     }
@@ -265,7 +272,7 @@ small {
   line-height: 1.3;
   @include media.on-medium {
-    @include typography.relative-font-size(26);
+    @include typography.relative-font-size(30);
   }
   @include media.on-mobile {
@@ -388,7 +395,7 @@ small {
   }
   &__author {
-    font-style: italic;
+    @include typography.relative-font-size(16);
     .tna-blockquote & {
       margin: 1rem 0 0;
@@ -398,6 +405,10 @@ small {
       content: "\2014" " ";
     }
   }
+  @include media.on-tiny {
+    padding: 0.5rem 0.5rem 0.5rem 1rem;
+  }
 }
 .tna-large-paragraph {

package/nationalarchives/variables/_colour.scss CHANGED Viewed

@@ -49,7 +49,7 @@ LIGHT THEME (DEFAULT)
 */
 $colour-palette-default: (
   "page-background": #f4f4f4,
-  "background-tint": #ededed,
+  "background-tint": #e4e4e4,
   "font-base": $base-font,
   "font-dark": brand-colour("black"),
   "font-light": brand-colour("black", 0.58),
@@ -123,7 +123,6 @@ $colour-palette-dark: map.merge(
     "contrast-background": #111,
     "contrast-link-visited":
       map.get($colour-palette-default, "contrast-link-visited"),
-    // "accent-background-light": brand-colour("light-grey"),
   )
 ) !default;

package/package.json CHANGED Viewed

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

package/nationalarchives/assets/images/apple-touch-icon-152x152.png DELETED Viewed

Binary file

package/nationalarchives/assets/images/apple-touch-icon-167x167.png DELETED Viewed

Binary file

package/nationalarchives/assets/images/apple-touch-icon-180x180.png DELETED Viewed

Binary file

package/nationalarchives/assets/images/apple-touch-icon.png DELETED Viewed

Binary file

package/nationalarchives/lib/_font-awesome.scss DELETED Viewed

@@ -1,6 +0,0 @@
-@use "../variables/assets";
-$fa-font-path: assets.$fa-font-path;
-@import "font-awesome/fontawesome";
-@import "font-awesome/solid";
-@import "font-awesome/brands";

package/nationalarchives/lib/_index.scss DELETED Viewed

	@@ -1 +0,0 @@
1	- @use "font-awesome";