diff options
| author | lucascono <[email protected]> | 2017-10-04 09:00:18 -0300 |
|---|---|---|
| committer | lucascono <[email protected]> | 2017-10-04 09:00:18 -0300 |
| commit | ef2da793e84e5e0feff7fd81655e3656565e639e (patch) | |
| tree | 927af0b1221595ad0de4e6975215d01ab7a147fe /docs | |
| parent | 2729d81832a8d8210996e38cdf86922a28a681e9 (diff) | |
| parent | 1c24bdeca89e419da5ad2fc819e43fb96a912019 (diff) | |
| download | bootstrap-ef2da793e84e5e0feff7fd81655e3656565e639e.tar.xz bootstrap-ef2da793e84e5e0feff7fd81655e3656565e639e.zip | |
Merge remote-tracking branch 'refs/remotes/twbs/v4-dev' into v4-dev
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/4.0/components/card.md | 2 | ||||
| -rw-r--r-- | docs/4.0/components/collapse.md | 2 | ||||
| -rw-r--r-- | docs/4.0/components/list-group.md | 2 | ||||
| -rw-r--r-- | docs/4.0/content/images.md | 4 | ||||
| -rw-r--r-- | docs/4.0/examples/dashboard/index.html | 2 | ||||
| -rw-r--r-- | docs/4.0/utilities/vertical-align.md | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/docs/4.0/components/card.md b/docs/4.0/components/card.md index 9db9bc3c9..5da0ef039 100644 --- a/docs/4.0/components/card.md +++ b/docs/4.0/components/card.md @@ -47,7 +47,7 @@ The building block of a card is the `.card-body`. Use it whenever you need a pad ### Titles, text, and links -Card titles are used by adding `.card-title` to a `<h*>` tag. In the same way, links are added and placed next to each other by adding `.card-link` to a `<a>` tag. +Card titles are used by adding `.card-title` to a `<h*>` tag. In the same way, links are added and placed next to each other by adding `.card-link` to an `<a>` tag. Subtitles are used by adding a `.card-subtitle` to a `<h*>` tag. If the `.card-title` and the `.card-subtitle` items are placed in a `.card-body` item, the card title and subtitle are aligned nicely. diff --git a/docs/4.0/components/collapse.md b/docs/4.0/components/collapse.md index 536cc177f..a34ffeb7b 100644 --- a/docs/4.0/components/collapse.md +++ b/docs/4.0/components/collapse.md @@ -35,7 +35,7 @@ You can use a link with the `href` attribute, or a button with the `data-target` ## Multiple targets A `<button>` or `<a>` can show and hide multiple elements by referencing them with a JQuery selector in its `href` or `data-target` attribute. -Multiple `<button>` or `<a>` can show and hide an element if they each reference it with their `href` or `data-target` attribute +Multiple `<button>` or `<a>` can show and hide an element if they each reference it with their `href` or `data-target` attribute {% example html %} <p> diff --git a/docs/4.0/components/list-group.md b/docs/4.0/components/list-group.md index 1a2796588..2d5b4f16e 100644 --- a/docs/4.0/components/list-group.md +++ b/docs/4.0/components/list-group.md @@ -217,7 +217,7 @@ Use the tab JavaScript plugin—include it individually or through the compiled ### Using data attributes -You can activate a list group navigation without writing any JavaScript by simply specifying `data-toggle="list"` or on an element. Use these data attributes on `.list-group-item`. +You can activate a list group navigation without writing any JavaScript by simply specifying `data-toggle="list"` or on an element. Use these data attributes on `.list-group-item`. <div role="tabpanel"> {% highlight html %} diff --git a/docs/4.0/content/images.md b/docs/4.0/content/images.md index 4601dcc6d..5c8e19470 100644 --- a/docs/4.0/content/images.md +++ b/docs/4.0/content/images.md @@ -77,7 +77,7 @@ If you are using the `<picture>` element to specify multiple `<source>` elements {% highlight html %} ​<picture> - <source srcset="..." type="image/svg+xml"> - <img src="..." class="img-fluid img-thumbnail" alt="..."> + <source srcset="..." type="image/svg+xml"> + <img src="..." class="img-fluid img-thumbnail" alt="..."> </picture> {% endhighlight %} diff --git a/docs/4.0/examples/dashboard/index.html b/docs/4.0/examples/dashboard/index.html index ece8fd595..b200fb7b2 100644 --- a/docs/4.0/examples/dashboard/index.html +++ b/docs/4.0/examples/dashboard/index.html @@ -93,7 +93,7 @@ </ul> </nav> - <main role="main" class="col-sm-9 ml-sm-auto col-md-10 pt-3"> + <main role="main" class="col-sm-9 ml-sm-auto col-md-10 pt-3"> <h1>Dashboard</h1> <section class="row text-center placeholders"> diff --git a/docs/4.0/utilities/vertical-align.md b/docs/4.0/utilities/vertical-align.md index 3bb4fb851..2b246eb31 100644 --- a/docs/4.0/utilities/vertical-align.md +++ b/docs/4.0/utilities/vertical-align.md @@ -7,7 +7,7 @@ group: utilities Change the alignment of elements with the [`vertical-alignment`](https://developer.mozilla.org/en-US/docs/Web/CSS/vertical-align) utilities. Please note that vertical-align only affects inline, inline-block, inline-table, and table cell elements. -Choose from `.align-baseline`, `.align-top`, `.align-middle`, `.align-bottom`, `.align-text-bottom`, and `.align-text-top` as needed. +Choose from `.align-baseline`, `.align-top`, `.align-middle`, `.align-bottom`, `.align-text-bottom`, and `.align-text-top` as needed. With inline elements: |
