diff options
| author | Chris Rebert <[email protected]> | 2015-12-16 22:16:36 -0800 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2015-12-16 22:16:36 -0800 |
| commit | 92338da1f38bc60b08cd44b1c491665d6e8c5e70 (patch) | |
| tree | 04b8640a9e207d6021ee632a901fcce8c18464a0 | |
| parent | 701513969d56c320d00a5fb1d5e3e305d761fbca (diff) | |
| parent | 679848532344518fc7d7c65758c5812910eb295d (diff) | |
| download | bootstrap-92338da1f38bc60b08cd44b1c491665d6e8c5e70.tar.xz bootstrap-92338da1f38bc60b08cd44b1c491665d6e8c5e70.zip | |
Merge pull request #18469 from twbs/card-deck-margin
Introduce $card-deck-margin variable
/fyi @mdo; happy to tweak the var names if desired
| -rw-r--r-- | scss/_card.scss | 15 | ||||
| -rw-r--r-- | scss/_variables.scss | 2 |
2 files changed, 10 insertions, 7 deletions
diff --git a/scss/_card.scss b/scss/_card.scss index ecd797e1f..c1f2da116 100644 --- a/scss/_card.scss +++ b/scss/_card.scss @@ -180,22 +180,23 @@ .card-deck { display: flex; flex-flow: row wrap; - margin-right: -.625rem; - margin-left: -.625rem; + margin-right: -$card-deck-margin; + margin-left: -$card-deck-margin; .card { flex: 1 0 0; - margin-right: .625rem; - margin-left: .625rem; + margin-right: $card-deck-margin; + margin-left: $card-deck-margin; } } } } @else { @include media-breakpoint-up(sm) { + $space-between-cards: (2 * $card-deck-margin); .card-deck { display: table; table-layout: fixed; - border-spacing: 1.25rem 0; + border-spacing: $space-between-cards 0; .card { display: table-cell; @@ -204,8 +205,8 @@ } } .card-deck-wrapper { - margin-right: -1.25rem; - margin-left: -1.25rem; + margin-right: (-$space-between-cards); + margin-left: (-$space-between-cards); } } } diff --git a/scss/_variables.scss b/scss/_variables.scss index f02d4a16b..322baf412 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -486,6 +486,8 @@ $card-bg: #fff !default; $card-link-hover-color: #fff !default; +$card-deck-margin: .625rem !default; + // Tooltips |