diff options
| author | Mark Otto <[email protected]> | 2014-02-06 18:52:03 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-02-06 18:52:03 -0800 |
| commit | ace0abfdb6cc6d603a98afce85718345c32f9157 (patch) | |
| tree | b8b2bdf197341edaa9f632cb192fae7d5c1b9811 /dist/css/bootstrap.css | |
| parent | fda8d91c86a29cceab93285d920db56f7f26aaf8 (diff) | |
| parent | 596495c89bd6019c4a2949771b48234daecfd4cb (diff) | |
| download | bootstrap-ace0abfdb6cc6d603a98afce85718345c32f9157.tar.xz bootstrap-ace0abfdb6cc6d603a98afce85718345c32f9157.zip | |
Merge branch 'master' into thumbnail-extend
Conflicts:
dist/css/bootstrap.css
Diffstat (limited to 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 64762c0b3..23202f62b 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -309,7 +309,9 @@ img { } .img-responsive, .thumbnail > img, -.thumbnail a > img { +.thumbnail a > img, +.carousel-inner > .item > img, +.carousel-inner > .item > a > img { display: block; max-width: 100%; height: auto; @@ -5420,9 +5422,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, |