diff options
| author | Joe Carstairs <65492573+joeacarstairs@users.noreply.github.com> | 2024-01-29 13:13:00 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-29 13:13:00 +0000 |
| commit | d4220e1939f7c7d4ba9392b06026759063c51345 (patch) | |
| tree | eaa2b7140c584af42b97d9c0193244060f2b907b /scss | |
| parent | 9f29a1bb17c06e86a75d7c5c9dd9200a8d7a50bb (diff) | |
| parent | f7528892196734b7246377d63a8804e3f435b9ba (diff) | |
Merge branch 'deployment-staging' into 34-add-disabled-button-variant34-add-disabled-button-variant
Diffstat (limited to 'scss')
| -rw-r--r-- | scss/base/_theme.scss | 16 | ||||
| -rw-r--r-- | scss/custom-properties/_colours.scss | 24 |
2 files changed, 19 insertions, 21 deletions
diff --git a/scss/base/_theme.scss b/scss/base/_theme.scss index f5d178c..c97c788 100644 --- a/scss/base/_theme.scss +++ b/scss/base/_theme.scss @@ -1,13 +1,11 @@ -:root { +:is( + :root, + .dark, + main, + article, + :is(main, article) > section:not(:is(section, header) :is(section, header)) +) { color: var(--text-color); background-color: var(--background-color); } -:is(main, article) { - color: var(--text-color); - background-color: var(--background-color); -} - -:is(main, article) > section:not(:is(section, header) :is(section, header)) { - background-color: var(--background-color); -}
\ No newline at end of file diff --git a/scss/custom-properties/_colours.scss b/scss/custom-properties/_colours.scss index efa9cdc..d6e5deb 100644 --- a/scss/custom-properties/_colours.scss +++ b/scss/custom-properties/_colours.scss @@ -1,16 +1,5 @@ @use '../values/colours' as colours; -:root { - --text-color: #{colours.$primary-98}; - --text-highlight-color: #{colours.$primary-10}; - --background-color: #{colours.$primary-10}; - --background-highlight-color: #{colours.$primary-90}; - --special-text-color: #{colours.$secondary-90}; - --special-text-highlight-color: #{colours.$secondary-10}; - --neutral-text-color: #{colours.$neutral-50}; - --neutral-background-color: #{colours.$neutral-30}; -} - :is(main, article) { --text-color: #{colours.$primary-10}; --text-highlight-color: #{colours.$primary-90}; @@ -22,6 +11,17 @@ --neutral-background-color: #{colours.$neutral-95}; } -:is(main, article) > section:nth-child(even):not(:is(section, header) :is(section, header)) { +:root, .dark { + --text-color: #{colours.$primary-98}; + --text-highlight-color: #{colours.$primary-10}; + --background-color: #{colours.$primary-10}; + --background-highlight-color: #{colours.$primary-90}; + --special-text-color: #{colours.$secondary-90}; + --special-text-highlight-color: #{colours.$secondary-10}; + --neutral-text-color: #{colours.$neutral-50}; + --neutral-background-color: #{colours.$neutral-30}; +} + +:is(main, article) > section:nth-child(even):not(:is(section, header) :is(section, header)):not(.dark *) { --background-color: #{colours.$primary-95}; } |