diff options
| author | Mark Otto <[email protected]> | 2014-02-08 16:01:56 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-02-08 16:01:56 -0800 |
| commit | e3cfd5821db94df0d6eb483d1f859da9dddd55a8 (patch) | |
| tree | 8af2dc5a1442b8974ecc7809ca516f2c67fde39b /less/carousel.less | |
| parent | 08ff305ed7ba689238d4524b0285d37d15aaf8fa (diff) | |
| parent | 842af44fccb338f165eb2ea64bdaffd999850881 (diff) | |
| download | bootstrap-e3cfd5821db94df0d6eb483d1f859da9dddd55a8.tar.xz bootstrap-e3cfd5821db94df0d6eb483d1f859da9dddd55a8.zip | |
Merge branch 'master' into pr/12462
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
Diffstat (limited to 'less/carousel.less')
| -rw-r--r-- | less/carousel.less | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/less/carousel.less b/less/carousel.less index e53365df4..2229d5553 100644 --- a/less/carousel.less +++ b/less/carousel.less @@ -21,7 +21,7 @@ // Account for jankitude on images > img, > a > img { - .img-responsive(); + &:extend(.img-responsive); line-height: 1; } } |