Merge pull request #17069 from kkirsche/patch-9

Card variables should be in _variables.scss
This commit is contained in:
Mark Otto 2015-08-20 22:02:35 -07:00
commit ba6cf4839b
2 changed files with 10 additions and 9 deletions

View File

@ -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;

View File

@ -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;