0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-03-15 15:29:22 +01:00

Adjust card spacing variables (#29813)

This commit is contained in:
Brendan 2019-12-14 05:35:17 -08:00 committed by Martijn Cuppens
parent 4e59997d06
commit dcc2ce3587
2 changed files with 14 additions and 11 deletions

View File

@ -39,16 +39,16 @@
// Workaround for the image size bug in IE // Workaround for the image size bug in IE
// See: https://github.com/twbs/bootstrap/pull/28855 // See: https://github.com/twbs/bootstrap/pull/28855
min-height: 1px; min-height: 1px;
padding: $card-spacer-x; padding: $card-spacer-y $card-spacer-x;
color: $card-color; color: $card-color;
} }
.card-title { .card-title {
margin-bottom: $card-spacer-y; margin-bottom: $card-title-spacer-y;
} }
.card-subtitle { .card-subtitle {
margin-top: -$card-spacer-y / 2; margin-top: -$card-title-spacer-y / 2;
margin-bottom: 0; margin-bottom: 0;
} }
@ -71,7 +71,7 @@
// //
.card-header { .card-header {
padding: $card-spacer-y $card-spacer-x; padding: $card-cap-padding-y $card-cap-padding-x;
margin-bottom: 0; // Removes the default margin-bottom of <hN> margin-bottom: 0; // Removes the default margin-bottom of <hN>
color: $card-cap-color; color: $card-cap-color;
background-color: $card-cap-bg; background-color: $card-cap-bg;
@ -89,7 +89,7 @@
} }
.card-footer { .card-footer {
padding: $card-spacer-y $card-spacer-x; padding: $card-cap-padding-y $card-cap-padding-x;
background-color: $card-cap-bg; background-color: $card-cap-bg;
border-top: $card-border-width solid $card-border-color; border-top: $card-border-width solid $card-border-color;
@ -104,9 +104,9 @@
// //
.card-header-tabs { .card-header-tabs {
margin-right: -$card-spacer-x / 2; margin-right: -$card-cap-padding-x / 2;
margin-bottom: -$card-spacer-y; margin-bottom: -$card-cap-padding-y;
margin-left: -$card-spacer-x / 2; margin-left: -$card-cap-padding-x / 2;
border-bottom: 0; border-bottom: 0;
@if $nav-tabs-link-active-bg != $card-bg { @if $nav-tabs-link-active-bg != $card-bg {
@ -118,8 +118,8 @@
} }
.card-header-pills { .card-header-pills {
margin-right: -$card-spacer-x / 2; margin-right: -$card-cap-padding-x / 2;
margin-left: -$card-spacer-x / 2; margin-left: -$card-cap-padding-x / 2;
} }
// Card image // Card image

View File

@ -936,12 +936,15 @@ $pagination-disabled-border-color: $gray-300 !default;
// Cards // Cards
$card-spacer-y: .75rem !default; $card-spacer-y: 1.25rem !default;
$card-spacer-x: 1.25rem !default; $card-spacer-x: 1.25rem !default;
$card-title-spacer-y: .75rem !default;
$card-border-width: $border-width !default; $card-border-width: $border-width !default;
$card-border-radius: $border-radius !default; $card-border-radius: $border-radius !default;
$card-border-color: rgba($black, .125) !default; $card-border-color: rgba($black, .125) !default;
$card-inner-border-radius: subtract($card-border-radius, $card-border-width) !default; $card-inner-border-radius: subtract($card-border-radius, $card-border-width) !default;
$card-cap-padding-y: .75rem !default;
$card-cap-padding-x: 1.25rem !default;
$card-cap-bg: rgba($black, .03) !default; $card-cap-bg: rgba($black, .03) !default;
$card-cap-color: null !default; $card-cap-color: null !default;
$card-height: null !default; $card-height: null !default;