diff options
| author | Mark Otto <[email protected]> | 2015-08-20 22:02:35 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-08-20 22:02:35 -0700 |
| commit | ba6cf4839b971e0cd6ad1f31f9f22e8d3893abf7 (patch) | |
| tree | cbeb6463be1f56d62742b601cdb53887c844019f | |
| parent | 6524e53dbb88f5f035d3a1ee6a355491bd8a557e (diff) | |
| parent | 9e8bd818b2e106e03e1928753268806f30a56997 (diff) | |
| download | bootstrap-ba6cf4839b971e0cd6ad1f31f9f22e8d3893abf7.tar.xz bootstrap-ba6cf4839b971e0cd6ad1f31f9f22e8d3893abf7.zip | |
Merge pull request #17069 from kkirsche/patch-9
Card variables should be in _variables.scss
| -rw-r--r-- | scss/_card.scss | 9 | ||||
| -rw-r--r-- | scss/_variables.scss | 10 |
2 files changed, 10 insertions, 9 deletions
diff --git a/scss/_card.scss b/scss/_card.scss index b0bac74e1..0a4f5b630 100644 --- a/scss/_card.scss +++ b/scss/_card.scss @@ -2,15 +2,6 @@ // Base styles // -$card-spacer-x: 1.25rem; -$card-spacer-y: .75rem; -$card-border-width: .0625rem; -$card-border-radius: .25rem; -$card-border-color: #e5e5e5; -$card-border-radius-inner: ($card-border-radius - $card-border-width); - -$card-cap-bg: #f5f5f5; - .card { position: relative; margin-bottom: $card-spacer-y; diff --git a/scss/_variables.scss b/scss/_variables.scss index 2cd88f649..3b31dbdaf 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -444,6 +444,16 @@ $state-danger-bg: #f2dede !default; $state-danger-border: darken($state-danger-bg, 5%) !default; +// Cards +$card-spacer-x: 1.25rem; +$card-spacer-y: .75rem; +$card-border-width: .0625rem; +$card-border-radius: .25rem; +$card-border-color: #e5e5e5; +$card-border-radius-inner: ($card-border-radius - $card-border-width); + +$card-cap-bg: #f5f5f5; + // Tooltips $tooltip-max-width: 200px !default; |