diff options
| author | Joe Carstairs <65492573+joeacarstairs@users.noreply.github.com> | 2024-10-05 17:27:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-05 17:27:40 +0100 |
| commit | 2febffe5e3036c4b35dff4a8b274f42a7f8fef42 (patch) | |
| tree | 7287800600f340871620631b8431cef37fc58891 /scss | |
| parent | 285023b7c6bac87e049df0d8040ecd8f4a16ae78 (diff) | |
| parent | fdf28cb097596159a002326823f374a64e95c23c (diff) | |
Merge pull request #103 from joeacarstairs/staging
Update prod
Diffstat (limited to 'scss')
67 files changed, 123 insertions, 178 deletions
diff --git a/scss/base/_details.scss b/scss/base/_details.scss index 6d0b1d4..1b46189 100644 --- a/scss/base/_details.scss +++ b/scss/base/_details.scss @@ -1,4 +1,3 @@ details summary { cursor: pointer; } - diff --git a/scss/base/_dl.scss b/scss/base/_dl.scss index 95cc836..2efadf1 100644 --- a/scss/base/_dl.scss +++ b/scss/base/_dl.scss @@ -2,4 +2,4 @@ dt { font-weight: 700; text-decoration: underline; margin-top: 1rem; -}
\ No newline at end of file +} diff --git a/scss/base/_index.scss b/scss/base/_index.scss index 527b4c7..ba0d3f1 100644 --- a/scss/base/_index.scss +++ b/scss/base/_index.scss @@ -6,4 +6,3 @@ @use 'table'; @use 'theme'; @use 'typography'; - diff --git a/scss/base/_list.scss b/scss/base/_list.scss index 2fd402b..d85594e 100644 --- a/scss/base/_list.scss +++ b/scss/base/_list.scss @@ -1,4 +1,4 @@ ol li { list-style-type: decimal; margin-inline-start: --spacing-inline-md; -}
\ No newline at end of file +} diff --git a/scss/base/_paypal-product-buttons.scss b/scss/base/_paypal-product-buttons.scss index 7339ede..5b7afda 100644 --- a/scss/base/_paypal-product-buttons.scss +++ b/scss/base/_paypal-product-buttons.scss @@ -1,4 +1,3 @@ paypal-product-buttons div { margin-block-start: var(--spacing-block-md); } - diff --git a/scss/base/_table.scss b/scss/base/_table.scss index ca4f957..d35abf8 100644 --- a/scss/base/_table.scss +++ b/scss/base/_table.scss @@ -8,7 +8,8 @@ table { } } -thead, th { +thead, +th { border-block-end: var(--border-width) solid var(--text-color); } @@ -20,4 +21,3 @@ thead, th { border-inline-start: calc(var(--border-width) / 2) solid var(--text-color); } } - diff --git a/scss/base/_theme.scss b/scss/base/_theme.scss index c97c788..4f06041 100644 --- a/scss/base/_theme.scss +++ b/scss/base/_theme.scss @@ -1,11 +1,10 @@ :is( - :root, - .dark, - main, - article, - :is(main, article) > section:not(:is(section, header) :is(section, header)) -) { + :root, + .dark, + main, + article, + :is(main, article) > section:not(:is(section, header) :is(section, header)) + ) { color: var(--text-color); background-color: var(--background-color); } - diff --git a/scss/custom-properties/_colours.scss b/scss/custom-properties/_colours.scss index 138a724..c8f31b6 100644 --- a/scss/custom-properties/_colours.scss +++ b/scss/custom-properties/_colours.scss @@ -9,7 +9,8 @@ --special-text-highlight-color: #{colours.$secondary-90}; } -:root, .dark { +:root, +.dark { --text-color: #{colours.$primary-98}; --text-highlight-color: #{colours.$primary-10}; --background-color: #{colours.$primary-10}; @@ -18,6 +19,7 @@ --special-text-highlight-color: #{colours.$secondary-10}; } -:is(main, article) > section:nth-child(even):not(:is(section, header) :is(section, header)):not(.dark *) { - --background-color: #{colours.$primary-95}; +:is(main, article) + > section:nth-child(even):not(:is(section, header) :is(section, header)):not(.dark *) { + --background-color: #{colours.$primary-95}; } diff --git a/scss/custom-properties/_index.lg.scss b/scss/custom-properties/_index.lg.scss index 2a36586..ddccb66 100644 --- a/scss/custom-properties/_index.lg.scss +++ b/scss/custom-properties/_index.lg.scss @@ -1,3 +1,2 @@ @use 'spacing/lg' as *; @use 'typography/lg' as *; - diff --git a/scss/custom-properties/_index.md.scss b/scss/custom-properties/_index.md.scss index 2367952..722f8cf 100644 --- a/scss/custom-properties/_index.md.scss +++ b/scss/custom-properties/_index.md.scss @@ -1,3 +1,2 @@ @use 'spacing/md' as *; @use 'typography/md' as *; - diff --git a/scss/custom-properties/_index.sm.scss b/scss/custom-properties/_index.sm.scss index c1ddffe..d52e81d 100644 --- a/scss/custom-properties/_index.sm.scss +++ b/scss/custom-properties/_index.sm.scss @@ -1,3 +1,2 @@ @use 'spacing/sm' as *; @use 'typography/sm' as *; - diff --git a/scss/custom-properties/_index.xl.scss b/scss/custom-properties/_index.xl.scss index 14c55cf..2ef0612 100644 --- a/scss/custom-properties/_index.xl.scss +++ b/scss/custom-properties/_index.xl.scss @@ -1,3 +1,2 @@ @use 'spacing/xl' as *; @use 'typography/xl' as *; - diff --git a/scss/custom-properties/_index.xs.scss b/scss/custom-properties/_index.xs.scss index 32eb377..e2af99a 100644 --- a/scss/custom-properties/_index.xs.scss +++ b/scss/custom-properties/_index.xs.scss @@ -1,3 +1,2 @@ @use 'spacing/xs' as *; @use 'typography/xs' as *; - diff --git a/scss/custom-properties/_index.xxl.scss b/scss/custom-properties/_index.xxl.scss index 8555eee..1807220 100644 --- a/scss/custom-properties/_index.xxl.scss +++ b/scss/custom-properties/_index.xxl.scss @@ -1,3 +1,2 @@ @use 'spacing/xxl' as *; @use 'typography/xxl' as *; - diff --git a/scss/custom-properties/spacing/_initial.scss b/scss/custom-properties/spacing/_initial.scss index a38388f..d52515c 100644 --- a/scss/custom-properties/spacing/_initial.scss +++ b/scss/custom-properties/spacing/_initial.scss @@ -8,7 +8,7 @@ @include mixins.grid(); --width-prose: calc( - var(--grid-column-width) * var(--grid-prose-column-count) + - var(--grid-gutter-width) * (var(--grid-prose-column-count) - 1) + var(--grid-column-width) * var(--grid-prose-column-count) + var(--grid-gutter-width) * + (var(--grid-prose-column-count) - 1) ); } diff --git a/scss/custom-properties/spacing/_mixins.scss b/scss/custom-properties/spacing/_mixins.scss index 4e35ee7..3008b14 100644 --- a/scss/custom-properties/spacing/_mixins.scss +++ b/scss/custom-properties/spacing/_mixins.scss @@ -3,12 +3,36 @@ @use '../../values/spacing' as spacing-values; @mixin spacing($breakpoint: initial) { - --spacing-inline-lg: #{spacing-values.spacing($direction: inline, $size: lg, $breakpoint: $breakpoint)}; - --spacing-inline-md: #{spacing-values.spacing($direction: inline, $size: md, $breakpoint: $breakpoint)}; - --spacing-inline-sm: #{spacing-values.spacing($direction: inline, $size: sm, $breakpoint: $breakpoint)}; - --spacing-block-lg: #{spacing-values.spacing($direction: block, $size: lg, $breakpoint: $breakpoint)}; - --spacing-block-md: #{spacing-values.spacing($direction: block, $size: md, $breakpoint: $breakpoint)}; - --spacing-block-sm: #{spacing-values.spacing($direction: block, $size: sm, $breakpoint: $breakpoint)}; + --spacing-inline-lg: #{spacing-values.spacing( + $direction: inline, + $size: lg, + $breakpoint: $breakpoint + )}; + --spacing-inline-md: #{spacing-values.spacing( + $direction: inline, + $size: md, + $breakpoint: $breakpoint + )}; + --spacing-inline-sm: #{spacing-values.spacing( + $direction: inline, + $size: sm, + $breakpoint: $breakpoint + )}; + --spacing-block-lg: #{spacing-values.spacing( + $direction: block, + $size: lg, + $breakpoint: $breakpoint + )}; + --spacing-block-md: #{spacing-values.spacing( + $direction: block, + $size: md, + $breakpoint: $breakpoint + )}; + --spacing-block-sm: #{spacing-values.spacing( + $direction: block, + $size: sm, + $breakpoint: $breakpoint + )}; } @mixin grid($breakpoint: initial) { diff --git a/scss/custom-properties/typography/_initial.scss b/scss/custom-properties/typography/_initial.scss index c9d95da..a81fd2a 100644 --- a/scss/custom-properties/typography/_initial.scss +++ b/scss/custom-properties/typography/_initial.scss @@ -6,36 +6,10 @@ @include mixins.font-sizes(); --border-width: #{typography-values.border-width()}; - --font-serif: - Alegreya, - -apple-system-ui-serif, - Iowan Old Style, - Apple Garamond, - Baskerville, - Sitka, "Sitka Display", "Sitka Heading", "Sitka Text", - Times New Roman, - Droid Serif, - Times, - Source Serif Pro, - serif, - Apple Color Emoji, - Segoe UI Emoji, - Segoe UI Symbol; + --font-serif: Alegreya, -apple-system-ui-serif, Iowan Old Style, Apple Garamond, Baskerville, + Sitka, 'Sitka Display', 'Sitka Heading', 'Sitka Text', Times New Roman, Droid Serif, Times, + Source Serif Pro, serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol; - --font-sans-serif: - 'Alegreya Sans', - Lato, - -apple-system, - BlinkMacSystemFont, - avenir next, - avenir, - segoe ui, - helvetica neue, - helvetica, - Cantarell, - Ubuntu, - roboto, - noto, - arial, - sans-serif; + --font-sans-serif: 'Alegreya Sans', Lato, -apple-system, BlinkMacSystemFont, avenir next, avenir, + segoe ui, helvetica neue, helvetica, Cantarell, Ubuntu, roboto, noto, arial, sans-serif; } diff --git a/scss/custom-properties/typography/_lg.scss b/scss/custom-properties/typography/_lg.scss index 30a3019..ff1a645 100644 --- a/scss/custom-properties/typography/_lg.scss +++ b/scss/custom-properties/typography/_lg.scss @@ -6,4 +6,3 @@ @include mixins.font-sizes(lg); --border-width: #{typography-values.border-width(lg)}; } - diff --git a/scss/custom-properties/typography/_md.scss b/scss/custom-properties/typography/_md.scss index df49bdd..5b0752f 100644 --- a/scss/custom-properties/typography/_md.scss +++ b/scss/custom-properties/typography/_md.scss @@ -6,4 +6,3 @@ @include mixins.font-sizes(md); --border-width: #{typography-values.border-width(md)}; } - diff --git a/scss/custom-properties/typography/_mixins.scss b/scss/custom-properties/typography/_mixins.scss index a370356..a23b8f6 100644 --- a/scss/custom-properties/typography/_mixins.scss +++ b/scss/custom-properties/typography/_mixins.scss @@ -9,4 +9,3 @@ --font-size-5: #{typography-values.font-size('5', $breakpoint)}; --font-size-6: #{typography-values.font-size('6', $breakpoint)}; } - diff --git a/scss/custom-properties/typography/_sm.scss b/scss/custom-properties/typography/_sm.scss index e1c3585..7f70eb8 100644 --- a/scss/custom-properties/typography/_sm.scss +++ b/scss/custom-properties/typography/_sm.scss @@ -6,4 +6,3 @@ @include mixins.font-sizes(sm); --border-width: #{typography-values.border-width(sm)}; } - diff --git a/scss/custom-properties/typography/_xl.scss b/scss/custom-properties/typography/_xl.scss index 0ddba99..f378dac 100644 --- a/scss/custom-properties/typography/_xl.scss +++ b/scss/custom-properties/typography/_xl.scss @@ -6,4 +6,3 @@ @include mixins.font-sizes(xl); --border-width: #{typography-values.border-width(xl)}; } - diff --git a/scss/custom-properties/typography/_xs.scss b/scss/custom-properties/typography/_xs.scss index 44d8bbb..31ff2f1 100644 --- a/scss/custom-properties/typography/_xs.scss +++ b/scss/custom-properties/typography/_xs.scss @@ -6,4 +6,3 @@ @include mixins.font-sizes(xs); --border-width: #{typography-values.border-width(xs)}; } - diff --git a/scss/custom-properties/typography/_xxl.scss b/scss/custom-properties/typography/_xxl.scss index 1a777dc..59db477 100644 --- a/scss/custom-properties/typography/_xxl.scss +++ b/scss/custom-properties/typography/_xxl.scss @@ -6,4 +6,3 @@ @include mixins.font-sizes(xxl); --border-width: #{typography-values.border-width(xxl)}; } - diff --git a/scss/index.lg.scss b/scss/index.lg.scss index 622262f..05a4e52 100644 --- a/scss/index.lg.scss +++ b/scss/index.lg.scss @@ -1,3 +1,2 @@ @use 'modules/index.lg' as *; @use 'custom-properties/index.lg' as *; - diff --git a/scss/index.md.scss b/scss/index.md.scss index e7f1fbd..18434c2 100644 --- a/scss/index.md.scss +++ b/scss/index.md.scss @@ -1,4 +1,3 @@ @use 'layout/index.md' as *; @use 'modules/index.md' as *; @use 'custom-properties/index.md' as *; - diff --git a/scss/index.scss b/scss/index.scss index b8e2334..20cd6df 100644 --- a/scss/index.scss +++ b/scss/index.scss @@ -4,4 +4,3 @@ @use 'modules/index' as *; @use 'custom-properties/index' as *; @use 'utils' as *; - diff --git a/scss/index.sm.scss b/scss/index.sm.scss index 0ea47c9..d5f02d2 100644 --- a/scss/index.sm.scss +++ b/scss/index.sm.scss @@ -1,3 +1,2 @@ @use 'modules/index.sm' as *; @use 'custom-properties/index.sm' as *; - diff --git a/scss/index.xl.scss b/scss/index.xl.scss index e692c09..877995a 100644 --- a/scss/index.xl.scss +++ b/scss/index.xl.scss @@ -1,3 +1,2 @@ @use 'modules/index.xl' as *; @use 'custom-properties/index.xl' as *; - diff --git a/scss/index.xs.scss b/scss/index.xs.scss index 78bc9bf..1ec64a9 100644 --- a/scss/index.xs.scss +++ b/scss/index.xs.scss @@ -1,4 +1,3 @@ @use 'layout/index.xs' as *; @use 'modules/index.xs' as *; @use 'custom-properties/index.xs' as *; - diff --git a/scss/index.xxl.scss b/scss/index.xxl.scss index 67ec408..af36a5c 100644 --- a/scss/index.xxl.scss +++ b/scss/index.xxl.scss @@ -1,2 +1 @@ @use 'custom-properties/index.xxl' as *; - diff --git a/scss/layout/_grid.md.scss b/scss/layout/_grid.md.scss index f0c8478..0b83a0c 100644 --- a/scss/layout/_grid.md.scss +++ b/scss/layout/_grid.md.scss @@ -1,8 +1,8 @@ :is( - header, - footer, - nav, - :is(main, article) > section:not(:is(section, header) :is(section, header)) -) { + header, + footer, + nav, + :is(main, article) > section:not(:is(section, header) :is(section, header)) + ) { padding-inline: var(--grid-padding); -}
\ No newline at end of file +} diff --git a/scss/layout/_grid.scss b/scss/layout/_grid.scss index 25cdd95..2e2baf4 100644 --- a/scss/layout/_grid.scss +++ b/scss/layout/_grid.scss @@ -1,9 +1,9 @@ :is( - header, - footer, - nav, - :is(main, article) > section:not(:is(section, header) :is(section, header)) -):not(.section--full-width) { + header, + footer, + nav, + :is(main, article) > section:not(:is(section, header) :is(section, header)) + ):not(.section--full-width) { padding-inline: calc(var(--grid-padding) + 0.5 * (100vw - var(--grid-total-width))); } diff --git a/scss/layout/_grid.xs.scss b/scss/layout/_grid.xs.scss index e7c6d1a..dbd1c9f 100644 --- a/scss/layout/_grid.xs.scss +++ b/scss/layout/_grid.xs.scss @@ -8,48 +8,48 @@ .grid-span-1.grid-end { margin-inline-start: calc( - var(--grid-column-width) * (var(--grid-column-count) - 1) + - var(--grid-gutter-width) * (var(--grid-column-count) - 1) + var(--grid-column-width) * (var(--grid-column-count) - 1) + var(--grid-gutter-width) * + (var(--grid-column-count) - 1) ); margin-inline-end: 0; } .grid-span-2.grid-end { margin-inline-start: calc( - var(--grid-column-width) * (var(--grid-column-count) - 2) + - var(--grid-gutter-width) * (var(--grid-column-count) - 2) + var(--grid-column-width) * (var(--grid-column-count) - 2) + var(--grid-gutter-width) * + (var(--grid-column-count) - 2) ); margin-inline-end: 0; } .grid-span-3.grid-end { margin-inline-start: calc( - var(--grid-column-width) * (var(--grid-column-count) - 3) + - var(--grid-gutter-width) * (var(--grid-column-count) - 3) + var(--grid-column-width) * (var(--grid-column-count) - 3) + var(--grid-gutter-width) * + (var(--grid-column-count) - 3) ); margin-inline-end: 0; } .grid-span-1.grid-prose-end { margin-inline-start: calc( - var(--grid-column-width) * (var(--grid-prose-column-count) - 1) + - var(--grid-gutter-width) * (var(--grid-prose-column-count) - 1) + var(--grid-column-width) * (var(--grid-prose-column-count) - 1) + var(--grid-gutter-width) * + (var(--grid-prose-column-count) - 1) ); margin-inline-end: 0; } .grid-span-2.grid-prose-end { margin-inline-start: calc( - var(--grid-column-width) * (var(--grid-prose-column-count) - 2) + - var(--grid-gutter-width) * (var(--grid-prose-column-count) - 2) + var(--grid-column-width) * (var(--grid-prose-column-count) - 2) + var(--grid-gutter-width) * + (var(--grid-prose-column-count) - 2) ); margin-inline-end: 0; } .grid-span-3.grid-prose-end { margin-inline-start: calc( - var(--grid-column-width) * (var(--grid-prose-column-count) - 3) + - var(--grid-gutter-width) * (var(--grid-prose-column-count) - 3) + var(--grid-column-width) * (var(--grid-prose-column-count) - 3) + var(--grid-gutter-width) * + (var(--grid-prose-column-count) - 3) ); margin-inline-end: 0; -}
\ No newline at end of file +} diff --git a/scss/layout/_index.md.scss b/scss/layout/_index.md.scss index c3bd183..f2a0301 100644 --- a/scss/layout/_index.md.scss +++ b/scss/layout/_index.md.scss @@ -1,2 +1 @@ @use 'grid.md'; - diff --git a/scss/layout/_index.scss b/scss/layout/_index.scss index 776613a..0d4371a 100644 --- a/scss/layout/_index.scss +++ b/scss/layout/_index.scss @@ -1,3 +1,2 @@ @use 'grid'; @use 'section-margins'; - diff --git a/scss/layout/_index.xs.scss b/scss/layout/_index.xs.scss index 6e239b4..97fbf3b 100644 --- a/scss/layout/_index.xs.scss +++ b/scss/layout/_index.xs.scss @@ -1,2 +1 @@ @use 'grid.xs'; - diff --git a/scss/modules/_btn.scss b/scss/modules/_btn.scss index 6b5e543..29b3264 100644 --- a/scss/modules/_btn.scss +++ b/scss/modules/_btn.scss @@ -37,4 +37,3 @@ a.btn { color: var(--text-color); text-decoration: none; } - diff --git a/scss/modules/_committee.md.scss b/scss/modules/_committee.md.scss index 83ca252..adaf389 100644 --- a/scss/modules/_committee.md.scss +++ b/scss/modules/_committee.md.scss @@ -13,4 +13,4 @@ .committee__member__text { grid-column: 3 / calc(3 + var(--grid-prose-column-count) - 2); -}
\ No newline at end of file +} diff --git a/scss/modules/_committee.scss b/scss/modules/_committee.scss index f6528a3..efbce3a 100644 --- a/scss/modules/_committee.scss +++ b/scss/modules/_committee.scss @@ -7,14 +7,15 @@ border-top-width: var(--border-width); border-top-style: solid; border-image: linear-gradient( - to right, - transparent 0%, - transparent 19.1%, - var(--text-color) 19.1%, - var(--text-color) 80.9%, - transparent 80.9%, - transparent 100% - ) 1; + to right, + transparent 0%, + transparent 19.1%, + var(--text-color) 19.1%, + var(--text-color) 80.9%, + transparent 80.9%, + transparent 100% + ) + 1; margin-block-start: var(--spacing-block-md); padding-block-start: var(--spacing-block-md); } @@ -34,4 +35,3 @@ display: block; font-weight: lighter; } - diff --git a/scss/modules/_committee.sm.scss b/scss/modules/_committee.sm.scss index a2b2216..2010c04 100644 --- a/scss/modules/_committee.sm.scss +++ b/scss/modules/_committee.sm.scss @@ -2,4 +2,3 @@ text-align: start; margin: 0; } - diff --git a/scss/modules/_committee.xl.scss b/scss/modules/_committee.xl.scss index 94d8429..89fed1f 100644 --- a/scss/modules/_committee.xl.scss +++ b/scss/modules/_committee.xl.scss @@ -12,4 +12,4 @@ .committee__member__text { grid-column: 3 / min(11, calc(var(--grid-column-count) + 1)); -}
\ No newline at end of file +} diff --git a/scss/modules/_committee.xs.scss b/scss/modules/_committee.xs.scss index 5681bc7..c085360 100644 --- a/scss/modules/_committee.xs.scss +++ b/scss/modules/_committee.xs.scss @@ -2,4 +2,3 @@ margin-inline: calc(var(--grid-column-width) + var(--grid-gutter-width)); width: calc(var(--grid-gutter-width) + 2 * var(--grid-column-width)); } - diff --git a/scss/modules/_footer.xs.scss b/scss/modules/_footer.xs.scss index 67cab7f..f51d57c 100644 --- a/scss/modules/_footer.xs.scss +++ b/scss/modules/_footer.xs.scss @@ -4,4 +4,3 @@ footer { gap: var(--grid-gutter-width); align-items: end; } - diff --git a/scss/modules/_index.lg.scss b/scss/modules/_index.lg.scss index 56a6dd8..8bdb4f3 100644 --- a/scss/modules/_index.lg.scss +++ b/scss/modules/_index.lg.scss @@ -1,2 +1 @@ @use 'nav.lg' as *; - diff --git a/scss/modules/_index.md.scss b/scss/modules/_index.md.scss index b426b71..4687331 100644 --- a/scss/modules/_index.md.scss +++ b/scss/modules/_index.md.scss @@ -1,4 +1,3 @@ @use 'committee.md' as *; @use 'nav.md' as *; @use 'schedule.md' as *; - diff --git a/scss/modules/_index.scss b/scss/modules/_index.scss index 822295f..67adcc5 100644 --- a/scss/modules/_index.scss +++ b/scss/modules/_index.scss @@ -9,4 +9,3 @@ @use 'product' as *; @use 'schedule' as *; @use 'skip-to-content' as *; - diff --git a/scss/modules/_index.sm.scss b/scss/modules/_index.sm.scss index ab51eb2..0a318c4 100644 --- a/scss/modules/_index.sm.scss +++ b/scss/modules/_index.sm.scss @@ -1,4 +1,3 @@ @use 'committee.sm' as *; @use 'link-gallery.sm' as *; @use 'nav.sm' as *; - diff --git a/scss/modules/_index.xl.scss b/scss/modules/_index.xl.scss index 17e1d8c..89860ac 100644 --- a/scss/modules/_index.xl.scss +++ b/scss/modules/_index.xl.scss @@ -1,2 +1 @@ @use 'committee.xl' as *; - diff --git a/scss/modules/_index.xs.scss b/scss/modules/_index.xs.scss index ef77c6d..c2bb97e 100644 --- a/scss/modules/_index.xs.scss +++ b/scss/modules/_index.xs.scss @@ -2,4 +2,3 @@ @use 'footer.xs' as *; @use 'link-gallery.xs' as *; @use 'nav.xs' as *; - diff --git a/scss/modules/_link-gallery.scss b/scss/modules/_link-gallery.scss index 0f0c187..b2676bb 100644 --- a/scss/modules/_link-gallery.scss +++ b/scss/modules/_link-gallery.scss @@ -69,4 +69,3 @@ margin-inline-start: 1em; } } - diff --git a/scss/modules/_link-gallery.sm.scss b/scss/modules/_link-gallery.sm.scss index 723dffc..04d5a3c 100644 --- a/scss/modules/_link-gallery.sm.scss +++ b/scss/modules/_link-gallery.sm.scss @@ -1,4 +1,3 @@ .link-gallery { --gallery-item-column-span: 3; } - diff --git a/scss/modules/_link-gallery.xs.scss b/scss/modules/_link-gallery.xs.scss index a8f48ac..cbaf301 100644 --- a/scss/modules/_link-gallery.xs.scss +++ b/scss/modules/_link-gallery.xs.scss @@ -4,9 +4,7 @@ &:not(.link-gallery--splash-first) { grid-auto-rows: calc( - var(--gallery-row-image-height) + - var(--spacing-block-sm) + - var(--gallery-row-title-height) + var(--gallery-row-image-height) + var(--spacing-block-sm) + var(--gallery-row-title-height) ); .link-gallery__title { @@ -43,4 +41,3 @@ text-align: start; } } - diff --git a/scss/modules/_link.scss b/scss/modules/_link.scss index 2f827c4..c4b62e4 100644 --- a/scss/modules/_link.scss +++ b/scss/modules/_link.scss @@ -1,4 +1,5 @@ -a, .link { +a, +.link { color: var(--special-text-color); text-decoration-line: underline; text-decoration-color: var(--special-text-color); @@ -24,4 +25,3 @@ a, .link { border-color: var(--special-text-color); } } - diff --git a/scss/modules/_nav.md.scss b/scss/modules/_nav.md.scss index 7f0f784..4b09cf7 100644 --- a/scss/modules/_nav.md.scss +++ b/scss/modules/_nav.md.scss @@ -23,4 +23,3 @@ .nav__switch-language-link { margin-inline-end: calc(var(--grid-column-width) + var(--grid-gutter-width)); } - diff --git a/scss/modules/_nav.sm.scss b/scss/modules/_nav.sm.scss index 688f947..226df3b 100644 --- a/scss/modules/_nav.sm.scss +++ b/scss/modules/_nav.sm.scss @@ -35,4 +35,3 @@ grid-column: 3 / 5; } } - diff --git a/scss/modules/_payment-methods-list.scss b/scss/modules/_payment-methods-list.scss index a59831a..80fb257 100644 --- a/scss/modules/_payment-methods-list.scss +++ b/scss/modules/_payment-methods-list.scss @@ -5,4 +5,3 @@ margin-block-end: var(--spacing-block-sm); } } - diff --git a/scss/modules/_skip-to-content.scss b/scss/modules/_skip-to-content.scss index 0a5f365..e407190 100644 --- a/scss/modules/_skip-to-content.scss +++ b/scss/modules/_skip-to-content.scss @@ -3,7 +3,9 @@ left: var(--grid-padding); top: -10rem; opacity: 0; - transition: top 300ms, opacity 300ms; + transition: + top 300ms, + opacity 300ms; } .skip-to-content:is(:focus, :focus-visible, :focus-within) { diff --git a/scss/normalize.scss b/scss/normalize.scss index 0f7e02f..1dc8524 100644 --- a/scss/normalize.scss +++ b/scss/normalize.scss @@ -52,7 +52,10 @@ hr { * 1. Correct the inheritance and scaling of font size in all browsers. * 2. Correct the odd `em` font sizing in all browsers. */ -code, kbd, pre, samp { +code, +kbd, +pre, +samp { font-family: monospace, monospace; /* 1 */ font-size: 1em; /* 2 */ } @@ -109,12 +112,7 @@ sup { text-transform: none; /* For buttons (Firefox, Edge) and selects (Firefox) */ } -:is( - button, - [type='button'], - [type='reset'], - [type='submit'] -) { +:is(button, [type='button'], [type='reset'], [type='submit']) { @include form-control-reset; text-transform: none; @@ -154,4 +152,3 @@ details { summary { display: list-item; } - diff --git a/scss/utils.scss b/scss/utils.scss index 7cd2a58..b595802 100644 --- a/scss/utils.scss +++ b/scss/utils.scss @@ -2,6 +2,7 @@ font-style: italic; } -li.list-style-none, .list-style-none li { +li.list-style-none, +.list-style-none li { list-style-type: none; } diff --git a/scss/values/_colours.scss b/scss/values/_colours.scss index 40db6e8..79d1da4 100644 --- a/scss/values/_colours.scss +++ b/scss/values/_colours.scss @@ -31,4 +31,3 @@ $secondary-95: #b2fff6; $secondary-98: #e4fffb; $secondary-99: #f2fffc; $secondary-100: #ffffff; - diff --git a/scss/values/spacing/_constants.scss b/scss/values/spacing/_constants.scss index c89fdc8..3663bf3 100644 --- a/scss/values/spacing/_constants.scss +++ b/scss/values/spacing/_constants.scss @@ -8,7 +8,7 @@ $grid-padding-er: ( 'md': 16, 'sm': 12, 'xs': 4, - 'initial': 1 + 'initial': 1, ); $grid-column-count: ( @@ -18,7 +18,7 @@ $grid-column-count: ( 'md': 8, 'sm': 8, 'xs': 4, - 'initial': 1 + 'initial': 1, ); $grid-prose-column-count: ( @@ -28,7 +28,7 @@ $grid-prose-column-count: ( 'md': 8, 'sm': 8, 'xs': 4, - 'initial': 1 + 'initial': 1, ); $grid-padding-er: ( @@ -38,12 +38,20 @@ $grid-padding-er: ( 'md': 16, 'sm': 12, 'xs': 4, - 'initial': 1 + 'initial': 1, ); $spacing-factor: ( - 'inline': (lg: 12, md: 6, sm: 3), - 'block': (lg: 16, md: 10, sm: 5) + 'inline': ( + lg: 12, + md: 6, + sm: 3, + ), + 'block': ( + lg: 16, + md: 10, + sm: 5, + ), ); $grid-min-total-width-absolute: ( @@ -53,6 +61,5 @@ $grid-min-total-width-absolute: ( 'md': 48rem, 'sm': 30rem, 'xs': 100vw, - 'initial': 100vw + 'initial': 100vw, ); - diff --git a/scss/values/spacing/_grid.scss b/scss/values/spacing/_grid.scss index 50d11c9..e448363 100644 --- a/scss/values/spacing/_grid.scss +++ b/scss/values/spacing/_grid.scss @@ -54,10 +54,6 @@ * module you'd end up with a circular dependency. */ @function er-to-absolute($length-er, $breakpoint: initial) { - $absolute-per-er: calc( - total-width-absolute($breakpoint) - / total-width-er($breakpoint) - ); + $absolute-per-er: calc(total-width-absolute($breakpoint) / total-width-er($breakpoint)); @return calc($length-er * $absolute-per-er); } - diff --git a/scss/values/spacing/_index.scss b/scss/values/spacing/_index.scss index 8f8a454..1d65bb5 100644 --- a/scss/values/spacing/_index.scss +++ b/scss/values/spacing/_index.scss @@ -21,4 +21,3 @@ @forward 'grid' as grid-* hide er-to-absolute; @forward 'grid' show er-to-absolute; @forward 'spacing'; - diff --git a/scss/values/spacing/_spacing.scss b/scss/values/spacing/_spacing.scss index 4fd94e8..ac0d79e 100644 --- a/scss/values/spacing/_spacing.scss +++ b/scss/values/spacing/_spacing.scss @@ -9,24 +9,18 @@ * - direction: inline, block */ @function spacing($direction, $size, $breakpoint: initial) { - $factor: map.get( - map.get(constants.$spacing-factor, $direction), - $size - ); + $factor: map.get(map.get(constants.$spacing-factor, $direction), $size); @if list.index([xxl xl lg md sm], ($breakpoint)) { @return grid.er-to-absolute($factor, $breakpoint); - } - @else if $breakpoint == xs { + } @else if $breakpoint == xs { @return clamp( spacing($direction, $size, initial), grid.er-to-absolute($factor, xs), spacing($direction, $size, sm) ); - } - @else if $breakpoint == initial { + } @else if $breakpoint == initial { @return calc($factor * 0.0625rem); } @error "Invalid breakpoint: #{$breakpoint}"; } - diff --git a/scss/values/typography/_constants.scss b/scss/values/typography/_constants.scss index 4ea0117..4921059 100644 --- a/scss/values/typography/_constants.scss +++ b/scss/values/typography/_constants.scss @@ -15,6 +15,5 @@ $font-size-factor: ( '3': 2, '4': 2.5, '5': 3, - '6': 3.5 + '6': 3.5, ); - diff --git a/scss/values/typography/_index.scss b/scss/values/typography/_index.scss index 3aa4384..cacadcf 100644 --- a/scss/values/typography/_index.scss +++ b/scss/values/typography/_index.scss @@ -4,15 +4,11 @@ @function font-size($font-size-grade, $breakpoint: initial) { @return calc( - map.get(constants.$base-font-size, $breakpoint) - * map.get(constants.$font-size-factor, $font-size-grade) + map.get(constants.$base-font-size, $breakpoint) * + map.get(constants.$font-size-factor, $font-size-grade) ); } @function border-width($breakpoint: initial) { - @return calc( - map.get(constants.$base-font-size, $breakpoint) - / 8 - ); + @return calc(map.get(constants.$base-font-size, $breakpoint) / 8); } - |
