0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-20 12:52:19 +01:00

fixes #8345: use inline-block on .img-responsive

This commit is contained in:
Mark Otto 2013-07-01 19:42:26 -07:00
parent 9da90adb4c
commit 08b3515fd7
5 changed files with 11 additions and 18 deletions

View File

@ -329,7 +329,7 @@ img {
} }
.img-responsive { .img-responsive {
display: block; display: inline-block;
height: auto; height: auto;
max-width: 100%; max-width: 100%;
} }
@ -3957,19 +3957,15 @@ button.close {
transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out;
} }
.thumbnail > img,
.img-thumbnail {
display: block;
height: auto;
max-width: 100%;
}
.thumbnail { .thumbnail {
display: block; display: block;
} }
.thumbnail > img,
.img-thumbnail { .img-thumbnail {
display: inline-block; display: inline-block;
height: auto;
max-width: 100%;
} }
a.thumbnail:hover, a.thumbnail:hover,
@ -4308,7 +4304,7 @@ a.list-group-item.active > .badge,
.carousel-inner > .item > img, .carousel-inner > .item > img,
.carousel-inner > .item > a > img { .carousel-inner > .item > a > img {
display: block; display: inline-block;
height: auto; height: auto;
max-width: 100%; max-width: 100%;
line-height: 1; line-height: 1;

View File

@ -602,6 +602,7 @@ body {
} }
.footer-links { .footer-links {
margin: 10px 0; margin: 10px 0;
padding-left: 0;
} }
.footer-links li { .footer-links li {
display: inline; display: inline;
@ -617,7 +618,8 @@ body {
} }
.bs-social-buttons { .bs-social-buttons {
display: inline-block; display: inline-block;
margin: 0; margin-bottom: 0;
padding-left: 0;
list-style: none; list-style: none;
} }
.bs-social-buttons li { .bs-social-buttons li {

View File

@ -411,8 +411,6 @@
td& { display: table-cell !important; } td& { display: table-cell !important; }
} }
// Grid System // Grid System
// ----------- // -----------

View File

@ -64,7 +64,7 @@ img {
// Responsive images (ensure images don't scale beyond their parents) // Responsive images (ensure images don't scale beyond their parents)
.img-responsive { .img-responsive {
display: block; display: inline-block;
max-width: 100%; // Part 1: Set a maximum relative to the parent 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 height: auto; // Part 2: Scale the height according to the width, otherwise you get stretching
} }

View File

@ -17,15 +17,12 @@
border-radius: @thumbnail-border-radius; border-radius: @thumbnail-border-radius;
.transition(all .2s ease-in-out); .transition(all .2s ease-in-out);
} }
.thumbnail > img,
.img-thumbnail {
.img-responsive();
}
.thumbnail { .thumbnail {
display: block; display: block;
} }
.thumbnail > img,
.img-thumbnail { .img-thumbnail {
display: inline-block; .img-responsive();
} }
// Add a hover state for linked versions only // Add a hover state for linked versions only