diff --git a/docs/assets/scss/_component-examples.scss b/docs/assets/scss/_component-examples.scss index e00ad4f0cc..ece2db8dad 100644 --- a/docs/assets/scss/_component-examples.scss +++ b/docs/assets/scss/_component-examples.scss @@ -126,11 +126,6 @@ } } - // Card examples should be horizontal - > .card { - max-width: 20rem; - } - > .nav + .nav, > .alert + .alert, > .navbar + .navbar, diff --git a/docs/components/card.md b/docs/components/card.md index 8dfc8c861b..4e8c11026e 100644 --- a/docs/components/card.md +++ b/docs/components/card.md @@ -16,10 +16,12 @@ If you're familiar with Bootstrap 3, cards replace our old panels, wells, and th ## Example -Cards require a small amount of markup and classes to provide you with as much control as possible. These classes and markup are flexible though and can typically be remixed and extended with ease. For example, if your card has no flush content like images, feel free to put the `.card-block` class on the `.card` element to consolidate your markup. +Cards are built with as little markup and styles as possible, but still manage to deliver a ton of control and customization. Built with flexbox, they offer easy alignment and mix well with other Bootstrap components. + +Below is an example of a basic card with mixed content and a fixed width. Cards have no fixed width to start, so they'll naturally fill the full width of it's parent element. This is easily customized with our various [sizing options](#sizing). {% example html %} -
Some quick example text to build on the card title and make up the bulk of the card's content.
-Some quick example text to build on the card title and make up the bulk of the card's content.
- Card link - Another link -Some quick example text to build on the card title and make up the bulk of the card's content.
+With supporting text below as a natural lead-in to additional content.
- Go somewhere -With supporting text below as a natural lead-in to additional content.
- Go somewhere -With supporting text below as a natural lead-in to additional content.
- Go somewhere -With supporting text below as a natural lead-in to additional content.
- Go somewhere -With supporting text below as a natural lead-in to additional content.
- Go somewhere -With supporting text below as a natural lead-in to additional content.
- Go somewhere -With supporting text below as a natural lead-in to additional content.
+ Go somewhere +With supporting text below as a natural lead-in to additional content.
+ Go somewhere +With supporting text below as a natural lead-in to additional content.
+ Go somewhere +With supporting text below as a natural lead-in to additional content.
+ Go somewhere +With supporting text below as a natural lead-in to additional content.
+ Go somewhere +With supporting text below as a natural lead-in to additional content.
+ Go somewhere +Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.
@@ -341,7 +397,7 @@ Cards include their own variant classes for quickly changing the `background-col
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.
@@ -349,7 +405,7 @@ Cards include their own variant classes for quickly changing the `background-col
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.
@@ -357,7 +413,7 @@ Cards include their own variant classes for quickly changing the `background-col
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.
@@ -378,12 +434,12 @@ Cards include their own variant classes for quickly changing the `background-col {% capture callout-include %}{% include callout-warning-color-assistive-technologies.md %}{% endcapture %} {{ callout-include | markdownify }} -## Outline variants +### Outline cards In need of a colored card, but not the hefty background colors they bring? Replace the default modifier classes with the `.card-outline-*` ones to style just the `border-color` of a card. {% example html %} -+-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.
@@ -391,7 +447,7 @@ In need of a colored card, but not the hefty background colors they bring? Repla+-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.
@@ -399,7 +455,7 @@ In need of a colored card, but not the hefty background colors they bring? Repla+-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.
@@ -407,7 +463,7 @@ In need of a colored card, but not the hefty background colors they bring? Repla+-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.
@@ -415,7 +471,7 @@ In need of a colored card, but not the hefty background colors they bring? Repla+{% endexample %} -## Groups +## Card layout + +In addition to styling the content within cards, Bootstrap includes a few options for laying out series of cards. For the time being, **these layout options are not yet responsive**. + +### Card groups Use card groups to render cards as a single, attached element with equal width and height columns. Card groups use `display: flex;` to achieve their uniform sizing. -Only applies to small devices and above. - {% example html %}Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.
@@ -433,12 +489,14 @@ In need of a colored card, but not the hefty background colors they bring? Repla@@ -468,12 +526,47 @@ Only applies to small devices and above.{% endexample %} -## Decks +When using card groups with footers, their content will automatically line up. + +{% example html %} +++{% endexample %} + +### Card decks Need a set of equal width and height cards that aren't attached to one another? Use card decks. By default, card decks require two wrapping elements: `.card-deck-wrapper` and a `.card-deck`. We use table styles for the sizing and the gutters on `.card-deck`. The `.card-deck-wrapper` is used to negative margin out the `border-spacing` on the `.card-deck`. -Only applies to small devices and above. - {% example html %}+++
++ +Card title
+This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.
++++
++ +Card title
+This card has supporting text below as a natural lead-in to additional content.
++++
++ +Card title
+This is a wider card with supporting text below as a natural lead-in to additional content. This card has even longer content than the first to show that equal height action.
+-@@ -503,11 +596,48 @@ Only applies to small devices and above.{% endexample %} -## Columns +Just like with card groups, card footers in decks will automatically line up. -Cards can be organized into [Masonry](http://masonry.desandro.com)-like columns with just CSS by wrapping them in `.card-columns`. Cards are ordered from top to bottom and left to right when wrapped in `.card-columns`. +{% example html %} +++{% endexample %} -Only applies to small devices and above. +### Card columns + +Cards can be organized into [Masonry](http://masonry.desandro.com)-like columns with just CSS by wrapping them in `.card-columns`. Cards are built with CSS `column` properties instead of flexbox for easier alignment. Cards are ordered from top to bottom and left to right. + +**Heads up!** Your mileage with card columns may vary. To prevent cards breaking across columns, we must set them to `display: inline-block` as `column-break-inside: avoid` isn't a bulletproof solution yet. {% example html %}+++
++ +Card title
+This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.
++++
++ +Card title
+This card has supporting text below as a natural lead-in to additional content.
++++
++ +Card title
+This is a wider card with supporting text below as a natural lead-in to additional content. This card has even longer content than the first to show that equal height action.
+@@ -518,8 +648,8 @@ Only applies to small devices and above.This is a longer card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.
--++Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.
+-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat.
-Card title
-This card has supporting text below as a natural lead-in to additional content.
-Last updated 3 mins ago
+++Card title
+This card has supporting text below as a natural lead-in to additional content.
+Last updated 3 mins ago
+-
+-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.
-{% endexample %} diff --git a/docs/utilities/sizing-and-positioning.md b/docs/utilities/sizing-and-positioning.md index 9e3f35ca1b..a6de778ca2 100644 --- a/docs/utilities/sizing-and-positioning.md +++ b/docs/utilities/sizing-and-positioning.md @@ -21,7 +21,7 @@ The `.pos-f-t` class can be used to easily position elements at the top of the v ## Width and height -Easily make an element as wide or as tall (relative to its parent) our width and height utilities. Includes support for `25%`, `50%`, `75%`, and `100%`. +Easily make an element as wide or as tall (relative to its parent) with our width and height utilities. Includes support for `25%`, `50%`, `75%`, and `100%`. {% example html %}Card title
-This is a wider card with supporting text below as a natural lead-in to additional content. This card has even longer content than the first to show that equal height action.
-Last updated 3 mins ago
+++Card title
+This is a wider card with supporting text below as a natural lead-in to additional content. This card has even longer content than the first to show that equal height action.
+Last updated 3 mins ago
+Width 25%diff --git a/scss/_card.scss b/scss/_card.scss index 3cbd1998a1..9857ea2d98 100644 --- a/scss/_card.scss +++ b/scss/_card.scss @@ -4,14 +4,17 @@ .card { position: relative; - display: block; - margin-bottom: $card-spacer-y; + display: flex; + flex-direction: column; background-color: $card-bg; border: $card-border-width solid $card-border-color; @include border-radius($card-border-radius); } .card-block { + // Enable `flex-grow: 1` for decks and groups so that card blocks take up + // as much space as possible, ensuring footers are aligned to the bottom. + flex: 1 1 auto; padding: $card-spacer-x; } @@ -28,14 +31,6 @@ margin-bottom: 0; } -// .card-actions { -// padding: $card-spacer-y $card-spacer-x; - -// .card-link + .card-link { -// margin-left: $card-spacer-x; -// } -// } - .card-link { @include hover { text-decoration: none; @@ -200,21 +195,17 @@ .card-deck { display: flex; flex-flow: row wrap; - margin-right: -$card-deck-margin; - margin-bottom: $card-spacer-y; // Margin balancing - margin-left: -$card-deck-margin; .card { display: flex; flex: 1 0 0; flex-direction: column; - margin-right: $card-deck-margin; - margin-bottom: 0; // Margin balancing - margin-left: $card-deck-margin; - } - .card-block { - flex-grow: 1; + // Selectively apply horizontal margins to cards to avoid doing the + // negative margin dance like our grid. This differs from the grid + // due to the use of margins as gutters instead of padding. + &:not(:first-child) { margin-left: $card-deck-margin; } + &:not(:last-child) { margin-right: $card-deck-margin; } } } } @@ -275,17 +266,18 @@ // -// Card +// Columns // @include media-breakpoint-up(sm) { .card-columns { - column-count: 3; - column-gap: $card-columns-sm-up-column-gap; + column-count: $card-columns-count; + column-gap: $card-columns-gap; .card { display: inline-block; // Don't let them vertically span multiple columns - width: 100%; // Don't let them exceed the column width + width: 100%; // Don't let their width change + margin-bottom: $card-columns-margin; } } } diff --git a/scss/_variables.scss b/scss/_variables.scss index 1686020c51..427ecec1a0 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -707,9 +707,11 @@ $card-link-hover-color: $white !default; $card-img-overlay-padding: 1.25rem !default; -$card-deck-margin: .625rem !default; +$card-deck-margin: ($grid-gutter-width-base / 2) !default; -$card-columns-sm-up-column-gap: 1.25rem !default; +$card-columns-count: 3 !default; +$card-columns-gap: 1.25rem !default; +$card-columns-margin: $card-spacer-y !default; // 22. Tooltips