From db5d96ee6d36b0832c0994a514d03750d49dbf6d Mon Sep 17 00:00:00 2001 From: Andrew Hosgood Date: Wed, 28 Aug 2024 14:56:36 +0100 Subject: [PATCH 1/3] Remove top and bottom padding from breadcrumbs --- .../components/breadcrumbs/breadcrumbs.scss | 7 --- src/nationalarchives/templates/index-grid.njk | 19 +++---- src/nationalarchives/templates/list.njk | 19 +++---- src/nationalarchives/templates/plain.njk | 19 +++---- .../utilities/colour/colour-themes.stories.js | 55 +++++++++---------- 5 files changed, 54 insertions(+), 65 deletions(-) diff --git a/src/nationalarchives/components/breadcrumbs/breadcrumbs.scss b/src/nationalarchives/components/breadcrumbs/breadcrumbs.scss index 88ce3302..f088412a 100644 --- a/src/nationalarchives/components/breadcrumbs/breadcrumbs.scss +++ b/src/nationalarchives/components/breadcrumbs/breadcrumbs.scss @@ -4,13 +4,6 @@ @use "../../tools/typography"; .tna-breadcrumbs { - padding-top: spacing.space(1); - padding-bottom: spacing.space(1); - - // &:focus { - // outline: none !important; - // } - &__list { margin: 0; padding: 0; diff --git a/src/nationalarchives/templates/index-grid.njk b/src/nationalarchives/templates/index-grid.njk index 1feb430d..e71e1791 100644 --- a/src/nationalarchives/templates/index-grid.njk +++ b/src/nationalarchives/templates/index-grid.njk @@ -11,16 +11,15 @@ {% block beforeContent %}
-
- {{ tnaBreadcrumbs({ - items: [ - { - text: 'Home', - href: '/' - } - ] - }) }} -
+ {{ tnaBreadcrumbs({ + items: [ + { + text: 'Home', + href: '/' + } + ] + classes: 'tna-column tna-column--full tna-!--padding-vertical-s' + }) }}
{% endblock %} diff --git a/src/nationalarchives/templates/list.njk b/src/nationalarchives/templates/list.njk index 67fcc89e..283a1c8d 100644 --- a/src/nationalarchives/templates/list.njk +++ b/src/nationalarchives/templates/list.njk @@ -10,16 +10,15 @@ {% block beforeContent %}
-
- {{ tnaBreadcrumbs({ - items: [ - { - text: 'Home', - href: '/' - } - ] - }) }} -
+ {{ tnaBreadcrumbs({ + items: [ + { + text: 'Home', + href: '/' + } + ] + classes: 'tna-column tna-column--full tna-!--padding-vertical-s' + }) }}
{% endblock %} diff --git a/src/nationalarchives/templates/plain.njk b/src/nationalarchives/templates/plain.njk index b04fa260..656ba36b 100644 --- a/src/nationalarchives/templates/plain.njk +++ b/src/nationalarchives/templates/plain.njk @@ -8,16 +8,15 @@ {% block beforeContent %}
-
- {{ tnaBreadcrumbs({ - items: [ - { - text: 'Home', - href: '/' - } - ] - }) }} -
+ {{ tnaBreadcrumbs({ + items: [ + { + text: 'Home', + href: '/' + } + ] + classes: 'tna-column tna-column--full tna-!--padding-vertical-s' + }) }}
{% endblock %} diff --git a/src/nationalarchives/utilities/colour/colour-themes.stories.js b/src/nationalarchives/utilities/colour/colour-themes.stories.js index 3b8da74c..4b6e1b09 100644 --- a/src/nationalarchives/utilities/colour/colour-themes.stories.js +++ b/src/nationalarchives/utilities/colour/colour-themes.stories.js @@ -154,34 +154,33 @@ const Template = ({ theme, accent }) => { }, })}
-
- ${Breadcrumbs({ - params: { - items: [ - { - text: "Alpha", - href: "#/alpha", - }, - { - text: "Beta", - href: "#/beta", - }, - { - text: "Gamma", - href: "#/gamma", - }, - { - text: "Delta", - href: "#/delta", - }, - { - text: "Epsilon", - href: "#/epsilon", - }, - ], - }, - })} -
+ ${Breadcrumbs({ + params: { + items: [ + { + text: "Alpha", + href: "#/alpha", + }, + { + text: "Beta", + href: "#/beta", + }, + { + text: "Gamma", + href: "#/gamma", + }, + { + text: "Delta", + href: "#/delta", + }, + { + text: "Epsilon", + href: "#/epsilon", + }, + ], + classes: "tna-column tna-column--full tna-!--padding-vertical-s", + }, + })}
${Hero({ From 2a4dff2ad6dab7f13c4a80e2385b2182ba46b6f3 Mon Sep 17 00:00:00 2001 From: Andrew Hosgood Date: Wed, 28 Aug 2024 14:58:50 +0100 Subject: [PATCH 2/3] Add missing comma to templates --- src/nationalarchives/templates/index-grid.njk | 2 +- src/nationalarchives/templates/list.njk | 2 +- src/nationalarchives/templates/plain.njk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/nationalarchives/templates/index-grid.njk b/src/nationalarchives/templates/index-grid.njk index e71e1791..46e0fa76 100644 --- a/src/nationalarchives/templates/index-grid.njk +++ b/src/nationalarchives/templates/index-grid.njk @@ -17,7 +17,7 @@ text: 'Home', href: '/' } - ] + ], classes: 'tna-column tna-column--full tna-!--padding-vertical-s' }) }} diff --git a/src/nationalarchives/templates/list.njk b/src/nationalarchives/templates/list.njk index 283a1c8d..731ed061 100644 --- a/src/nationalarchives/templates/list.njk +++ b/src/nationalarchives/templates/list.njk @@ -16,7 +16,7 @@ text: 'Home', href: '/' } - ] + ], classes: 'tna-column tna-column--full tna-!--padding-vertical-s' }) }} diff --git a/src/nationalarchives/templates/plain.njk b/src/nationalarchives/templates/plain.njk index 656ba36b..d3b56b1b 100644 --- a/src/nationalarchives/templates/plain.njk +++ b/src/nationalarchives/templates/plain.njk @@ -14,7 +14,7 @@ text: 'Home', href: '/' } - ] + ], classes: 'tna-column tna-column--full tna-!--padding-vertical-s' }) }} From 179b1ee9f440d862aacef62e60a6eca7e7dac60a Mon Sep 17 00:00:00 2001 From: Andrew Hosgood Date: Wed, 28 Aug 2024 15:10:06 +0100 Subject: [PATCH 3/3] Update fixtures --- CHANGELOG.md | 3 +++ src/nationalarchives/templates/fixtures.json | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 43306a4a..4d458f29 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - `$import-google-fonts` option (default: `true`) which can disable the inclusion of Google Fonts using an `@import` declaration ### Changed + +- Removed the top and bottom padding of the breadcrumbs component + ### Deprecated ### Removed ### Fixed diff --git a/src/nationalarchives/templates/fixtures.json b/src/nationalarchives/templates/fixtures.json index 3d10f007..3ea66f7b 100644 --- a/src/nationalarchives/templates/fixtures.json +++ b/src/nationalarchives/templates/fixtures.json @@ -33,19 +33,19 @@ "name": "plain", "template": "plain.njk", "options": {}, - "html": "Plain page - The National ArchivesSkip to main content
The National Archives

Plain page

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Mauris at magna est. Sed vel fermentum arcu. Suspendisse viverra est nec interdum tincidunt. Phasellus dictum, turpis eget iaculis tincidunt, ex metus porttitor turpis, ut pulvinar risus erat quis dui. Nam semper sapien a ipsum congue pharetra.

Donec cursus, eros eu egestas aliquam, ipsum ligula suscipit metus, eget maximus turpis nisl vitae ex. Etiam ornare convallis quam a consequat. Etiam sodales aliquet nulla, id rutrum justo accumsan sed.

  • Alpha
  • Beta
  • Gamma
  1. Alpha
  2. Beta
  3. Gamma
Alpha
Lorem ipsum
Beta
Lorem ipsum
Gamma
Lorem ipsum
Delta
Lorem ipsum
Epsilon
Lorem ipsum
Records added and removed between 2020 and 2022.
YearRecords addedRecords removed
2020123,456789
2021456,789123
202242,4241,337
Total622,6692,249
" + "html": "Plain page - The National ArchivesSkip to main content
The National Archives

Plain page

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Mauris at magna est. Sed vel fermentum arcu. Suspendisse viverra est nec interdum tincidunt. Phasellus dictum, turpis eget iaculis tincidunt, ex metus porttitor turpis, ut pulvinar risus erat quis dui. Nam semper sapien a ipsum congue pharetra.

Donec cursus, eros eu egestas aliquam, ipsum ligula suscipit metus, eget maximus turpis nisl vitae ex. Etiam ornare convallis quam a consequat. Etiam sodales aliquet nulla, id rutrum justo accumsan sed.

  • Alpha
  • Beta
  • Gamma
  1. Alpha
  2. Beta
  3. Gamma
Alpha
Lorem ipsum
Beta
Lorem ipsum
Gamma
Lorem ipsum
Delta
Lorem ipsum
Epsilon
Lorem ipsum
Records added and removed between 2020 and 2022.
YearRecords addedRecords removed
2020123,456789
2021456,789123
202242,4241,337
Total622,6692,249
" }, { "name": "list", "template": "list.njk", "options": {}, - "html": "List page - The National ArchivesSkip to main content
The National Archives

List page

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam sit amet luctus libero. Cras nec mauris ex. Fusce nisl erat, efficitur sed auctor ornare, varius fermentum arcu.

" + "html": "List page - The National ArchivesSkip to main content
The National Archives

List page

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam sit amet luctus libero. Cras nec mauris ex. Fusce nisl erat, efficitur sed auctor ornare, varius fermentum arcu.

" }, { "name": "index grid", "template": "index-grid.njk", "options": {}, - "html": "Index list page - The National ArchivesSkip to main content
The National Archives

Index list page

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam sit amet luctus libero. Cras nec mauris ex. Fusce nisl erat, efficitur sed auctor ornare, varius fermentum arcu.

" + "html": "Index list page - The National ArchivesSkip to main content
The National Archives

Index list page

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam sit amet luctus libero. Cras nec mauris ex. Fusce nisl erat, efficitur sed auctor ornare, varius fermentum arcu.

" } ] }