diff options
| author | mrmrs <[email protected]> | 2014-03-09 23:28:08 -0700 |
|---|---|---|
| committer | mrmrs <[email protected]> | 2014-03-09 23:28:08 -0700 |
| commit | 2f380a968353e1adc4a331e0c5892a07e1241ae7 (patch) | |
| tree | 7a723d64d73817f53e05bab7f4109edb2161d60f /docs/examples | |
| parent | 348b7de7f7c6c1fb72b0e47124d814c639475f5d (diff) | |
| parent | e727973d8c8cec151f13bd65d24a664918efd28a (diff) | |
| download | bootstrap-2f380a968353e1adc4a331e0c5892a07e1241ae7.tar.xz bootstrap-2f380a968353e1adc4a331e0c5892a07e1241ae7.zip | |
Merge branch 'master' into modular-the-mixins
* master:
Replace some images on the Carousel example with some base64 encoded 1x1 gifs
ugh grunt
moar grunt
mo copy
http://www.youtube.com/watch?v=AJWtLf4-WWs
grunt
Copy change
fix grammar in comment in forms.less
Fixes #12759
Fixes #12738
replace .visible-{size} with .visible-{size}-{display} ; fixes #8869
Conflicts:
dist/css/bootstrap-theme.css.map
dist/css/bootstrap.css.map
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap.css.map
less/mixins.less
Diffstat (limited to 'docs/examples')
| -rw-r--r-- | docs/examples/carousel/index.html | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/docs/examples/carousel/index.html b/docs/examples/carousel/index.html index df92c1e01..82883c844 100644 --- a/docs/examples/carousel/index.html +++ b/docs/examples/carousel/index.html @@ -79,7 +79,7 @@ </ol> <div class="carousel-inner"> <div class="item active"> - <img data-src="holder.js/900x500/auto/#777:#7a7a7a/text:First slide" alt="First slide"> + <img src="data:image/gif;base64,R0lGODlhAQABAIAAAHd3dwAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==" alt="First slide"> <div class="container"> <div class="carousel-caption"> <h1>Example headline.</h1> @@ -89,7 +89,7 @@ </div> </div> <div class="item"> - <img data-src="holder.js/900x500/auto/#666:#6a6a6a/text:Second slide" alt="Second slide"> + <img src="data:image/gif;base64,R0lGODlhAQABAIAAAGZmZgAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==" alt="Second slide"> <div class="container"> <div class="carousel-caption"> <h1>Another example headline.</h1> @@ -99,7 +99,7 @@ </div> </div> <div class="item"> - <img data-src="holder.js/900x500/auto/#555:#5a5a5a/text:Third slide" alt="Third slide"> + <img src="data:image/gif;base64,R0lGODlhAQABAIAAAFVVVQAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==" alt="Third slide"> <div class="container"> <div class="carousel-caption"> <h1>One more for good measure.</h1> @@ -124,19 +124,19 @@ <!-- Three columns of text below the carousel --> <div class="row"> <div class="col-lg-4"> - <img class="img-circle" data-src="holder.js/140x140" alt="Generic placeholder image"> + <img class="img-circle" src="data:image/gif;base64,R0lGODlhAQABAIAAAHd3dwAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==" alt="Generic placeholder image" style="width: 140px; height: 140px;"> <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.</p> <p><a class="btn btn-default" href="#" role="button">View details »</a></p> </div><!-- /.col-lg-4 --> <div class="col-lg-4"> - <img class="img-circle" data-src="holder.js/140x140" alt="Generic placeholder image"> + <img class="img-circle" src="data:image/gif;base64,R0lGODlhAQABAIAAAHd3dwAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==" alt="Generic placeholder image" style="width: 140px; height: 140px;"> <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.</p> <p><a class="btn btn-default" href="#" role="button">View details »</a></p> </div><!-- /.col-lg-4 --> <div class="col-lg-4"> - <img class="img-circle" data-src="holder.js/140x140" alt="Generic placeholder image"> + <img class="img-circle" src="data:image/gif;base64,R0lGODlhAQABAIAAAHd3dwAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==" alt="Generic placeholder image" style="width: 140px; height: 140px;"> <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 btn-default" href="#" role="button">View details »</a></p> |