diff --git a/assets/sass/_colors.scss b/assets/sass/_colors.scss index 6e71cb1..d1b0635 100644 --- a/assets/sass/_colors.scss +++ b/assets/sass/_colors.scss @@ -50,6 +50,13 @@ --color-link-hover-inverted: var(--color-white); --color-link-active-inverted: var(--color-red); + // Button colours. + --color-button: var(--color-brand); + --color-button-hover: var(--color-brand-alt); + --color-button-text: var(--color-white); + --color-button-text-hover: var(--color-white); + --color-button-disabled: var(--color-grey-400); + // Border colours. --color-border: var(--color-brand); --color-border-light: var(--color-brand-light); @@ -65,12 +72,8 @@ --color-mobile-menu: var(--color-brand); --color-mobile-menu-cover: var(--color-black-20); - // Button colours. - --color-button: var(--color-brand); - --color-button-hover: var(--color-brand-dark); - --color-button-text: var(--color-white); - --color-button-text-hover: var(--color-white); - --color-button-disabled: var(--color-grey-400); + // Form colours. + --color-accent: var(--color-brand); // Row (e.g. in table) colours. --color-row-header: transparent; @@ -80,8 +83,8 @@ // Status colours. --color-info: var(--color-blue); --color-info-bg: oklch(from var(--color-blue) 100% 0.03 h); - --color-status: var(--color-green); - --color-status-bg: oklch(from var(--color-green) 100% 0.03 h); + --color-success: var(--color-green); + --color-success-bg: oklch(from var(--color-green) 100% 0.03 h); --color-warning: var(--color-yellow); --color-warning-bg: oklch(from var(--color-yellow) 100% 0.03 h); --color-error: var(--color-red); diff --git a/assets/sass/base/document/_document.scss b/assets/sass/base/document/_document.scss index 5a00fe3..6645dae 100644 --- a/assets/sass/base/document/_document.scss +++ b/assets/sass/base/document/_document.scss @@ -12,6 +12,8 @@ html { body { // Correct the line height in all browsers. line-height: var(--base-line-height); + // Accent colour for forms. + accent-color: var(--color-accent); // Output a horizontal grid to help with debugging typography. The // $debug variable will toggle its output. @include debug-grid(); diff --git a/assets/sass/components/cookieconsent/_cookieconsent.scss b/assets/sass/components/cookieconsent/_cookieconsent.scss index 36b55a5..327b44f 100644 --- a/assets/sass/components/cookieconsent/_cookieconsent.scss +++ b/assets/sass/components/cookieconsent/_cookieconsent.scss @@ -20,7 +20,7 @@ .button { &--accept { - border-color: var(--color-status); + border-color: var(--color-success); } &--decline { diff --git a/assets/sass/components/flex-inline/_flex-inline.scss b/assets/sass/components/flex-inline/_flex-inline.scss index f1d55ec..1ffe4e6 100644 --- a/assets/sass/components/flex-inline/_flex-inline.scss +++ b/assets/sass/components/flex-inline/_flex-inline.scss @@ -1,10 +1,10 @@ .flex-inline, %flex-inline { - --gap: .5rem; + --flex-inline-gap: .5rem; display: flex; flex-wrap: wrap; - gap: var(--gap); + gap: var(--flex-inline-gap); padding: 0; text-align: start; diff --git a/assets/sass/components/grid-group/_grid-group.scss b/assets/sass/components/grid-group/_grid-group.scss index 9c41f38..e35c1ef 100644 --- a/assets/sass/components/grid-group/_grid-group.scss +++ b/assets/sass/components/grid-group/_grid-group.scss @@ -1,52 +1,52 @@ .grid-group, %grid-group { - --column-min: 200px; - --gap: 1.5rem; + --grid-group-column-min: 200px; + --grid-group-gap: 1.5rem; display: grid; - gap: var(--gap); + gap: var(--grid-group-gap); // Writing "Min" instead of "min" to force use of css "min()" instead of sass "min()". // stylelint-disable-next-line function-name-case - grid-template-columns: repeat(auto-fit, minmax(Min(var(--column-min), 100%), 1fr)); + grid-template-columns: repeat(auto-fit, minmax(Min(var(--grid-group-column-min), 100%), 1fr)); &--fill { // stylelint-disable-next-line function-name-case - grid-template-columns: repeat(auto-fill, minmax(Min(var(--column-min), 100%), 1fr)); + grid-template-columns: repeat(auto-fill, minmax(Min(var(--grid-group-column-min), 100%), 1fr)); } &--100 { - --column-min: 100px; + --grid-group-column-min: 100px; } &--150 { - --column-min: 150px; + --grid-group-column-min: 150px; } &--200 { - --column-min: 200px; + --grid-group-column-min: 200px; } &--250 { - --column-min: 250px; + --grid-group-column-min: 250px; } &--300 { - --column-min: 300px; + --grid-group-column-min: 300px; } &--350 { - --column-min: 350px; + --grid-group-column-min: 350px; } &--400 { - --column-min: 400px; + --grid-group-column-min: 400px; } &--500 { - --column-min: 500px; + --grid-group-column-min: 500px; } &--600 { - --column-min: 600px; + --grid-group-column-min: 600px; } } diff --git a/assets/sass/components/messages/_messages.scss b/assets/sass/components/messages/_messages.scss index 158bbb3..5dd0f45 100644 --- a/assets/sass/components/messages/_messages.scss +++ b/assets/sass/components/messages/_messages.scss @@ -7,10 +7,10 @@ outline-style: solid; width: 95%; - &.status { - background-color: var(--color-status-bg); - color: var(--color-status); - outline-color: var(--color-status); + &.success { + background-color: var(--color-success-bg); + color: var(--color-success); + outline-color: var(--color-success); } &.info { diff --git a/assets/sass/components/tables/_tables.scss b/assets/sass/components/tables/_tables.scss index 4b315f1..b22da30 100644 --- a/assets/sass/components/tables/_tables.scss +++ b/assets/sass/components/tables/_tables.scss @@ -1,14 +1,14 @@ .zebra-table, %zebra-table { - --cell-padding: .5rem; + --table-cell-padding: .5rem; @include respond-to-max(s) { - --cell-padding: .3rem; + --table-cell-padding: .3rem; } th, td { - padding: var(--cell-padding); + padding: var(--table-cell-padding); } thead { @@ -32,7 +32,7 @@ .responsive-table, %responsive-table { - --gap: .5rem; + --table-gap: .5rem; @include respond-to-max(s) { th { @@ -41,7 +41,7 @@ td { display: grid; - gap: var(--gap); + gap: var(--table-gap); grid-template-columns: 12ch auto; &::before { @@ -50,11 +50,11 @@ } &:first-of-type { - padding-block-start: var(--gap); + padding-block-start: var(--table-gap); } &:last-of-type { - padding-block-end: var(--gap); + padding-block-end: var(--table-gap); } } }