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/css/images.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/css/images.html')
| -rw-r--r-- | docs/_includes/css/images.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/_includes/css/images.html b/docs/_includes/css/images.html index 711608912..73516afba 100644 --- a/docs/_includes/css/images.html +++ b/docs/_includes/css/images.html @@ -17,7 +17,7 @@ <h4>Cross-browser compatibility</h4> <p>Keep in mind that Internet Explorer 8 lacks support for rounded corners.</p> </div> - <div class="bs-example bs-example-images"> + <div class="bs-example bs-example-images" data-example-id="image-shapes"> <img data-src="holder.js/140x140" class="img-rounded" alt="A generic square placeholder image with rounded corners"> <img data-src="holder.js/140x140" class="img-circle" alt="A generic square placeholder image where only the portion within the circle circumscribed about said square is visible"> <img data-src="holder.js/140x140" class="img-thumbnail" alt="A generic square placeholder image with a white border around it, making it resemble a photograph taken with an old instant camera"> |
