diff options
| author | Mark Otto <[email protected]> | 2014-11-11 19:25:16 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-11-11 19:25:16 -0800 |
| commit | 1e268ddfc30def5f4b2b0f2ace34b7de549ea830 (patch) | |
| tree | 7cc63bc43a6c3b603cef4f004a2285e5c034a710 /docs/_includes/components/media.html | |
| parent | 4f6aeaa6347725436296131c4d2b059243390a04 (diff) | |
| parent | 001d5e00c58bbb8e4d34c085c5b27b214a475bd5 (diff) | |
| download | bootstrap-1e268ddfc30def5f4b2b0f2ace34b7de549ea830.tar.xz bootstrap-1e268ddfc30def5f4b2b0f2ace34b7de549ea830.zip | |
Merge branch 'master' into labels-readme
Diffstat (limited to 'docs/_includes/components/media.html')
| -rw-r--r-- | docs/_includes/components/media.html | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/_includes/components/media.html b/docs/_includes/components/media.html index 1ea4176d4..d77a2520c 100644 --- a/docs/_includes/components/media.html +++ b/docs/_includes/components/media.html @@ -43,16 +43,16 @@ </a> </div> <div class="media"> - <a class="pull-right" href="#"> - <img data-src="holder.js/64x64" alt="Generic placeholder image"> - </a> - <a class="pull-left" href="#"> + <a class="media-left" href="#"> <img data-src="holder.js/64x64" alt="Generic placeholder image"> </a> <div class="media-body"> - <h4 class="media-heading">Deprecated pull-right pull-left example</h4> + <h4 class="media-heading">Media heading</h4> Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. </div> + <a class="media-right" href="#"> + <img data-src="holder.js/64x64" alt="Generic placeholder image"> + </a> </div> </div><!-- /.bs-example --> {% highlight html %} |