diff options
| author | Mark Otto <[email protected]> | 2015-02-08 17:25:13 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-02-08 17:25:13 -0800 |
| commit | 2fad6e8dd2a1aad919f62de4d0ee099a06925812 (patch) | |
| tree | daa80a92ab0438b7eab2da460f3736516e4a8ef9 /docs | |
| parent | 7d4ce8104a29699972ac817c5d8ac769bd658dd1 (diff) | |
| parent | 6e782ed42d90a54e8d548cee66be3627b0a1d077 (diff) | |
| download | bootstrap-2fad6e8dd2a1aad919f62de4d0ee099a06925812.tar.xz bootstrap-2fad6e8dd2a1aad919f62de4d0ee099a06925812.zip | |
Merge pull request #15648 from Nikita240/master
Improve image layout in the carousel example.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/_includes/css/images.html | 6 | ||||
| -rw-r--r-- | docs/examples/carousel/index.html | 12 |
2 files changed, 11 insertions, 7 deletions
diff --git a/docs/_includes/css/images.html b/docs/_includes/css/images.html index 73516afba..9ce88698e 100644 --- a/docs/_includes/css/images.html +++ b/docs/_includes/css/images.html @@ -2,7 +2,11 @@ <h1 id="images" class="page-header">Images</h1> <h2 id="images-responsive">Responsive images</h2> - <p>Images in Bootstrap 3 can be made responsive-friendly via the addition of the <code>.img-responsive</code> class. This applies <code>max-width: 100%;</code> and <code>height: auto;</code> to the image so that it scales nicely to the parent element.</p> + <p>Images in Bootstrap 3 can be made responsive-friendly via the addition of the <code>.img-responsive</code> class. This applies <code>max-width: 100%;</code>, <code>height: auto;</code> and <code>display: block;</code> to the image so that it scales nicely to the parent element.</p> + <div class="bs-callout bs-callout-warning" id="callout-images-text-align"> + <h4>Center aligning images</h4> + <p>Since <code>.img-responsive</code> changes the display type to <code>display: block;</code>, you can no longer align the image using text-align or any of the <a href="#type-alignment">alignment classes</a>. Instead, use <a href="#helper-classes-center"><code>.center-block</code></a> on the image element itself.</p> + </div> <div class="bs-callout bs-callout-warning" id="callout-images-ie-svg"> <h4>SVG images and IE 8-10</h4> <p>In Internet Explorer 8-10, SVG images with <code>.img-responsive</code> are disproportionately sized. To fix this, add <code>width: 100% \9;</code> where necessary. Bootstrap doesn't apply this automatically as it causes complications to other image formats.</p> diff --git a/docs/examples/carousel/index.html b/docs/examples/carousel/index.html index 5ff931cf9..8aba875e0 100644 --- a/docs/examples/carousel/index.html +++ b/docs/examples/carousel/index.html @@ -161,20 +161,20 @@ <p class="lead">Donec ullamcorper nulla non metus auctor fringilla. Vestibulum id ligula porta felis euismod semper. Praesent commodo cursus magna, vel scelerisque nisl consectetur. Fusce dapibus, tellus ac cursus commodo.</p> </div> <div class="col-md-5"> - <img class="featurette-image img-responsive" data-src="holder.js/500x500/auto" alt="Generic placeholder image"> + <img class="featurette-image img-responsive center-block" data-src="holder.js/500x500/auto" alt="Generic placeholder image"> </div> </div> <hr class="featurette-divider"> <div class="row featurette"> - <div class="col-md-5"> - <img class="featurette-image img-responsive" data-src="holder.js/500x500/auto" alt="Generic placeholder image"> - </div> - <div class="col-md-7"> + <div class="col-md-7 col-md-push-5"> <h2 class="featurette-heading">Oh yeah, it's that good. <span class="text-muted">See for yourself.</span></h2> <p class="lead">Donec ullamcorper nulla non metus auctor fringilla. Vestibulum id ligula porta felis euismod semper. Praesent commodo cursus magna, vel scelerisque nisl consectetur. Fusce dapibus, tellus ac cursus commodo.</p> </div> + <div class="col-md-5 col-md-pull-7"> + <img class="featurette-image img-responsive center-block" data-src="holder.js/500x500/auto" alt="Generic placeholder image"> + </div> </div> <hr class="featurette-divider"> @@ -185,7 +185,7 @@ <p class="lead">Donec ullamcorper nulla non metus auctor fringilla. Vestibulum id ligula porta felis euismod semper. Praesent commodo cursus magna, vel scelerisque nisl consectetur. Fusce dapibus, tellus ac cursus commodo.</p> </div> <div class="col-md-5"> - <img class="featurette-image img-responsive" data-src="holder.js/500x500/auto" alt="Generic placeholder image"> + <img class="featurette-image img-responsive center-block" data-src="holder.js/500x500/auto" alt="Generic placeholder image"> </div> </div> |