mirror of
https://github.com/twbs/bootstrap.git
synced 2024-12-01 13:24:25 +01:00
Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev
This commit is contained in:
commit
fc75a2c78f
@ -576,3 +576,16 @@ Only applies to small devices and above.
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% endexample %}
|
{% endexample %}
|
||||||
|
|
||||||
|
Card columns can also be extended and customized with some additional code. Shown below is an extension of the `.card-columns` class using the same CSS we use—CSS columns— to generate a set of responsive tiers for changing the number of columns.
|
||||||
|
|
||||||
|
{% highlight scss %}
|
||||||
|
.card-columns {
|
||||||
|
@include media-breakpoint-only(lg) {
|
||||||
|
column-count: 4;
|
||||||
|
}
|
||||||
|
@include media-breakpoint-only(xl) {
|
||||||
|
column-count: 5;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
{% endhighlight %}
|
||||||
|
@ -71,9 +71,7 @@
|
|||||||
@include clearfix;
|
@include clearfix;
|
||||||
padding: $card-spacer-y $card-spacer-x;
|
padding: $card-spacer-y $card-spacer-x;
|
||||||
background-color: $card-cap-bg;
|
background-color: $card-cap-bg;
|
||||||
// border-bottom: $card-border-width solid $card-border-color;
|
border-bottom: $card-border-width solid $card-border-color;
|
||||||
// Doesn't use mixin so that cards always have a "border"
|
|
||||||
box-shadow: inset 0 0 0 $card-border-width $card-border-color;
|
|
||||||
|
|
||||||
&:first-child {
|
&:first-child {
|
||||||
@include border-radius($card-border-radius-inner $card-border-radius-inner 0 0);
|
@include border-radius($card-border-radius-inner $card-border-radius-inner 0 0);
|
||||||
@ -84,9 +82,7 @@
|
|||||||
@include clearfix;
|
@include clearfix;
|
||||||
padding: $card-spacer-y $card-spacer-x;
|
padding: $card-spacer-y $card-spacer-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;
|
||||||
// Doesn't use mixin so that cards always have a "border"
|
|
||||||
box-shadow: inset 0 0 0 $card-border-width $card-border-color;
|
|
||||||
|
|
||||||
&:last-child {
|
&:last-child {
|
||||||
@include border-radius(0 0 $card-border-radius-inner $card-border-radius-inner);
|
@include border-radius(0 0 $card-border-radius-inner $card-border-radius-inner);
|
||||||
@ -103,10 +99,6 @@
|
|||||||
margin-bottom: -$card-spacer-y;
|
margin-bottom: -$card-spacer-y;
|
||||||
margin-left: -($card-spacer-x / 2);
|
margin-left: -($card-spacer-x / 2);
|
||||||
border-bottom: 0;
|
border-bottom: 0;
|
||||||
|
|
||||||
.nav-item {
|
|
||||||
margin-bottom: 0;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.card-header-pills {
|
.card-header-pills {
|
||||||
@ -198,9 +190,14 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//
|
|
||||||
// Card set
|
// Card set
|
||||||
//
|
//
|
||||||
|
// Heads up! We do some funky style resetting here for margins across our two
|
||||||
|
// variations (one flex, one table). Individual cards have margin-bottom by
|
||||||
|
// default, but they're ignored due to table styles. For a consistent design,
|
||||||
|
// we've done the same to the flex variation.
|
||||||
|
//
|
||||||
|
// Those changes are noted by `// Margin balancing`.
|
||||||
|
|
||||||
@if $enable-flex {
|
@if $enable-flex {
|
||||||
@include media-breakpoint-up(sm) {
|
@include media-breakpoint-up(sm) {
|
||||||
@ -208,11 +205,13 @@
|
|||||||
display: flex;
|
display: flex;
|
||||||
flex-flow: row wrap;
|
flex-flow: row wrap;
|
||||||
margin-right: -$card-deck-margin;
|
margin-right: -$card-deck-margin;
|
||||||
|
margin-bottom: $card-spacer-y; // Margin balancing
|
||||||
margin-left: -$card-deck-margin;
|
margin-left: -$card-deck-margin;
|
||||||
|
|
||||||
.card {
|
.card {
|
||||||
flex: 1 0 0;
|
flex: 1 0 0;
|
||||||
margin-right: $card-deck-margin;
|
margin-right: $card-deck-margin;
|
||||||
|
margin-bottom: 0; // Margin balancing
|
||||||
margin-left: $card-deck-margin;
|
margin-left: $card-deck-margin;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -222,12 +221,14 @@
|
|||||||
$space-between-cards: (2 * $card-deck-margin);
|
$space-between-cards: (2 * $card-deck-margin);
|
||||||
.card-deck {
|
.card-deck {
|
||||||
display: table;
|
display: table;
|
||||||
|
width: 100%;
|
||||||
|
margin-bottom: $card-spacer-y; // Margin balancing
|
||||||
table-layout: fixed;
|
table-layout: fixed;
|
||||||
border-spacing: $space-between-cards 0;
|
border-spacing: $space-between-cards 0;
|
||||||
|
|
||||||
.card {
|
.card {
|
||||||
display: table-cell;
|
display: table-cell;
|
||||||
width: 1%;
|
margin-bottom: 0; // Margin balancing
|
||||||
vertical-align: top;
|
vertical-align: top;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -3,6 +3,11 @@
|
|||||||
@mixin card-variant($background, $border) {
|
@mixin card-variant($background, $border) {
|
||||||
background-color: $background;
|
background-color: $background;
|
||||||
border-color: $border;
|
border-color: $border;
|
||||||
|
|
||||||
|
.card-header,
|
||||||
|
.card-footer {
|
||||||
|
background-color: transparent;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@mixin card-outline-variant($color) {
|
@mixin card-outline-variant($color) {
|
||||||
@ -17,7 +22,7 @@
|
|||||||
@mixin card-inverse {
|
@mixin card-inverse {
|
||||||
.card-header,
|
.card-header,
|
||||||
.card-footer {
|
.card-footer {
|
||||||
border-bottom: $card-border-width solid rgba(255,255,255,.2);
|
border-color: rgba(255,255,255,.2);
|
||||||
}
|
}
|
||||||
.card-header,
|
.card-header,
|
||||||
.card-footer,
|
.card-footer,
|
||||||
@ -27,7 +32,8 @@
|
|||||||
}
|
}
|
||||||
.card-link,
|
.card-link,
|
||||||
.card-text,
|
.card-text,
|
||||||
.card-blockquote > footer {
|
.card-subtitle,
|
||||||
|
.card-blockquote .blockquote-footer {
|
||||||
color: rgba(255,255,255,.65);
|
color: rgba(255,255,255,.65);
|
||||||
}
|
}
|
||||||
.card-link {
|
.card-link {
|
||||||
|
Loading…
Reference in New Issue
Block a user