mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-29 08:10:47 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into thumbnail-extend

Browse Source 
Conflicts:
	dist/css/bootstrap.css
This commit is contained in:
Mark Otto
2014-02-06 18:52:03 -08:00
parent fda8d91c86 596495c89b
commit ace0abfdb6
6 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
dist/css/bootstrap.css vendored
View File

@@ -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,