update image docs and styles

diff --git a/docs/assets/scss/docs.scss b/docs/assets/scss/docs.scss
index 950613d0418ff7143496b50d433c179cf9147bde..209be81871e6dace712c6b9598f6df85d337eca9 100644 (file)
--- 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 6b691fb0e32551328858eb824fe6aab56d8eb1e6..e00be809801b15d5c06b805c02b9b64fd89a5977 100644 (file)
--- 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.
 
 <div class="bs-example">
-<img data-src="holder.js/100%x250" class="img-responsive" alt="Generic responsive image">
+  <img data-src="holder.js/100%x250" class="img-responsive" alt="Generic responsive image">
 </div>
 
 {% highlight html %}
@@ -18,8 +18,8 @@ Images in Bootstrap 3 can be made responsive-friendly via the addition of the `.
 {% endhighlight %}
 
 <div class="bs-callout bs-callout-warning">
-<h4>SVG images and IE 9-10</h4>
-<p>In Internet Explorer 9-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>
+  <h4>SVG images and IE 9-10</h4>
+  <p>In Internet Explorer 9-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>
 </div>
 
 ## Image shapes
@@ -27,9 +27,9 @@ Images in Bootstrap 3 can be made responsive-friendly via the addition of the `.
 Add classes to an `<img>` element to easily style images in any project.
 
 <div class="bs-example bs-example-images">
-<img data-src="holder.js/200x200" class="img-rounded" alt="A generic square placeholder image with rounded corners">
-<img data-src="holder.js/200x200" 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/200x200" 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">
+  <img data-src="holder.js/200x200" class="img-rounded" alt="A generic square placeholder image with rounded corners">
+  <img data-src="holder.js/200x200" 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/200x200" 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">
 </div>
 
 {% highlight html %}
@@ -40,4 +40,34 @@ Add classes to an `<img>` 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.
+
+<div class="bs-example bs-example-images">
+  <img data-src="holder.js/200x200" class="img-rounded pull-left" alt="A generic square placeholder image with rounded corners">
+  <img data-src="holder.js/200x200" class="img-rounded pull-right" alt="A generic square placeholder image with rounded corners">
+</div>
+
+{% highlight html %}
+<img src="..." class="img-rounded pull-left" alt="...">
+<img src="..." class="img-rounded pull-right" alt="...">
+{% endhighlight %}
+
+<div class="bs-example bs-example-images">
+  <img data-src="holder.js/200x200" class="img-rounded center-block" style="display: block;" alt="A generic square placeholder image with rounded corners">
+</div>
+
+{% highlight html %}
+<img src="..." class="img-rounded center-block" style="display: block;" alt="...">
+{% endhighlight %}
+
+<div class="bs-example bs-example-images">
+  <div class="text-center">
+    <img data-src="holder.js/200x200" class="img-rounded" alt="A generic square placeholder image with rounded corners">
+  </div>
+</div>
+
+{% highlight html %}
+<div class="text-center">
+  <img src="..." class="img-rounded" alt="...">
+</div>
+{% endhighlight %}