From 0cb6960f0c65c0d791ccdee2f5bc2e2b910cfb76 Mon Sep 17 00:00:00 2001 From: Joe Carstairs <118172583+jcarstairs-scottlogic@users.noreply.github.com> Date: Fri, 19 Jan 2024 09:16:42 +0000 Subject: Uses SCSS partials (#64) --- scss/layout/_grid.md.scss | 8 ++++++ scss/layout/_grid.scss | 30 +++++++++++++++++++++ scss/layout/_grid.xs.scss | 55 +++++++++++++++++++++++++++++++++++++++ scss/layout/_index.md.scss | 2 ++ scss/layout/_index.scss | 3 +++ scss/layout/_index.xs.scss | 2 ++ scss/layout/_section-margins.scss | 13 +++++++++ scss/layout/grid.md.scss | 8 ------ scss/layout/grid.scss | 30 --------------------- scss/layout/grid.xs.scss | 55 --------------------------------------- scss/layout/index.md.scss | 2 -- scss/layout/index.scss | 3 --- scss/layout/index.xs.scss | 2 -- scss/layout/section-margins.scss | 13 --------- 14 files changed, 113 insertions(+), 113 deletions(-) create mode 100644 scss/layout/_grid.md.scss create mode 100644 scss/layout/_grid.scss create mode 100644 scss/layout/_grid.xs.scss create mode 100644 scss/layout/_index.md.scss create mode 100644 scss/layout/_index.scss create mode 100644 scss/layout/_index.xs.scss create mode 100644 scss/layout/_section-margins.scss delete mode 100644 scss/layout/grid.md.scss delete mode 100644 scss/layout/grid.scss delete mode 100644 scss/layout/grid.xs.scss delete mode 100644 scss/layout/index.md.scss delete mode 100644 scss/layout/index.scss delete mode 100644 scss/layout/index.xs.scss delete mode 100644 scss/layout/section-margins.scss (limited to 'scss/layout') diff --git a/scss/layout/_grid.md.scss b/scss/layout/_grid.md.scss new file mode 100644 index 0000000..f0c8478 --- /dev/null +++ b/scss/layout/_grid.md.scss @@ -0,0 +1,8 @@ +:is( + 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 new file mode 100644 index 0000000..25cdd95 --- /dev/null +++ b/scss/layout/_grid.scss @@ -0,0 +1,30 @@ +:is( + 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))); +} + +.grid-span-1 { + width: var(--grid-column-width); +} + +/* On screens narrower than 16rem, there is only one column. */ + +.grid-span-2 { + width: var(--grid-column-width); +} + +.grid-span-3 { + width: var(--grid-column-width); +} + +.width-prose { + width: var(--prose-width); +} + +.grid-span-full { + width: var(--grid-total-width); +} diff --git a/scss/layout/_grid.xs.scss b/scss/layout/_grid.xs.scss new file mode 100644 index 0000000..e7c6d1a --- /dev/null +++ b/scss/layout/_grid.xs.scss @@ -0,0 +1,55 @@ +.grid-span-2 { + width: calc(var(--grid-column-width) * 2 + var(--grid-gutter-width)); +} + +.grid-span-3 { + width: calc(var(--grid-column-width) * 3 + var(--grid-gutter-width) * 2); +} + +.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) + ); + 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) + ); + 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) + ); + 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) + ); + 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) + ); + 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) + ); + margin-inline-end: 0; +} \ No newline at end of file diff --git a/scss/layout/_index.md.scss b/scss/layout/_index.md.scss new file mode 100644 index 0000000..c3bd183 --- /dev/null +++ b/scss/layout/_index.md.scss @@ -0,0 +1,2 @@ +@use 'grid.md'; + diff --git a/scss/layout/_index.scss b/scss/layout/_index.scss new file mode 100644 index 0000000..776613a --- /dev/null +++ b/scss/layout/_index.scss @@ -0,0 +1,3 @@ +@use 'grid'; +@use 'section-margins'; + diff --git a/scss/layout/_index.xs.scss b/scss/layout/_index.xs.scss new file mode 100644 index 0000000..6e239b4 --- /dev/null +++ b/scss/layout/_index.xs.scss @@ -0,0 +1,2 @@ +@use 'grid.xs'; + diff --git a/scss/layout/_section-margins.scss b/scss/layout/_section-margins.scss new file mode 100644 index 0000000..8105dcb --- /dev/null +++ b/scss/layout/_section-margins.scss @@ -0,0 +1,13 @@ +:is(main, article) > :is(section, header):not(:is(section, header) :is(section, header)) { + padding-block: var(--spacing-block-md); +} + +footer { + padding-block-start: var(--spacing-block-md); + padding-block-end: var(--spacing-block-lg); +} + +nav { + padding-block-start: var(--spacing-block-sm); + padding-block-end: var(--spacing-block-md); +} diff --git a/scss/layout/grid.md.scss b/scss/layout/grid.md.scss deleted file mode 100644 index f0c8478..0000000 --- a/scss/layout/grid.md.scss +++ /dev/null @@ -1,8 +0,0 @@ -:is( - 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 deleted file mode 100644 index 25cdd95..0000000 --- a/scss/layout/grid.scss +++ /dev/null @@ -1,30 +0,0 @@ -:is( - 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))); -} - -.grid-span-1 { - width: var(--grid-column-width); -} - -/* On screens narrower than 16rem, there is only one column. */ - -.grid-span-2 { - width: var(--grid-column-width); -} - -.grid-span-3 { - width: var(--grid-column-width); -} - -.width-prose { - width: var(--prose-width); -} - -.grid-span-full { - width: var(--grid-total-width); -} diff --git a/scss/layout/grid.xs.scss b/scss/layout/grid.xs.scss deleted file mode 100644 index e7c6d1a..0000000 --- a/scss/layout/grid.xs.scss +++ /dev/null @@ -1,55 +0,0 @@ -.grid-span-2 { - width: calc(var(--grid-column-width) * 2 + var(--grid-gutter-width)); -} - -.grid-span-3 { - width: calc(var(--grid-column-width) * 3 + var(--grid-gutter-width) * 2); -} - -.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) - ); - 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) - ); - 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) - ); - 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) - ); - 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) - ); - 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) - ); - margin-inline-end: 0; -} \ No newline at end of file diff --git a/scss/layout/index.md.scss b/scss/layout/index.md.scss deleted file mode 100644 index c3bd183..0000000 --- a/scss/layout/index.md.scss +++ /dev/null @@ -1,2 +0,0 @@ -@use 'grid.md'; - diff --git a/scss/layout/index.scss b/scss/layout/index.scss deleted file mode 100644 index 776613a..0000000 --- a/scss/layout/index.scss +++ /dev/null @@ -1,3 +0,0 @@ -@use 'grid'; -@use 'section-margins'; - diff --git a/scss/layout/index.xs.scss b/scss/layout/index.xs.scss deleted file mode 100644 index 6e239b4..0000000 --- a/scss/layout/index.xs.scss +++ /dev/null @@ -1,2 +0,0 @@ -@use 'grid.xs'; - diff --git a/scss/layout/section-margins.scss b/scss/layout/section-margins.scss deleted file mode 100644 index 8105dcb..0000000 --- a/scss/layout/section-margins.scss +++ /dev/null @@ -1,13 +0,0 @@ -:is(main, article) > :is(section, header):not(:is(section, header) :is(section, header)) { - padding-block: var(--spacing-block-md); -} - -footer { - padding-block-start: var(--spacing-block-md); - padding-block-end: var(--spacing-block-lg); -} - -nav { - padding-block-start: var(--spacing-block-sm); - padding-block-end: var(--spacing-block-md); -} -- cgit v1.2.3