diff --git a/docs/assets/scss/docs.scss b/docs/assets/scss/docs.scss index 950613d041..209be81871 100644 --- a/docs/assets/scss/docs.scss +++ b/docs/assets/scss/docs.scss @@ -1087,11 +1087,16 @@ body { } // Images -.bs-example > .img-circle, -.bs-example > .img-rounded, -.bs-example > .img-thumbnail { - margin: .25rem; +.bs-example > img { + + img { + margin-left: .5rem; + } } +// .bs-example > .img-circle, +// .bs-example > .img-rounded, +// .bs-example > .img-thumbnail { +// margin: .25rem; +// } // Tables // .bs-example > .table-responsive > .table { @@ -1252,7 +1257,7 @@ body { // Helpers .bs-example > { - .center-block { + .center-block:not(img) { max-width: 200px; padding: .5rem; background-color: #eee; diff --git a/docs/content/images.md b/docs/content/images.md index 6b691fb0e3..e00be80980 100644 --- a/docs/content/images.md +++ b/docs/content/images.md @@ -7,10 +7,10 @@ Opt your images into responsive behavior (so they never become larger than their ## Responsive images -Images in Bootstrap 3 can be made responsive-friendly via the addition of the `.img-responsive` class. This applies `max-width: 100%;` and `height: auto;` to the image so that it scales nicely to the parent element. +Images in Bootstrap are responsive by default. `max-width: 100%;` and `height: auto;` are applied to the image so that it scales with the parent element.
-Generic responsive image + Generic responsive image
{% highlight html %} @@ -18,8 +18,8 @@ Images in Bootstrap 3 can be made responsive-friendly via the addition of the `. {% endhighlight %}
-

SVG images and IE 9-10

-

In Internet Explorer 9-10, SVG images with .img-responsive are disproportionately sized. To fix this, add width: 100% \9; where necessary. Bootstrap doesn't apply this automatically as it causes complications to other image formats.

+

SVG images and IE 9-10

+

In Internet Explorer 9-10, SVG images with .img-responsive are disproportionately sized. To fix this, add width: 100% \9; where necessary. Bootstrap doesn't apply this automatically as it causes complications to other image formats.

## Image shapes @@ -27,9 +27,9 @@ Images in Bootstrap 3 can be made responsive-friendly via the addition of the `. Add classes to an `` element to easily style images in any project.
-A generic square placeholder image with rounded corners -A generic square placeholder image where only the portion within the circle circumscribed about said square is visible -A generic square placeholder image with a white border around it, making it resemble a photograph taken with an old instant camera + A generic square placeholder image with rounded corners + A generic square placeholder image where only the portion within the circle circumscribed about said square is visible + A generic square placeholder image with a white border around it, making it resemble a photograph taken with an old instant camera
{% highlight html %} @@ -40,4 +40,34 @@ Add classes to an `` element to easily style images in any project. ## Aligning images -To center images with `.img-responsive`, use `.center-block`. For all other images, use `.text-center`. [See the helper classes section](/css/helpers) for more details about `.center-block` usage. +Align images with the [helper float classes](/components/helpers) or [text alignment classes](/components/helpers). A simple centering class can also be used for `block` level images. + +
+ A generic square placeholder image with rounded corners + A generic square placeholder image with rounded corners +
+ +{% highlight html %} +... +... +{% endhighlight %} + +
+ A generic square placeholder image with rounded corners +
+ +{% highlight html %} +... +{% endhighlight %} + +
+
+ A generic square placeholder image with rounded corners +
+
+ +{% highlight html %} +
+ ... +
+{% endhighlight %}