From d4217ea137c534dbbd7d32f58c5f700c63d5332c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Dec 2016 16:37:18 -0800 Subject: [PATCH 01/27] New width and height utils Adding 25%, 50%, and 75% to the mix for later use with cards --- docs/utilities/sizing-and-positioning.md | 12 +++++++++--- scss/utilities/_spacing.scss | 7 +++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/docs/utilities/sizing-and-positioning.md b/docs/utilities/sizing-and-positioning.md index 670b6f188b..9e3f35ca1b 100644 --- a/docs/utilities/sizing-and-positioning.md +++ b/docs/utilities/sizing-and-positioning.md @@ -21,15 +21,21 @@ 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 as its parent using the `.w-100` and `.h-100` utility classes. +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%`. {% example html %} -Width 100% +
Width 25%
+
Width 50%
+
Width 75%
+
Width 100%
{% endexample %} {% example html %}
-
Full height
+
Height 25%
+
Height 50%
+
Height 75%
+
Height 100%
{% endexample %} diff --git a/scss/utilities/_spacing.scss b/scss/utilities/_spacing.scss index a8d8e0afb5..9e1802c47c 100644 --- a/scss/utilities/_spacing.scss +++ b/scss/utilities/_spacing.scss @@ -1,6 +1,13 @@ // Width and height +.w-25 { width: 25% !important; } +.w-50 { width: 50% !important; } +.w-75 { width: 75% !important; } .w-100 { width: 100% !important; } + +.h-25 { height: 25% !important; } +.h-50 { height: 50% !important; } +.h-75 { height: 75% !important; } .h-100 { height: 100% !important; } .mw-100 { max-width: 100% !important; } From 5f40770d1944458f8c4a78ce1054f4c017d8457a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Dec 2016 16:38:09 -0800 Subject: [PATCH 02/27] Rename card column gap variable --- scss/_card.scss | 2 +- scss/_variables.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scss/_card.scss b/scss/_card.scss index 3cbd1998a1..95b2ec41bd 100644 --- a/scss/_card.scss +++ b/scss/_card.scss @@ -281,7 +281,7 @@ @include media-breakpoint-up(sm) { .card-columns { column-count: 3; - column-gap: $card-columns-sm-up-column-gap; + column-gap: $card-columns-gap; .card { display: inline-block; // Don't let them vertically span multiple columns diff --git a/scss/_variables.scss b/scss/_variables.scss index e12ccd149c..83b1559ac2 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -707,7 +707,7 @@ $card-img-overlay-padding: 1.25rem !default; $card-deck-margin: .625rem !default; -$card-columns-sm-up-column-gap: 1.25rem !default; +$card-columns-gap: 1.25rem !default; // 22. Tooltips From 246151aa120637eb2fd91105776a462eb7201cdc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Dec 2016 16:38:22 -0800 Subject: [PATCH 03/27] add card column count variable --- scss/_card.scss | 2 +- scss/_variables.scss | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/scss/_card.scss b/scss/_card.scss index 95b2ec41bd..269f844063 100644 --- a/scss/_card.scss +++ b/scss/_card.scss @@ -280,7 +280,7 @@ @include media-breakpoint-up(sm) { .card-columns { - column-count: 3; + column-count: $card-columns-count; column-gap: $card-columns-gap; .card { diff --git a/scss/_variables.scss b/scss/_variables.scss index 83b1559ac2..435475bc3b 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -707,6 +707,7 @@ $card-img-overlay-padding: 1.25rem !default; $card-deck-margin: .625rem !default; +$card-columns-count: 3 !default; $card-columns-gap: 1.25rem !default; From cd2584870e4ab3ed01a66cc51bab9135df78d934 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Dec 2016 16:39:11 -0800 Subject: [PATCH 04/27] 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) --- scss/_card.scss | 1 + scss/_variables.scss | 1 + 2 files changed, 2 insertions(+) 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 From 2c48655d074f5910cda49f1daedd743f66bf3f36 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Dec 2016 16:39:18 -0800 Subject: [PATCH 05/27] fix comment --- scss/_card.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scss/_card.scss b/scss/_card.scss index 9ae261556e..8ee11ad9f6 100644 --- a/scss/_card.scss +++ b/scss/_card.scss @@ -285,7 +285,7 @@ .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; } } From 0873fccd6351aaba66bad5d25a5bb96ab464fb57 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Dec 2016 16:39:23 -0800 Subject: [PATCH 06/27] comment typo --- scss/_card.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scss/_card.scss b/scss/_card.scss index 8ee11ad9f6..801b13b59a 100644 --- a/scss/_card.scss +++ b/scss/_card.scss @@ -275,7 +275,7 @@ // -// Card +// Columns // @include media-breakpoint-up(sm) { From 390a2a6c6043cb794c63b49e5e7b898e72ec4aba Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Dec 2016 16:40:19 -0800 Subject: [PATCH 07/27] remove commented out code --- scss/_card.scss | 8 -------- 1 file changed, 8 deletions(-) diff --git a/scss/_card.scss b/scss/_card.scss index 801b13b59a..f4fca4c373 100644 --- a/scss/_card.scss +++ b/scss/_card.scss @@ -28,14 +28,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; From 8d3b40211bed5911ec4a97695a4960921426b71e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Dec 2016 16:40:58 -0800 Subject: [PATCH 08/27] move the card-block flex action up to all card-blocks this allows us to easily scale card blocks in groups and decks, without repeating it in our css --- scss/_card.scss | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/scss/_card.scss b/scss/_card.scss index f4fca4c373..9c38480e7a 100644 --- a/scss/_card.scss +++ b/scss/_card.scss @@ -12,6 +12,9 @@ } .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; } @@ -204,10 +207,6 @@ margin-bottom: 0; // Margin balancing margin-left: $card-deck-margin; } - - .card-block { - flex-grow: 1; - } } } From 050716903f690ba05935702ed4ee8f98a90b2641 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Dec 2016 16:41:11 -0800 Subject: [PATCH 09/27] remove default bottom margin on cards use utils instead --- scss/_card.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/scss/_card.scss b/scss/_card.scss index 9c38480e7a..2ebe0371a3 100644 --- a/scss/_card.scss +++ b/scss/_card.scss @@ -5,7 +5,6 @@ .card { position: relative; display: block; - margin-bottom: $card-spacer-y; background-color: $card-bg; border: $card-border-width solid $card-border-color; @include border-radius($card-border-radius); From 5d592d16dbc565ebdd3a7ddd3b2dd216c60a752a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Dec 2016 16:41:28 -0800 Subject: [PATCH 10/27] switch from block to flex add flex direction too --- scss/_card.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scss/_card.scss b/scss/_card.scss index 2ebe0371a3..deb789ea0e 100644 --- a/scss/_card.scss +++ b/scss/_card.scss @@ -4,7 +4,8 @@ .card { position: relative; - display: block; + display: flex; + flex-direction: column; background-color: $card-bg; border: $card-border-width solid $card-border-color; @include border-radius($card-border-radius); From 503c4da10a0e2957d0fde4a9d3b22c1317145f26 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Dec 2016 16:41:56 -0800 Subject: [PATCH 11/27] redo docs intro for the example --- docs/components/card.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/components/card.md b/docs/components/card.md index 8dfc8c861b..85261469ca 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

From 4b88284b5aeb6e77f20febfe9ceb0633529f9eba Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Dec 2016 16:43:21 -0800 Subject: [PATCH 12/27] redo the supported content section entirely to give it sub sections --- docs/components/card.md | 143 +++++++++++++--------------------------- 1 file changed, 46 insertions(+), 97 deletions(-) diff --git a/docs/components/card.md b/docs/components/card.md index 85261469ca..18c6f93931 100644 --- a/docs/components/card.md +++ b/docs/components/card.md @@ -33,38 +33,39 @@ Below is an example of a basic card with mixed content and a fixed width. Cards ## 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 %}
- Card image cap

Card title

+
Card subtitle

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
    • -
-
Card link Another link
{% 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. @@ -77,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 %} -
-

Card title

-

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

- Card link - Another link -
-{% 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
    • +
+
Card link Another link
{% 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. From 3cc23e9747c84e6a2d8ae2b109657da821a6a79d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Dec 2016 16:44:12 -0800 Subject: [PATCH 13/27] redo sizing section with utils and grid callouts --- docs/components/card.md | 67 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 2 deletions(-) diff --git a/docs/components/card.md b/docs/components/card.md index 18c6f93931..56d20ac456 100644 --- a/docs/components/card.md +++ b/docs/components/card.md @@ -175,9 +175,72 @@ 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 %} {% example html %}
From 3f5c0a884a44983629659d3748d9d485ac7b3472 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Dec 2016 16:44:33 -0800 Subject: [PATCH 14/27] update alignment section with widths --- docs/components/card.md | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/docs/components/card.md b/docs/components/card.md index 56d20ac456..1bfe4ff746 100644 --- a/docs/components/card.md +++ b/docs/components/card.md @@ -242,6 +242,35 @@ Use custom CSS in your stylesheets or as inline styles to set a width.
{% 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 %} {% example html %}
From 85525e29407e54b96e0c62ec69e7d6f795870527 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Dec 2016 16:44:39 -0800 Subject: [PATCH 15/27] retitle nav section --- docs/components/card.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/components/card.md b/docs/components/card.md index 1bfe4ff746..78d8655448 100644 --- a/docs/components/card.md +++ b/docs/components/card.md @@ -271,6 +271,11 @@ You can quickly change the text alignment of any card—in its entirety or speci
{% endexample %} + +## Navigation + +Add some navigation to a card's header (or block) with Bootstrap's [nav components]({{ site.baseurl }}/components/navs/). + {% example html %}
From 49315dc16daf2413a6db3e62fcabf952787eb4c7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Dec 2016 16:44:54 -0800 Subject: [PATCH 16/27] redo image section for intros and subheadings --- docs/components/card.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/docs/components/card.md b/docs/components/card.md index 78d8655448..00bc50e511 100644 --- a/docs/components/card.md +++ b/docs/components/card.md @@ -322,9 +322,13 @@ Add some navigation to a card's header (or block) with Bootstrap's [nav componen
{% 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 %}
@@ -345,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). From 5692406a11a0753035773e9e93bd2eebecc910d6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Dec 2016 16:45:48 -0800 Subject: [PATCH 17/27] better grouping of card styles docs --- docs/components/card.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/docs/components/card.md b/docs/components/card.md index 00bc50e511..e3c89e6c30 100644 --- a/docs/components/card.md +++ b/docs/components/card.md @@ -364,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. @@ -380,7 +384,7 @@ 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`.** @@ -430,7 +434,7 @@ 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. From cba7b510815c23d55f25c01300c21191b194b1a7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Dec 2016 16:46:10 -0800 Subject: [PATCH 18/27] redo subheadings and organization of card layout options --- docs/components/card.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/docs/components/card.md b/docs/components/card.md index e3c89e6c30..77f41ca576 100644 --- a/docs/components/card.md +++ b/docs/components/card.md @@ -489,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 %}
@@ -524,9 +526,8 @@ Only applies to small devices and above.
{% endexample %} -## Decks +When using card groups with footers, their content will automatically line up. -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. From 433df0c67e0d480f3852924a47994149a8a4c5b6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Dec 2016 16:46:29 -0800 Subject: [PATCH 19/27] add aligned footer example --- docs/components/card.md | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/docs/components/card.md b/docs/components/card.md index 77f41ca576..6fa30a9f6d 100644 --- a/docs/components/card.md +++ b/docs/components/card.md @@ -528,6 +528,40 @@ Use card groups to render cards as a single, attached element with equal width a 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.

+
+
+ Last updated 3 mins ago +
+
+
+ Card image cap +
+

Card title

+

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

+
+
+ Last updated 3 mins ago +
+
+
+ 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.

+
+
+ Last updated 3 mins ago +
+
+
+{% endexample %} Only applies to small devices and above. From ce35655f5fbea77745b5f9ca76c390e6abb9711c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Dec 2016 16:47:10 -0800 Subject: [PATCH 20/27] card deck footer example --- docs/components/card.md | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/docs/components/card.md b/docs/components/card.md index 6fa30a9f6d..c963054098 100644 --- a/docs/components/card.md +++ b/docs/components/card.md @@ -563,7 +563,9 @@ When using card groups with footers, their content will automatically line up.
{% endexample %} -Only applies to small devices and above. +### 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`. {% example html %}
@@ -595,8 +597,43 @@ 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.

+
+
+ Last updated 3 mins ago +
+
+
+ Card image cap +
+

Card title

+

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

+
+
+ Last updated 3 mins ago +
+
+
+ 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.

+
+
+ Last updated 3 mins ago +
+
+
+{% endexample %} Only applies to small devices and above. From bc69ff108a6c222a137fa43d159d444f587659f0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Dec 2016 16:47:30 -0800 Subject: [PATCH 21/27] final docs cleanup with columns and more --- docs/components/card.md | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/docs/components/card.md b/docs/components/card.md index c963054098..1daca07681 100644 --- a/docs/components/card.md +++ b/docs/components/card.md @@ -596,10 +596,8 @@ Need a set of equal width and height cards that aren't attached to one another?
{% 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 %}
@@ -635,7 +633,11 @@ Cards can be organized into [Masonry](http://masonry.desandro.com)-like columns
{% 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 %}
@@ -646,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.

@@ -664,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.

@@ -674,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.

@@ -692,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 %} From 51f723d669dd8c9c90824e4069e43503582dd8a9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Dec 2016 16:52:25 -0800 Subject: [PATCH 22/27] no more need for this --- docs/assets/scss/_component-examples.scss | 5 ----- 1 file changed, 5 deletions(-) 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, From b3d8426ffe59af516e3d371c7cc37dc49cd588fe Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Dec 2016 18:55:21 -0800 Subject: [PATCH 23/27] move to grid gutter width, fixes #21300 --- scss/_variables.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scss/_variables.scss b/scss/_variables.scss index 8a442a2b24..8255e70add 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -705,7 +705,7 @@ $card-link-hover-color: #fff !default; $card-img-overlay-padding: 1.25rem !default; -$card-deck-margin: .625rem !default; +$card-deck-margin: ($grid-gutter-width-base / 2) !default; $card-columns-count: 3 !default; $card-columns-gap: 1.25rem !default; From 040acd30dbd4c2cf3a21ff061b60755c793c2c64 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Dec 2016 18:59:05 -0800 Subject: [PATCH 24/27] change card deck margin strategy - Instead of negative left/right margins, we selectively apply margins to the cards as needed. This way the first and last child never receive a left and right margin (respectively), so we don't need to negative indent those at the .card-deck level. - Drops the margin-bottom override on the .card because there's no more default margin there. - Drop the margin-bottom from the .card-deck to match our lack of margins on the card. This and the previous commit fixes #19883. --- scss/_card.scss | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scss/_card.scss b/scss/_card.scss index deb789ea0e..9857ea2d98 100644 --- a/scss/_card.scss +++ b/scss/_card.scss @@ -195,17 +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; + + // 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; } } } } From 6b367b12c9c7ad6f1f7da79456501ec0e8fed9a3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Dec 2016 19:13:39 -0800 Subject: [PATCH 25/27] margins to separate some cards in examples --- docs/components/card.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/components/card.md b/docs/components/card.md index 1daca07681..4e8c11026e 100644 --- a/docs/components/card.md +++ b/docs/components/card.md @@ -331,7 +331,7 @@ Cards include a few options for working with images. Choose from appending "imag 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

@@ -389,7 +389,7 @@ You can also use `.card-inverse` with the [contextual backgrounds variants](#bac 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.

@@ -397,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.

@@ -405,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.

@@ -413,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.

@@ -439,7 +439,7 @@ Cards include their own variant classes for quickly changing the `background-col 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.

@@ -447,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.

@@ -455,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.

@@ -463,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.

@@ -471,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.

From f297282833c2af308783c527edaf8d6a7fd93917 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Dec 2016 21:18:33 -0800 Subject: [PATCH 26/27] typo --- docs/utilities/sizing-and-positioning.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/utilities/sizing-and-positioning.md b/docs/utilities/sizing-and-positioning.md index 9e3f35ca1b..796eb83056 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) wit our width and height utilities. Includes support for `25%`, `50%`, `75%`, and `100%`. {% example html %}
Width 25%
From 4b62a9390682feac7c5d1e260fd968ebaa7ded7c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Dec 2016 21:20:47 -0800 Subject: [PATCH 27/27] ugh --- docs/utilities/sizing-and-positioning.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/utilities/sizing-and-positioning.md b/docs/utilities/sizing-and-positioning.md index 796eb83056..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) wit 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%