Merge pull request #8426 from liuyl/simplify-type

simplify type.less

Merge pull request #8426 from liuyl/simplify-type
simplify type.less
606d6e81 · Mark Otto · b2fa5152 · 0d5c3c2e · 606d6e81 · 606d6e81
Commit 606d6e81 authored 11 years ago by Mark Otto
Hide whitespace changes
Inline Side-by-side

Showing

with 6 additions and 8 deletions
+6 -8
--- 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 ol {
-ol ul {
  margin-bottom: 0;
 }

--- 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{
-ul ol,
+    margin-bottom: 0;
-ol ol,
+  }
-ol ul {
-  margin-bottom: 0;
 }
 // List options