aboutsummaryrefslogtreecommitdiff
path: root/dist/css/bootstrap.css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2014-02-06 18:49:21 -0800
committerMark Otto <[email protected]>2014-02-06 18:49:21 -0800
commit596495c89bd6019c4a2949771b48234daecfd4cb (patch)
tree6f03771a8b7a2e0cf7220a5b1ea0e4b52726e018 /dist/css/bootstrap.css
parent651b289e269f8806e4e30854b99410dd7c9b3c38 (diff)
parent7c1511502ed96549c1674d1cda102551afe6dd30 (diff)
downloadbootstrap-596495c89bd6019c4a2949771b48234daecfd4cb.tar.xz
bootstrap-596495c89bd6019c4a2949771b48234daecfd4cb.zip
Merge pull request #12621 from twbs/carousel-img-responsive-extend
use :extend(.img-responsive) in Carousel's Less
Diffstat (limited to 'dist/css/bootstrap.css')
-rw-r--r--dist/css/bootstrap.css7
1 files changed, 3 insertions, 4 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 329b4fa2e..ab259fa6a 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -307,7 +307,9 @@ figure {
img {
vertical-align: middle;
}
-.img-responsive {
+.img-responsive,
+.carousel-inner > .item > img,
+.carousel-inner > .item > a > img {
display: block;
max-width: 100%;
height: auto;
@@ -5421,9 +5423,6 @@ button.close {
}
.carousel-inner > .item > img,
.carousel-inner > .item > a > img {
- display: block;
- max-width: 100%;
- height: auto;
line-height: 1;
}
.carousel-inner > .active,