diff options
| author | Mark Otto <[email protected]> | 2016-11-26 01:04:51 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-11-26 01:04:51 -0800 |
| commit | abbc2b7c93ed36aa5ff4b92ae78cd7d87b758cc7 (patch) | |
| tree | 0785fc9094a2e3dc8b242109ccca31b3092d768e /scss | |
| parent | d82d04fd6df5b62bf4b0a4cf8a590bbd4a52fdba (diff) | |
| parent | bb6c197d9baeb873ad6aeb4af51632c85187d133 (diff) | |
| download | bootstrap-abbc2b7c93ed36aa5ff4b92ae78cd7d87b758cc7.tar.xz bootstrap-abbc2b7c93ed36aa5ff4b92ae78cd7d87b758cc7.zip | |
Merge branch 'v4-dev' into modal-sizes
Diffstat (limited to 'scss')
| -rw-r--r-- | scss/_variables.scss | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scss/_variables.scss b/scss/_variables.scss index 16155db60..529ea4989 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -532,7 +532,7 @@ $dropdown-box-shadow: 0 .5rem 1rem rgba(0,0,0,.175) !default; $dropdown-link-color: $gray-dark !default; $dropdown-link-hover-color: darken($gray-dark, 5%) !default; -$dropdown-link-hover-bg: #f5f5f5 !default; +$dropdown-link-hover-bg: $gray-lightest !default; $dropdown-link-active-color: $component-active-color !default; $dropdown-link-active-bg: $component-active-bg !default; @@ -677,7 +677,7 @@ $card-border-width: 1px !default; $card-border-radius: $border-radius !default; $card-border-color: rgba(0,0,0,.125) !default; $card-border-radius-inner: calc(#{$card-border-radius} - #{$card-border-width}) !default; -$card-cap-bg: #f5f5f5 !default; +$card-cap-bg: $gray-lightest !default; $card-bg: #fff !default; $card-link-hover-color: #fff !default; @@ -825,7 +825,7 @@ $list-group-border-color: rgba(0,0,0,.125) !default; $list-group-border-width: $border-width !default; $list-group-border-radius: $border-radius !default; -$list-group-hover-bg: #f5f5f5 !default; +$list-group-hover-bg: $gray-lightest !default; $list-group-active-color: $component-active-color !default; $list-group-active-bg: $component-active-bg !default; $list-group-active-border: $list-group-active-bg !default; @@ -916,12 +916,12 @@ $code-font-size: 90% !default; $code-padding-x: .4rem !default; $code-padding-y: .2rem !default; $code-color: #bd4147 !default; -$code-bg: #f7f7f9 !default; +$code-bg: $gray-lightest !default; $kbd-color: #fff !default; $kbd-bg: #333 !default; -$pre-bg: #f7f7f9 !default; +$pre-bg: $gray-lightest !default; $pre-color: $gray-dark !default; $pre-border-color: #ccc !default; $pre-scrollable-max-height: 340px !default; |