aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2015-01-20 21:12:31 -0800
committerMark Otto <[email protected]>2015-01-20 21:12:31 -0800
commit4a3ae1cf455c8ee82f8f222eededda97d5064d97 (patch)
tree05952d9e928c319269622cec1a5c0f91efbb14f3 /docs
parent74fbf61e304f7b4d8df9fee777eb4f10b4473dd5 (diff)
downloadbootstrap-4a3ae1cf455c8ee82f8f222eededda97d5064d97.tar.xz
bootstrap-4a3ae1cf455c8ee82f8f222eededda97d5064d97.zip
fix dupe images
Diffstat (limited to 'docs')
-rw-r--r--docs/components/images.md37
-rw-r--r--docs/content/images.md14
2 files changed, 8 insertions, 43 deletions
diff --git a/docs/components/images.md b/docs/components/images.md
deleted file mode 100644
index 713023a90..000000000
--- a/docs/components/images.md
+++ /dev/null
@@ -1,37 +0,0 @@
----
-layout: page
-title: Images
----
-
-## 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.
-
-<div class="bs-example">
- <img data-src="holder.js/1000x200" class="img-responsive" alt="Generic responsive image">
-</div>
-
-{% highlight html %}
-<img src="..." class="img-responsive" alt="Responsive image">
-{% 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>
-</div>
-
-## Image shapes
-
-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">
-</div>
-
-{% highlight html %}
-<img src="..." alt="..." class="img-rounded">
-<img src="..." alt="..." class="img-circle">
-<img src="..." alt="..." class="img-thumbnail">
-{% endhighlight %}
diff --git a/docs/content/images.md b/docs/content/images.md
index 713023a90..da5c6bf99 100644
--- a/docs/content/images.md
+++ b/docs/content/images.md
@@ -3,12 +3,14 @@ layout: page
title: Images
---
+Opt your images into responsive behavior (so they never become larger than their parent elements) and add lightweight styles to them—all via classes.
+
## 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.
<div class="bs-example">
- <img data-src="holder.js/1000x200" class="img-responsive" alt="Generic responsive image">
+<img data-src="holder.js/100%x250" class="img-responsive" alt="Generic responsive image">
</div>
{% highlight html %}
@@ -16,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
@@ -25,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 %}