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 | |
| 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')
| -rw-r--r-- | docs/assets/css/bootstrap.css | 3 | ||||
| -rw-r--r-- | docs/base-css.html | 3 | ||||
| -rw-r--r-- | docs/templates/pages/base-css.mustache | 3 |
3 files changed, 4 insertions, 5 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; } diff --git a/docs/base-css.html b/docs/base-css.html index 0914c2c11..8b54c0f2d 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -854,8 +854,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped <code><th></code> </td> <td> - Special table cell for column (or row, depending on scope and placement) labels<br> - Must be used within a <code><thead></code> + Special table cell for column (or row, depending on scope and placement) labels </td> </tr> <tr> diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index a544d319d..9a051d4be 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -794,8 +794,7 @@ <code><th></code> </td> <td> - {{_i}}Special table cell for column (or row, depending on scope and placement) labels{{/i}}<br> - {{_i}}Must be used within a <code><thead></code>{{/i}} + {{_i}}Special table cell for column (or row, depending on scope and placement) labels{{/i}} </td> </tr> <tr> |