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 /less | |
| 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 '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; } } |