aboutsummaryrefslogtreecommitdiff
path: root/less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-11-04 12:27:30 -0800
committerMark Otto <[email protected]>2012-11-04 12:27:30 -0800
commit68f26d959f97c761206bf5f6f808e6199d620ca2 (patch)
tree506883677bb42f6fbda60540ec82a9d7f68b8fdb /less
parente4866c4b3c50c1d1bef5c639c13a2210416b0157 (diff)
parent233e050adfc171685fd2c2f6ad760a8556aa0eb2 (diff)
downloadbootstrap-68f26d959f97c761206bf5f6f808e6199d620ca2.tar.xz
bootstrap-68f26d959f97c761206bf5f6f808e6199d620ca2.zip
Merge branch '2.1.2-list-inline' of https://github.com/andriijas/bootstrap into andriijas-2.1.2-list-inline
Diffstat (limited to 'less')
-rw-r--r--less/type.less15
1 files changed, 15 insertions, 0 deletions
diff --git a/less/type.less b/less/type.less
index d0538fef2..d23ecc917 100644
--- a/less/type.less
+++ b/less/type.less
@@ -111,6 +111,21 @@ ol.unstyled {
margin-left: 0;
list-style: none;
}
+ul.inline,
+ol.inline {
+ .clearfix();
+}
+ul.inline > li,
+ol.inline > li {
+ float: left;
+ margin-right: 14px;
+ margin-left: 12px;
+}
+// Reset left padding for unstyled
+ul.unstyled.inline > li,
+ol.unstyled.inline > li {
+ padding-left: 0;
+}
// Description Lists
dl {