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/thumbnails.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/thumbnails.html')
| -rw-r--r-- | docs/_includes/components/thumbnails.html | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/docs/_includes/components/thumbnails.html b/docs/_includes/components/thumbnails.html index 3b6dfce43..530ae50fb 100644 --- a/docs/_includes/components/thumbnails.html +++ b/docs/_includes/components/thumbnails.html @@ -2,10 +2,11 @@ <h1 id="thumbnails" class="page-header">Thumbnails</h1> <p class="lead">Extend Bootstrap's <a href="../css/#grid">grid system</a> with the thumbnail component to easily display grids of images, videos, text, and more.</p> + <p>If you're looking for Pinterest-like presentation of thumbnails of varying heights and/or widths, you'll need to use a third-party plugin such as <a href="http://masonry.desandro.com">Masonry</a>, <a href="http://isotope.metafizzy.co">Isotope</a>, or <a href="http://salvattore.com">Salvattore</a>.</p> <h3 id="thumbnails-default">Default example</h3> <p>By default, Bootstrap's thumbnails are designed to showcase linked images with minimal required markup.</p> - <div class="bs-example"> + <div class="bs-example" data-example-id="simple-thumbnails"> <div class="row"> <div class="col-xs-6 col-md-3"> <a href="#" class="thumbnail"> @@ -33,7 +34,7 @@ <div class="row"> <div class="col-xs-6 col-md-3"> <a href="#" class="thumbnail"> - <img data-src="holder.js/100%x180" alt="..."> + <img src="..." alt="..."> </a> </div> ... @@ -42,7 +43,7 @@ <h3 id="thumbnails-custom-content">Custom content</h3> <p>With a bit of extra markup, it's possible to add any kind of HTML content like headings, paragraphs, or buttons into thumbnails.</p> - <div class="bs-example"> + <div class="bs-example" data-example-id="thumbnails-with-custom-content"> <div class="row"> <div class="col-sm-6 col-md-4"> <div class="thumbnail"> @@ -80,7 +81,7 @@ <div class="row"> <div class="col-sm-6 col-md-4"> <div class="thumbnail"> - <img data-src="holder.js/300x300" alt="..."> + <img src="..." alt="..."> <div class="caption"> <h3>Thumbnail label</h3> <p>...</p> |