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 %} -
+
Card image cap

Card title

@@ -31,38 +33,39 @@ Cards require a small amount of markup and classes to provide you with as much c ## Content types -Cards support a wide variety of content, including images, text, list groups, links, and more. Mix and match multiple content types to create the card you need. +Cards support a wide variety of content, including images, text, list groups, links, and more. Below are examples of what's supported. + +### Blocks + +The building block of a card is the `.card-block`. Use it whenever you need a padded section within a card. + +{% example html %} +
+
+ This is some text within a card block. +
+
+{% endexample %} + +### Titles, text, and links + +Card titles are used by adding `.card-title` to a `` tag. In the same way, links are added and placed next to each other by adding `.card-link` to a `` tag. + +Subtitles are used by adding a `.card-subtitle` to an `` tag. If the `.card-title` and the `.card-subtitle` items are placed in a `.card-block` item, the card title and subtitle are aligned nicely. {% example html %} {% endexample %} -Lists can be added to a card by adding a list group. - -{% example html %} -
-
    -
  • Cras justo odio
  • -
  • Dapibus ac facilisis in
  • -
  • Vestibulum at eros
  • -
-
-{% endexample %} +### Images `.card-img-top` places an image to the top of the card. With `.card-text`, text can be added to the card. Text within `.card-text` can also be styled with the standard HTML tags. @@ -75,96 +78,44 @@ Lists can be added to a card by adding a list group.
{% endexample %} -Card titles are used by adding `.card-title` to a `` tag. In the same way, links are added and placed next to each other by adding `.card-link` to a `` tag. +### List groups -{% example html %} - -{% endexample %} - -Subtitles are used by adding a `.card-subtitle` to an `` tag. If the `.card-title` and the `.card-subtitle` items are placed in a `.card-block` item, the card title and subtitle are aligned nicely. - -The multiple content types can be easily combined to create the card you need. See below for an example. +Create lists of content in a card with a flush list group. {% example html %}
+
    +
  • Cras justo odio
  • +
  • Dapibus ac facilisis in
  • +
  • Vestibulum at eros
  • +
+
+{% endexample %} + +### Kitchen sink + +Mix and match multiple content types to create the card you need, or throw everything in there. Shown below are image styles, blocks, text styles, and a list group—all wrapped in a fixed-width card. + +{% example html %} +
+ Card image cap

Card title

-
Support card subtitle
-
- Card image -

Some quick example text to build on the card title and make up the bulk of the card's content.

+
+
    +
  • Cras justo odio
  • +
  • Dapibus ac facilisis in
  • +
  • Vestibulum at eros
  • +
+
{% endexample %} -## Sizing - -Constrain the width of cards via custom CSS, our predefined grid classes, or with custom styles using our grid mixins. - -Using the grid: - -{% example html %} -
-
-
-

Special title treatment

-

With supporting text below as a natural lead-in to additional content.

- Go somewhere -
-
-
-
-

Special title treatment

-

With supporting text below as a natural lead-in to additional content.

- Go somewhere -
-
-
-{% endexample %} - -Using custom widths: - -{% example html %} -
-

Special title treatment

-

With supporting text below as a natural lead-in to additional content.

- Go somewhere -
-{% endexample %} - -## Text alignment - -You can quickly change the text alignment of any card—in its entirety or specific parts—with our [text align classes]({{ site.baseurl }}/utilities/typography/#text-alignment). - -{% example html %} -
-

Special title treatment

-

With supporting text below as a natural lead-in to additional content.

- Go somewhere -
- -
-

Special title treatment

-

With supporting text below as a natural lead-in to additional content.

- Go somewhere -
- -
-

Special title treatment

-

With supporting text below as a natural lead-in to additional content.

- Go somewhere -
-{% endexample %} - -## Header and footer +### Header and footer Add an optional header and/or footer within a card. @@ -224,9 +175,106 @@ Card headers can be styled by adding `.card-header` to `` elements.
{% endexample %} -## Header nav +## Sizing -Use Bootstrap's nav pills or tabs within a card header. +Cards assume no specific `width` to start, so they'll be 100% wide unless otherwise stated. You can change this as needed with custom CSS, grid classes, grid Sass mixins, or utilities. + +### Using grid markup + +Using the grid, wrap cards in columns and rows as needed. + +{% example html %} +
+
+
+
+

Special title treatment

+

With supporting text below as a natural lead-in to additional content.

+ Go somewhere +
+
+
+
+
+
+

Special title treatment

+

With supporting text below as a natural lead-in to additional content.

+ Go somewhere +
+
+
+
+{% endexample %} + +### Using utilities + +Use our handful of [available sizing utilities]({{ site.baseurl }}/utilities/sizing-and-positioning/#width-and-height) to quickly set a card's width. + +{% example html %} +
+
+

Card title

+

With supporting text below as a natural lead-in to additional content.

+ Button +
+
+ +
+
+

Card title

+

With supporting text below as a natural lead-in to additional content.

+ Button +
+
+{% endexample %} + +### Using custom CSS + +Use custom CSS in your stylesheets or as inline styles to set a width. + +{% example html %} +
+
+

Special title treatment

+

With supporting text below as a natural lead-in to additional content.

+ Go somewhere +
+
+{% endexample %} + +## Text alignment + +You can quickly change the text alignment of any card—in its entirety or specific parts—with our [text align classes]({{ site.baseurl }}/utilities/typography/#text-alignment). + +{% example html %} +
+
+

Special title treatment

+

With supporting text below as a natural lead-in to additional content.

+ Go somewhere +
+
+ +
+
+

Special title treatment

+

With supporting text below as a natural lead-in to additional content.

+ Go somewhere +
+
+ +
+
+

Special title treatment

+

With supporting text below as a natural lead-in to additional content.

+ Go somewhere +
+
+{% endexample %} + +## Navigation + +Add some navigation to a card's header (or block) with Bootstrap's [nav components]({{ site.baseurl }}/components/navs/). {% example html %}
@@ -274,12 +322,16 @@ Use Bootstrap's nav pills or tabs within a card header.
{% endexample %} -## Image caps +## Images -Similar to headers and footers, cards include top and bottom image caps. +Cards include a few options for working with images. Choose from appending "image caps" at either end of a card, overlaying images with card content, or simply embedding the image in a card. + +### Image caps + +Similar to headers and footers, cards can include top and bottom "image caps"—images at the top or bottom of a card. {% example html %} -
+
Card image cap

Card title

@@ -297,7 +349,7 @@ Similar to headers and footers, cards include top and bottom image caps.
{% endexample %} -## Image overlays +### Image overlays Turn an image into a card background and overlay your card's text. Depending on the image, you may or may not need `.card-inverse` (see below). @@ -312,7 +364,11 @@ Turn an image into a card background and overlay your card's text. Depending on
{% endexample %} -## Inverted text +## Card styles + +Cards include various options for customizing their backgrounds, borders, and color. + +### Inverted text By default, cards use dark text and assume a light background. You can reverse that by toggling the `color` of text within, as well as that of the card's subcomponents, with `.card-inverse`. Then, specify a dark `background-color` and `border-color` to go with it. @@ -328,12 +384,12 @@ You can also use `.card-inverse` with the [contextual backgrounds variants](#bac
{% endexample %} -## Background variants +### Background variants Cards include their own variant classes for quickly changing the `background-color` and `border-color` of a card. **Darker colors require the use of `.card-inverse`.** {% example html %} -
+

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
-
+

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
{% 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 %}
@@ -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 %} +
+
+ Card image cap +
+

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 image cap +
+

Card title

+

This card has supporting text below as a natural lead-in to additional content.

+
+ +
+
+ Card image cap +
+

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.

+
+ +
+
+{% 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 %}
@@ -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 %} +
+
+ Card image cap +
+

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 image cap +
+

Card title

+

This card has supporting text below as a natural lead-in to additional content.

+
+ +
+
+ Card image cap +
+

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.

+
+ +
+
+{% 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 %}
@@ -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.

@@ -536,7 +666,7 @@ Only applies to small devices and above.

Last updated 3 mins ago

-
+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat.

@@ -546,15 +676,17 @@ Only applies to small devices and above.
-
-

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

+
Card image
-
+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

@@ -564,10 +696,12 @@ Only applies to small devices and above.
-
-

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

+
{% 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 %}
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