diff options
| author | Mark Otto <[email protected]> | 2013-06-28 00:09:10 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-06-28 00:09:10 -0700 |
| commit | 09cdee2f03aaad5c5a767fbec2e3896ad3d1f980 (patch) | |
| tree | 74724b9edea8a32aa53183b27f485034bcb9805d | |
| parent | 1a09eada35259de198ffad56a460c6ffafe890a4 (diff) | |
| download | bootstrap-09cdee2f03aaad5c5a767fbec2e3896ad3d1f980.tar.xz bootstrap-09cdee2f03aaad5c5a767fbec2e3896ad3d1f980.zip | |
Overall responsive `img` styles
`img`s are no longer responsive by default. Instead, use
`.img-responsive` as a class or mixin. Existing `.thumbnail > img` and
`.img-thumbnail` classes now make use of this as a mixin as well.
| -rw-r--r-- | docs/assets/css/bootstrap.css | 15 | ||||
| -rw-r--r-- | less/scaffolding.less | 10 | ||||
| -rw-r--r-- | less/thumbnails.less | 6 |
3 files changed, 22 insertions, 9 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index bffe638ee..9f037b333 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -325,9 +325,13 @@ a:focus { } img { + vertical-align: middle; +} + +.img-responsive { + display: block; height: auto; max-width: 100%; - vertical-align: middle; } .img-rounded { @@ -3958,6 +3962,13 @@ button.close { transition: all 0.2s ease-in-out; } +.thumbnail > img, +.img-thumbnail { + display: block; + height: auto; + max-width: 100%; +} + .thumbnail { display: block; } @@ -3972,8 +3983,6 @@ a.thumbnail:focus { } .thumbnail > img { - display: block; - max-width: 100%; margin-right: auto; margin-left: auto; } diff --git a/less/scaffolding.less b/less/scaffolding.less index e74a4db1c..79447c3f5 100644 --- a/less/scaffolding.less +++ b/less/scaffolding.less @@ -59,12 +59,14 @@ a:focus { // ------------------------- img { - // Responsive images (ensure images don't scale beyond their parents) + vertical-align: middle; +} + +// Responsive images (ensure images don't scale beyond their parents) +.img-responsive { + display: block; max-width: 100%; // Part 1: Set a maximum relative to the parent height: auto; // Part 2: Scale the height according to the width, otherwise you get stretching - - // Match vertical alignment with other comment elements - vertical-align: middle; } // Rounded corners diff --git a/less/thumbnails.less b/less/thumbnails.less index f31d78617..b15b8d25a 100644 --- a/less/thumbnails.less +++ b/less/thumbnails.less @@ -17,6 +17,10 @@ border-radius: @thumbnail-border-radius; .transition(all .2s ease-in-out); } +.thumbnail > img, +.img-thumbnail { + .img-responsive(); +} .thumbnail { display: block; } @@ -32,8 +36,6 @@ a.thumbnail:focus { // Images and captions .thumbnail > img { - display: block; - max-width: 100%; margin-left: auto; margin-right: auto; } |
