mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-21 13:24:08 +03:00
Code 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
dist/css/bootstrap.css
Vendored
+3 -4
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,
dist/css/bootstrap.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
dist/css/bootstrap.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/dist/css/bootstrap.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/dist/css/bootstrap.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
less/carousel.less
+1 -1
View File
@@ -21,7 +21,7 @@
// Account for jankitude on images
> img,
> a > img {
.img-responsive();
&:extend(.img-responsive);
line-height: 1;
}
}