aboutsummaryrefslogtreecommitdiff
path: root/less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-11-04 12:37:44 -0800
committerMark Otto <[email protected]>2012-11-04 12:37:44 -0800
commit269be76f4a5d8d6098bbd068b506e6bf72f23e00 (patch)
tree6e2f2a4d6305ee487fb0208112f3de0386c9506e /less
parent83a3789b5e8ccedc16db3a284c764067e6b25c25 (diff)
parent28da31218fc5dc39ece625705c37b8c86d494801 (diff)
downloadbootstrap-269be76f4a5d8d6098bbd068b506e6bf72f23e00.tar.xz
bootstrap-269be76f4a5d8d6098bbd068b506e6bf72f23e00.zip
Merge branch '2.2.2-wip' into exploratory
Diffstat (limited to 'less')
-rw-r--r--less/type.less13
1 files changed, 13 insertions, 0 deletions
diff --git a/less/type.less b/less/type.less
index 0aa8c802c..a95d4b983 100644
--- a/less/type.less
+++ b/less/type.less
@@ -105,12 +105,25 @@ ol ul {
li {
line-height: @baseLineHeight;
}
+
+// Remove default list styles
ul.unstyled,
ol.unstyled {
margin-left: 0;
list-style: none;
}
+// Single-line list items
+ul.inline,
+ol.inline {
+ list-style: none;
+ & > li {
+ display: inline-block;
+ padding-left: 5px;
+ padding-right: 5px;
+ }
+}
+
// Description Lists
dl {
margin-bottom: @baseLineHeight;