diff --git a/.storybook/storybook.scss b/.storybook/storybook.scss index 076eb4d4..787604bb 100644 --- a/.storybook/storybook.scss +++ b/.storybook/storybook.scss @@ -252,13 +252,11 @@ margin-top: 0.5rem; } - .tna-chip-list { + .tna-dl-chips { margin-top: 1rem; - - flex-wrap: nowrap; } - .fa-solid { + p .fa-solid { // margin-left: 0.5rem; &.light-icon { diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d893c23..ebfdf95e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Theme selector is hidden when forced colors mode is enabled +- The markup for a chip list has been updated ### Deprecated ### Removed diff --git a/src/nationalarchives/components/card/card.stories.js b/src/nationalarchives/components/card/card.stories.js index 9da9d52c..2dfd57a4 100644 --- a/src/nationalarchives/components/card/card.stories.js +++ b/src/nationalarchives/components/card/card.stories.js @@ -157,9 +157,9 @@ Meta.args = { label: "New", labelColour: "green", meta: [ - { text: "24th September 2023", icon: "calendar" }, - { text: "From £16", icon: "ticket" }, - { text: "Online", icon: "location-dot" }, + { title: "Event date", text: "24th September 2023", icon: "calendar" }, + { title: "Cost", text: "From £16", icon: "ticket" }, + { title: "Location", text: "Online", icon: "location-dot" }, ], body: "
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam vel tincidunt velit, a molestie turpis.
", htmlElement: "article", diff --git a/src/nationalarchives/components/card/fixtures.json b/src/nationalarchives/components/card/fixtures.json index fd8528eb..14af6586 100644 --- a/src/nationalarchives/components/card/fixtures.json +++ b/src/nationalarchives/components/card/fixtures.json @@ -18,7 +18,7 @@ "headingLevel": 3, "body": "Card body
" }, - "html": "Card body
Card supertitle
Card body
Card body
" }, - "html": "Card body
Card body
{{ params.supertitle }}
{{ params.text }}
diff --git a/src/nationalarchives/components/checkboxes/fixtures.json b/src/nationalarchives/components/checkboxes/fixtures.json index 2f8ce3db..795489ec 100644 --- a/src/nationalarchives/components/checkboxes/fixtures.json +++ b/src/nationalarchives/components/checkboxes/fixtures.json @@ -24,7 +24,7 @@ } ] }, - "html": "" + "html": "" }, { "name": "small checkboxes", @@ -78,7 +78,7 @@ ], "small": true }, - "html": "" + "html": "" }, { "name": "checkboxes with a preselected value", @@ -104,7 +104,7 @@ } ] }, - "html": "" + "html": "" }, { "name": "checkboxes with a hint", @@ -130,7 +130,7 @@ } ] }, - "html": "" + "html": "" }, { "name": "checkboxes with an error", @@ -158,7 +158,7 @@ } ] }, - "html": "" + "html": "" }, { "name": "inline checkboxes", diff --git a/src/nationalarchives/components/checkboxes/template.njk b/src/nationalarchives/components/checkboxes/template.njk index 49a5c84d..645d0451 100644 --- a/src/nationalarchives/components/checkboxes/template.njk +++ b/src/nationalarchives/components/checkboxes/template.njk @@ -4,7 +4,8 @@ {%- if params.inline -%} {%- set containerClasses = containerClasses.concat('tna-form__group--inline') -%} {%- endif -%} -