From 628f16910dd15eccff685d7f487604497f283aba Mon Sep 17 00:00:00 2001
From: Andrew Hosgood <mail@andrewhosgood.com>
Date: Thu, 6 Jun 2024 18:31:59 +0100
Subject: [PATCH] Add dashed lists (#132)

---
 CHANGELOG.md                                  |  4 ++
 .../components/hero/hero.scss                 | 24 ++++++++++++
 .../components/picture/picture.mjs            |  4 --
 .../colour-combinations.stories.js            |  8 ++--
 .../stories/utilities/lists/lists.stories.js  | 38 ++++++++++++++----
 src/nationalarchives/tools/_colour.scss       |  4 ++
 src/nationalarchives/utilities/_lists.scss    | 39 ++++++++++---------
 src/nationalarchives/variables/_colour.scss   |  2 -
 8 files changed, 87 insertions(+), 36 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e4cad0d0..1cf78ba2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,8 +10,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - Allow `lazyImages` attribute for lazy loading of index grid images
+- Dashed lists open with `.tna-ul--dashed` and `.tna-ol--dashed` replace the markers with dashes
 
 ### Changed
+
+- The transcript button on picture components no longer gets a `tna-picture__toggle-transcript--opened` class when opened
+
 ### Deprecated
 ### Removed
 ### Fixed
diff --git a/src/nationalarchives/components/hero/hero.scss b/src/nationalarchives/components/hero/hero.scss
index 5013aa08..be86bf70 100644
--- a/src/nationalarchives/components/hero/hero.scss
+++ b/src/nationalarchives/components/hero/hero.scss
@@ -232,6 +232,30 @@ $shift-units: 5 !default;
     padding-bottom: spacing.space($padding-units-narrow);
   }
 
+  &--details-cutout &__details {
+    &::before {
+      content: "";
+      @include colour.plain;
+
+      width: 3rem;
+      height: 3rem;
+
+      position: absolute;
+      top: 0;
+      right: 0;
+      z-index: 1;
+
+      border-radius: 0% 0 0% 50%;
+      @include colour.colour-background("background");
+    }
+
+    &[open] {
+      &::before {
+        display: none;
+      }
+    }
+  }
+
   @include media.on-mobile {
     & &__figure {
       min-height: auto;
diff --git a/src/nationalarchives/components/picture/picture.mjs b/src/nationalarchives/components/picture/picture.mjs
index c7864db3..33e2917e 100644
--- a/src/nationalarchives/components/picture/picture.mjs
+++ b/src/nationalarchives/components/picture/picture.mjs
@@ -42,16 +42,12 @@ export class Picture {
   }
 
   handleToggleTranscript() {
-    const transcriptToggleOpenedClass =
-      "tna-picture__toggle-transcript--opened";
     this.transcriptOpened = !this.transcriptOpened;
     if (this.transcriptOpened) {
-      this.$transcriptToggle.classList.add(transcriptToggleOpenedClass);
       this.$transcriptToggle.setAttribute("aria-expanded", true);
       this.$transcriptToggle.innerText = this.closeLabel;
       this.$transcript.removeAttribute("hidden");
     } else {
-      this.$transcriptToggle.classList.remove(transcriptToggleOpenedClass);
       this.$transcriptToggle.setAttribute("aria-expanded", false);
       this.$transcriptToggle.innerText = this.openLabel;
       this.$transcript.setAttribute("hidden", true);
diff --git a/src/nationalarchives/stories/utilities/colour-schemes/colour-combinations.stories.js b/src/nationalarchives/stories/utilities/colour-schemes/colour-combinations.stories.js
index ee4b93af..9b7f6aa2 100644
--- a/src/nationalarchives/stories/utilities/colour-schemes/colour-combinations.stories.js
+++ b/src/nationalarchives/stories/utilities/colour-schemes/colour-combinations.stories.js
@@ -17,20 +17,20 @@ const Template = ({ theme }) => {
 
   const accents = [
     "",
-    "tna-accent-black",
-    "tna-accent-yellow",
     "tna-accent-pink",
     "tna-accent-orange",
+    "tna-accent-yellow",
     "tna-accent-green",
     "tna-accent-blue",
+    "tna-accent-black",
   ];
 
   const blocks = [
     "",
     "tna-background-tint",
-    "tna-background-accent-light",
-    "tna-background-accent",
     "tna-background-contrast",
+    "tna-background-accent",
+    "tna-background-accent-light",
   ];
 
   return `<div class="tna-colour-contrast-demo">
diff --git a/src/nationalarchives/stories/utilities/lists/lists.stories.js b/src/nationalarchives/stories/utilities/lists/lists.stories.js
index b52e94dd..38cb3d97 100644
--- a/src/nationalarchives/stories/utilities/lists/lists.stories.js
+++ b/src/nationalarchives/stories/utilities/lists/lists.stories.js
@@ -9,8 +9,8 @@ export default {
   argTypes,
 };
 
-const UnorderedListTemplate = ({ items, plain, classes }) =>
-  `<ul class="tna-ul${plain ? " tna-ul--plain" : ""} ${classes}">${items.reduce(
+const UnorderedListTemplate = ({ items, style, classes = "" }) =>
+  `<ul class="tna-ul${style ? ` tna-ul--${style}` : ""} ${classes}">${items.reduce(
     (list, item) => `${list}<li>${item}</li>`,
     "",
   )}</ul>`;
@@ -27,11 +27,19 @@ UnorderedListPlain.parameters = {
 };
 UnorderedListPlain.args = {
   items: ["Alpha", "Beta", "Gamma"],
-  plain: true,
+  style: "plain",
+};
+export const UnorderedListDashed = UnorderedListTemplate.bind({});
+UnorderedListDashed.parameters = {
+  chromatic: { disableSnapshot: true },
+};
+UnorderedListDashed.args = {
+  items: ["Alpha", "Beta", "Gamma"],
+  style: "dashed",
 };
 
-const OrderedListTemplate = ({ items, plain, classes }) =>
-  `<ol class="tna-ol${plain ? " tna-ol--plain" : ""} ${classes}">${items.reduce(
+const OrderedListTemplate = ({ items, style, classes = "" }) =>
+  `<ol class="tna-ol${style ? ` tna-ol--${style}` : ""} ${classes}">${items.reduce(
     (list, item) => `${list}<li>${item}</li>`,
     "",
   )}</ol>`;
@@ -48,10 +56,26 @@ OrderedListPlain.parameters = {
 };
 OrderedListPlain.args = {
   items: ["Alpha", "Beta", "Gamma"],
-  plain: true,
+  style: "plain",
+};
+export const OrderedListDashed = OrderedListTemplate.bind({});
+OrderedListDashed.parameters = {
+  chromatic: { disableSnapshot: true },
+};
+OrderedListDashed.args = {
+  items: ["Alpha", "Beta", "Gamma"],
+  style: "dashed",
+};
+export const OrderedListNested = OrderedListTemplate.bind({});
+OrderedListNested.parameters = {
+  chromatic: { disableSnapshot: true },
+};
+OrderedListNested.args = {
+  items: ["Alpha", "Beta", "Gamma", "Delta"],
+  style: "dashed",
 };
 
-const DescriptionListTemplate = ({ items, plain, classes }) =>
+const DescriptionListTemplate = ({ items, plain, classes = "" }) =>
   `<dl class="tna-dl${plain ? " tna-dl--plain" : ""}${
     items.some((item) => item.icon) ? " tna-dl--icon-padding" : ""
   } ${classes}">${items.reduce(
diff --git a/src/nationalarchives/tools/_colour.scss b/src/nationalarchives/tools/_colour.scss
index eee4570c..87d1a969 100644
--- a/src/nationalarchives/tools/_colour.scss
+++ b/src/nationalarchives/tools/_colour.scss
@@ -173,6 +173,7 @@
   --button-hover-text: var(--contrast-button-hover-text);
   --button-hover-background: var(--contrast-button-hover-background);
   --accent-list-marker: var(--accent-border);
+  // --accent-list-marker: var(--font-base);
 
   @include colour-background("background");
 
@@ -199,6 +200,7 @@
     --button-hover-text: var(--contrast-button-hover-text);
     --button-hover-background: var(--contrast-button-hover-background);
     --accent-list-marker: var(--accent-border);
+    // --accent-list-marker: var(--font-base);
 
     @include colour-background("background");
 
@@ -359,6 +361,8 @@
   --accent-background-light: #{colour.brand-colour("light-grey")} !important;
   --accent-border: #{colour.brand-colour("black")} !important;
   --accent-list-marker: #{colour.brand-colour("black")} !important;
+  --button-background: #{colour.brand-colour("light-grey")} !important;
+  --button-text: #{colour.brand-colour("black")} !important;
   --button-accent-text: #{colour.brand-colour("black")} !important;
   --button-accent-background: #{colour.brand-colour("grey")} !important;
 }
diff --git a/src/nationalarchives/utilities/_lists.scss b/src/nationalarchives/utilities/_lists.scss
index 9d75942a..a6dd0cf2 100644
--- a/src/nationalarchives/utilities/_lists.scss
+++ b/src/nationalarchives/utilities/_lists.scss
@@ -4,8 +4,7 @@
 @use "../tools/typography";
 @use "../utilities/typography" as typographyUtils;
 
-.tna-ul,
-.tna-ul > li > ul {
+.tna-ul {
   list-style-type: disc;
 }
 
@@ -13,33 +12,35 @@
 .tna-ol {
   margin: spacing.space(1) 0 0;
 
-  > li > ul,
-  > li > ol {
+  padding: 0 0 0 spacing.space(2);
+
+  &:first-child {
     margin-top: 0;
   }
 
-  &,
-  & > li > ul,
-  & > li > ol {
-    padding: 0 0 0 spacing.space(2);
+  &--plain {
+    padding-left: 0;
 
-    &--plain {
-      padding-left: 0;
+    list-style: none;
+  }
 
-      &,
-      & > li > ul {
-        list-style: none;
-      }
-    }
+  & > li > & {
+    padding-left: spacing.space(1);
+  }
 
-    > li::marker {
+  > li {
+    &::marker {
       @include colour.colour-font("accent-list-marker");
-      font-weight: 700;
+      @include typography.main-font-weight-bold;
     }
   }
 
-  &:first-child {
-    margin-top: 0;
+  &--dashed {
+    > li::marker {
+      content: "—  ";
+      @include colour.colour-font("font-light");
+      @include typography.main-font-weight;
+    }
   }
 }
 
diff --git a/src/nationalarchives/variables/_colour.scss b/src/nationalarchives/variables/_colour.scss
index e91b9238..42186685 100644
--- a/src/nationalarchives/variables/_colour.scss
+++ b/src/nationalarchives/variables/_colour.scss
@@ -127,8 +127,6 @@ $colour-palette-dark: map.merge(
     "button-hover-text": brand-colour("white"),
     "button-hover-background": brand-colour("black"),
     "contrast-background": #101112,
-    "contrast-link-visited":
-      map.get($colour-palette-default, "contrast-link-visited"),
     "accent-border": brand-colour("white"),
     "accent-list-marker": brand-colour("white", 0.51),
   )