diff options
| author | Mark Otto <[email protected]> | 2013-07-09 12:43:15 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-07-09 12:43:15 -0700 |
| commit | 606d6e81d445ff58295b934d52ac1e31ae2052a6 (patch) | |
| tree | c45973e69fddea20665f9cd4aaff2e1161e294dd | |
| parent | b2fa51521f09a4c0f52b27f5b0d671e2d6810434 (diff) | |
| parent | 0d5c3c2ecf35d9bcbe4bd1ad67f3144f5341eb20 (diff) | |
| download | bootstrap-606d6e81d445ff58295b934d52ac1e31ae2052a6.tar.xz bootstrap-606d6e81d445ff58295b934d52ac1e31ae2052a6.zip | |
Merge pull request #8426 from liuyl/simplify-type
simplify type.less
| -rw-r--r-- | docs/assets/css/bootstrap.css | 4 | ||||
| -rw-r--r-- | less/type.less | 10 |
2 files changed, 6 insertions, 8 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index d3d334a97..168d6c389 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -524,9 +524,9 @@ ol { } ul ul, +ol ul, ul ol, -ol ol, -ol ul { +ol ol { margin-bottom: 0; } diff --git a/less/type.less b/less/type.less index 2f1f42ee3..a9a7e189f 100644 --- a/less/type.less +++ b/less/type.less @@ -107,12 +107,10 @@ ul, ol { margin-top: 0; margin-bottom: (@line-height-computed / 2); -} -ul ul, -ul ol, -ol ol, -ol ul { - margin-bottom: 0; + ul, + ol{ + margin-bottom: 0; + } } // List options |