diff options
| author | Mark Otto <[email protected]> | 2015-01-18 12:24:29 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-01-18 12:24:29 -0800 |
| commit | 1bf1ba7103cf4de0364dfd8ec78a31eb813d7b8f (patch) | |
| tree | 7a63ae1a434fae8cb51835fafd1b531d5f5da64e /docs/_includes/components/media.html | |
| parent | dbe47654160d389c6991a312c9cecd2eeb9b6122 (diff) | |
| parent | 22b79dae3c9307c329e6722ff1be8aa0a4143812 (diff) | |
| download | bootstrap-1bf1ba7103cf4de0364dfd8ec78a31eb813d7b8f.tar.xz bootstrap-1bf1ba7103cf4de0364dfd8ec78a31eb813d7b8f.zip | |
Merge branch 'master' into pr/15278
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
Diffstat (limited to 'docs/_includes/components/media.html')
| -rw-r--r-- | docs/_includes/components/media.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/_includes/components/media.html b/docs/_includes/components/media.html index 6f31804bf..3d1f75dbe 100644 --- a/docs/_includes/components/media.html +++ b/docs/_includes/components/media.html @@ -5,7 +5,7 @@ <h3 id="media-default">Default media</h3> <p>The default media displays a media object (images, video, audio) to the left or right of a content block.</p> - <div class="bs-example"> + <div class="bs-example" data-example-id="default-media"> <div class="media"> <div class="media-left"> <a href="#"> @@ -84,7 +84,7 @@ <p>The classes <code>.pull-left</code> and <code>.pull-right</code> also exist and were previously used as part of the media component, but are deprecated for that use as of v3.3.0. They are approximately equivalent to <code>.media-left</code> and <code>.media-right</code>, except that <code>.media-right</code> should be placed after the <code>.media-body</code> in the html.</p> <h3 id="media-alignment">Media alignment</h3> <p>The images or other media can be aligned top, middle, or bottom. The default is top aligned.</p> - <div class="bs-example"> + <div class="bs-example" data-example-id="media-alignment"> <div class="media"> <div class="media-left"> <a href="#"> @@ -138,7 +138,7 @@ <h3 id="media-list">Media list</h3> <p>With a bit of extra markup, you can use media inside list (useful for comment threads or articles lists).</p> - <div class="bs-example"> + <div class="bs-example" data-example-id="media-list"> <ul class="media-list"> <li class="media"> <div class="media-left"> |