mirror of
https://github.com/twbs/bootstrap.git
synced 2024-12-01 13:24:25 +01:00
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
This commit is contained in:
commit
d6048031ed
3
docs/assets/css/bootstrap.css
vendored
3
docs/assets/css/bootstrap.css
vendored
@ -5919,7 +5919,8 @@ a.badge:hover {
|
||||
transition: 0.6s ease-in-out left;
|
||||
}
|
||||
|
||||
.carousel-inner > .item > img {
|
||||
.carousel-inner > .item > img,
|
||||
.carousel-inner > .item > a > img {
|
||||
display: block;
|
||||
line-height: 1;
|
||||
}
|
||||
|
@ -21,12 +21,13 @@
|
||||
display: none;
|
||||
position: relative;
|
||||
.transition(.6s ease-in-out left);
|
||||
}
|
||||
|
||||
// Account for jankitude on images
|
||||
> .item > img {
|
||||
display: block;
|
||||
line-height: 1;
|
||||
// Account for jankitude on images
|
||||
> img,
|
||||
> a > img {
|
||||
display: block;
|
||||
line-height: 1;
|
||||
}
|
||||
}
|
||||
|
||||
> .active,
|
||||
|
Loading…
Reference in New Issue
Block a user