aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorliuyl <[email protected]>2013-07-09 09:22:36 +0800
committerliuyl <[email protected]>2013-07-09 09:22:36 +0800
commit0d5c3c2ecf35d9bcbe4bd1ad67f3144f5341eb20 (patch)
tree806ef096556c226485dc27244b766fb5f07beb24
parent1045226544c6f9396227974b5543df1caf74f8cf (diff)
downloadbootstrap-0d5c3c2ecf35d9bcbe4bd1ad67f3144f5341eb20.tar.xz
bootstrap-0d5c3c2ecf35d9bcbe4bd1ad67f3144f5341eb20.zip
simplify type.less
-rw-r--r--docs/assets/css/bootstrap.css4
-rw-r--r--less/type.less10
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