diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index b921274a02..35cfe82407 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -814,6 +814,37 @@ ol.unstyled { list-style: none; } +ul.inline, +ol.inline { + *zoom: 1; +} + +ul.inline:before, +ol.inline:before, +ul.inline:after, +ol.inline:after { + display: table; + line-height: 0; + content: ""; +} + +ul.inline:after, +ol.inline:after { + clear: both; +} + +ul.inline > li, +ol.inline > li { + float: left; + margin-right: 14px; + margin-left: 12px; +} + +ul.unstyled.inline > li, +ol.unstyled.inline > li { + padding-left: 0; +} + dl { margin-bottom: 20px; } diff --git a/docs/base-css.html b/docs/base-css.html index b8d3930eb9..8cc571210c 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -374,6 +374,21 @@ <ul class="unstyled"> <li>...</li> </ul> + + +

Inline

+

A list of floated left items. Can be combined with with .unstyled

+
+ +
+
+<ul class="unstyled inline">
+  <li>...</li>
+</ul>
 

Description

diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 3439ce1c31..38201f6834 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -311,6 +311,21 @@ <ul class="unstyled"> <li>...</li> </ul> + + +

{{_i}}Inline{{/i}}

+

{{_i}}A list of floated left items. Can be combined with with .unstyled{{/i}}

+
+ +
+
+<ul class="unstyled inline">
+  <li>...</li>
+</ul>
 

{{_i}}Description{{/i}}

diff --git a/less/type.less b/less/type.less index d0538fef24..d23ecc917f 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 {