diff options
| author | Pierre-Denis Vanduynslager <[email protected]> | 2017-01-06 15:57:15 -0500 |
|---|---|---|
| committer | Pierre-Denis Vanduynslager <[email protected]> | 2017-01-06 15:57:15 -0500 |
| commit | 4c2f5443596c39c551ebb7ec635d01a98e434189 (patch) | |
| tree | 3bb7d0a5bcd80e2758578c8d597c7554d7fd4b0c /docs/layout | |
| parent | eb84c03ddf5993d701724250507055b4e394fbdb (diff) | |
| parent | 65ffb1c3b6e94440812a2e228cb8e8be512652ec (diff) | |
| download | bootstrap-4c2f5443596c39c551ebb7ec635d01a98e434189.tar.xz bootstrap-4c2f5443596c39c551ebb7ec635d01a98e434189.zip | |
Merge branch 'twbs/v4-dev' into dropdown-keyboard
Diffstat (limited to 'docs/layout')
| -rw-r--r-- | docs/layout/grid.md | 2 | ||||
| -rw-r--r-- | docs/layout/media-object.md | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/layout/grid.md b/docs/layout/grid.md index d0f5b2326..03deb2f55 100644 --- a/docs/layout/grid.md +++ b/docs/layout/grid.md @@ -32,7 +32,7 @@ Bootstrap's grid system uses a series of containers, rows, and columns to layout </div> </div> -The above example creates three equal-width columns on small, medium, large, and extra large devices using our [predefined grid classes](#predefined-classes). Those columns are centered in the page with the parent `.container`. +The above example creates three equal-width columns on small, medium, large, and extra large devices using our predefined grid classes. Those columns are centered in the page with the parent `.container`. Breaking it down, here's how it works: diff --git a/docs/layout/media-object.md b/docs/layout/media-object.md index 662f72c25..74229dc3c 100644 --- a/docs/layout/media-object.md +++ b/docs/layout/media-object.md @@ -64,7 +64,7 @@ Media in a media object can be aligned with flexbox utilities to the top (defaul {% example html %} <div class="media"> - <img class="d-flex mr-3" data-src="holder.js/64x64" alt="Generic placeholder image"> + <img class="d-flex align-self-start mr-3" data-src="holder.js/64x64" alt="Generic placeholder image"> <div class="media-body"> <h5 class="mt-0">Top-aligned media</h5> <p>Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in faucibus.</p> @@ -75,7 +75,7 @@ Media in a media object can be aligned with flexbox utilities to the top (defaul {% example html %} <div class="media"> - <img class="d-flex mr-3" data-src="holder.js/64x64" alt="Generic placeholder image"> + <img class="d-flex align-self-center mr-3" data-src="holder.js/64x64" alt="Generic placeholder image"> <div class="media-body"> <h5 class="mt-0">Center-aligned media</h5> <p>Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in faucibus.</p> @@ -86,7 +86,7 @@ Media in a media object can be aligned with flexbox utilities to the top (defaul {% example html %} <div class="media"> - <img class="d-flex mr-3" data-src="holder.js/64x64" alt="Generic placeholder image"> + <img class="d-flex align-self-end mr-3" data-src="holder.js/64x64" alt="Generic placeholder image"> <div class="media-body"> <h5 class="mt-0">Bottom-aligned media</h5> <p>Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in faucibus.</p> |