From: Mark Otto Date: Fri, 23 Dec 2016 00:39:11 +0000 (-0800) Subject: add card column margin variable instead of relying on a default card margin X-Git-Tag: v4.0.0-alpha.6~235^2~23 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cd2584870e4ab3ed01a66cc51bab9135df78d934;p=thirdparty%2Fbootstrap.git add card column margin variable instead of relying on a default card margin this assumes no margin on the .card to start (which will follow in a later commit) --- diff --git a/scss/_card.scss b/scss/_card.scss index 269f844063..9ae261556e 100644 --- a/scss/_card.scss +++ b/scss/_card.scss @@ -286,6 +286,7 @@ .card { display: inline-block; // Don't let them vertically span multiple columns width: 100%; // Don't let them exceed the column width + margin-bottom: $card-columns-margin; } } } diff --git a/scss/_variables.scss b/scss/_variables.scss index 435475bc3b..8a442a2b24 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -709,6 +709,7 @@ $card-deck-margin: .625rem !default; $card-columns-count: 3 !default; $card-columns-gap: 1.25rem !default; +$card-columns-margin: $card-spacer-y !default; // 22. Tooltips