diff options
| author | maks <pine3ree@gmail.com> | 2021-12-23 15:58:25 +0300 |
|---|---|---|
| committer | Mark Otto <otto@github.com> | 2022-02-26 01:59:15 +0300 |
| commit | d74870a749d694cb2859d300c24a0a49a0b52bce (patch) | |
| tree | 8bfedd549b441b6e87bea5fad86668aa945f7b69 /scss | |
| parent | fd9db1758b17e6dc5c259f9efd486638af927777 (diff) | |
move theme-colors (vars+map) after color tints definitions
In this way we can use color tints other than grays in our custom theme, w/o having to extend it later (e.g `$primary: $indigo-600;` ). This could be done in the project variables file, but i believe most developers just include a full local copy of `scss/_variables.scss` before the the original `default` file and change the values the need (maybe also removing the !default flag) so that it's easier to track changes and custom values during upgrades.
Diffstat (limited to 'scss')
| -rw-r--r-- | scss/_variables.scss | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/scss/_variables.scss b/scss/_variables.scss index 5dd78ae2a8..ccc925837a 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -66,30 +66,6 @@ $colors: ( ) !default; // scss-docs-end colors-map -// scss-docs-start theme-color-variables -$primary: $blue !default; -$secondary: $gray-600 !default; -$success: $green !default; -$info: $cyan !default; -$warning: $yellow !default; -$danger: $red !default; -$light: $gray-100 !default; -$dark: $gray-900 !default; -// scss-docs-end theme-color-variables - -// scss-docs-start theme-colors-map -$theme-colors: ( - "primary": $primary, - "secondary": $secondary, - "success": $success, - "info": $info, - "warning": $warning, - "danger": $danger, - "light": $light, - "dark": $dark -) !default; -// scss-docs-end theme-colors-map - // The contrast ratio to reach against white, to determine if color changes from "light" to "dark". Acceptable values for WCAG 2.0 are 3, 4.5 and 7. // See https://www.w3.org/TR/WCAG20/#visual-audio-contrast-contrast $min-contrast-ratio: 4.5 !default; @@ -320,6 +296,30 @@ $cyans: ( ) !default; // fusv-enable +// scss-docs-start theme-color-variables +$primary: $blue !default; +$secondary: $gray-600 !default; +$success: $green !default; +$info: $cyan !default; +$warning: $yellow !default; +$danger: $red !default; +$light: $gray-100 !default; +$dark: $gray-900 !default; +// scss-docs-end theme-color-variables + +// scss-docs-start theme-colors-map +$theme-colors: ( + "primary": $primary, + "secondary": $secondary, + "success": $success, + "info": $info, + "warning": $warning, + "danger": $danger, + "light": $light, + "dark": $dark +) !default; +// scss-docs-end theme-colors-map + // Characters which are escaped by the escape-svg function $escaped-characters: ( ("<", "%3c"), |