aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-06-17 13:35:50 -0700
committerMark Otto <[email protected]>2013-06-17 14:21:16 -0700
commit731cbb302e3df670c15c46d277c39d0746d73a3d (patch)
treead430da2bc2abb2ce38c217461ee424fc21a95b6
parent5f3f73c6206acfb7d893aa3a8d26642723b8837d (diff)
downloadbootstrap-731cbb302e3df670c15c46d277c39d0746d73a3d.tar.xz
bootstrap-731cbb302e3df670c15c46d277c39d0746d73a3d.zip
Better base `ul` and `ol` styles
Turns out we were nixing the default browser spacing for bullets and numbers, so this reverts that and instead just twerks the top/bottom `margin`.
-rw-r--r--docs/assets/css/bootstrap.css4
-rw-r--r--less/type.less4
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 9d19d3c81..6266bb1d7 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -504,8 +504,8 @@ h4 small,
ul,
ol {
- padding: 0;
- margin: 0 0 10px 25px;
+ margin-top: 0;
+ margin-bottom: 10px;
}
ul ul,
diff --git a/less/type.less b/less/type.less
index a95e5bff7..d62e2a2ac 100644
--- a/less/type.less
+++ b/less/type.less
@@ -106,8 +106,8 @@ h4 small, .h4 small { font-size: @font-size-base; }
// Unordered and Ordered lists
ul,
ol {
- padding: 0;
- margin: 0 0 (@line-height-computed / 2) 25px;
+ margin-top: 0;
+ margin-bottom: (@line-height-computed / 2);
}
ul ul,
ul ol,