From: liuyl <lyl890808@gmail.com>
Date: Tue, 9 Jul 2013 01:22:36 +0000 (+0800)
Subject: simplify type.less
X-Git-Tag: v3.0.0-rc1~171^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F8426%2Fhead;p=thirdparty%2Fbootstrap.git

simplify type.less
---

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index d3d334a978..168d6c3894 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 2f1f42ee3a..a9a7e189f9 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