diff options
| author | Mark Otto <[email protected]> | 2012-11-30 00:13:30 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-11-30 00:13:30 -0800 |
| commit | fca35c0dba060da14ccb29fc56dc37aa1de533c4 (patch) | |
| tree | 04cc972e705bedb2910247bdcfb0c8ede3cee09a /docs/examples | |
| parent | 7e56e2265d67ae81ad8be52af4d56f189929207a (diff) | |
| parent | bca3ff4ed6f42701ceae1405f518c35ec8c623be (diff) | |
| download | bootstrap-fca35c0dba060da14ccb29fc56dc37aa1de533c4.tar.xz bootstrap-fca35c0dba060da14ccb29fc56dc37aa1de533c4.zip | |
Merge branch '2.2.2-wip' into exploratory
Conflicts:
docs/assets/css/bootstrap.css
docs/components.html
docs/templates/pages/components.mustache
less/alerts.less
less/button-groups.less
less/buttons.less
less/tests/css-tests.html
Diffstat (limited to 'docs/examples')
| -rw-r--r-- | docs/examples/carousel.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/examples/carousel.html b/docs/examples/carousel.html index 92134c506..42b95dd7e 100644 --- a/docs/examples/carousel.html +++ b/docs/examples/carousel.html @@ -353,19 +353,19 @@ <!-- Three columns of text below the carousel --> <div class="row"> <div class="span4"> - <img class="img-circle" src="http://placehold.it/140x140"> + <img class="img-circle" data-src="holder.js/140x140"> <h2>Heading</h2> <p>Donec sed odio dui. Etiam porta sem malesuada magna mollis euismod. Nullam id dolor id nibh ultricies vehicula ut id elit. Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.</p> <p><a class="btn" href="#">View details »</a></p> </div><!-- /.span4 --> <div class="span4"> - <img class="img-circle" src="http://placehold.it/140x140"> + <img class="img-circle" data-src="holder.js/140x140"> <h2>Heading</h2> <p>Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p> <p><a class="btn" href="#">View details »</a></p> </div><!-- /.span4 --> <div class="span4"> - <img class="img-circle" src="http://placehold.it/140x140"> + <img class="img-circle" data-src="holder.js/140x140"> <h2>Heading</h2> <p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p> <p><a class="btn" href="#">View details »</a></p> |