diff options
| author | Mark Otto <[email protected]> | 2017-10-19 00:14:27 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2017-10-19 00:14:27 -0700 |
| commit | f51440da22c21c5226dc226da73ac0da08720aca (patch) | |
| tree | f3baab551cf8c053d04b91c93607f3e972836f9b /scss | |
| parent | 521aa875e77e02bf0ac17007d2cd21e4f4b7b02e (diff) | |
| parent | 39b144c88fb6a664940981690bd60b2bd4ef9d37 (diff) | |
| download | bootstrap-f51440da22c21c5226dc226da73ac0da08720aca.tar.xz bootstrap-f51440da22c21c5226dc226da73ac0da08720aca.zip | |
Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev
Diffstat (limited to 'scss')
| -rw-r--r-- | scss/_variables.scss | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/scss/_variables.scss b/scss/_variables.scss index 3d78f0b8a..af0846806 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -62,16 +62,25 @@ $colors: map-merge(( "gray-dark": $gray-800 ), $colors); +$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-800 !default; + $theme-colors: () !default; $theme-colors: map-merge(( - "primary": $blue, - "secondary": $gray-600, - "success": $green, - "info": $cyan, - "warning": $yellow, - "danger": $red, - "light": $gray-100, - "dark": $gray-800 + "primary": $primary, + "secondary": $secondary, + "success": $success, + "info": $info, + "warning": $warning, + "danger": $danger, + "light": $light, + "dark": $dark ), $theme-colors); // stylelint-enable |