diff options
| author | Mark Otto <[email protected]> | 2013-02-04 11:12:09 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-02-04 11:12:09 -0800 |
| commit | 0a3e3a50fe78dab1ce6e2359a78b6aa5246e3c50 (patch) | |
| tree | d5a7aaaa7cfab8ff436fc71fe6ff44ad3fb210f4 /docs/assets/css/bootstrap.css | |
| parent | 1f6a988190d61128279250a444b9f028c35088c1 (diff) | |
| parent | db8a78fae6aed5ecced5f20df65cea352af32bb9 (diff) | |
| download | bootstrap-0a3e3a50fe78dab1ce6e2359a78b6aa5246e3c50.tar.xz bootstrap-0a3e3a50fe78dab1ce6e2359a78b6aa5246e3c50.zip | |
Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
docs/assets/css/bootstrap.css
less/type.less
Diffstat (limited to 'docs/assets/css/bootstrap.css')
| -rw-r--r-- | docs/assets/css/bootstrap.css | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index f1c32d97d..4abbee2cc 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4392,7 +4392,8 @@ a.counter: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; } |