diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index b921274a02dee91bf6ec9b3f8ee3474cab2d466e..35cfe82407f50e41cec5795f284b264f5f8ba068 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 b8d3930eb9863247870e321aa38b65e92bc4a6ba..8cc571210c33d869f0416c2036776c26124d57f8 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -374,6 +374,21 @@ <ul class="unstyled"> <li>...</li> </ul> +</pre> + + <h3>Inline</h3> + <p>A list of floated left items. Can be combined with with <code>.unstyled</code></p> + <div class="bs-docs-example"> + <ul class="unstyled inline"> + <li><span class="label label-important"> </span> Stop signal</li> + <li><span class="label label-warning"> </span> Prepare for signal</li> + <li><span class="label label-success"> </span> Go!</li> + </ul> + </div> +<pre class="prettyprint linenums"> +<ul class="unstyled inline"> + <li>...</li> +</ul> </pre> <h3>Description</h3> diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 3439ce1c31665b109e51303fa68257bd8b109dc3..38201f68349c80e39ff77298c02e6afa586cadef 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> +</pre> + + <h3>{{_i}}Inline{{/i}}</h3> + <p>{{_i}}A list of floated left items. Can be combined with with <code>.unstyled</code>{{/i}}</p> + <div class="bs-docs-example"> + <ul class="unstyled inline"> + <li><span class="label label-important"> </span> Stop signal</li> + <li><span class="label label-warning"> </span> Prepare for signal</li> + <li><span class="label label-success"> </span> Go!</li> + </ul> + </div> +<pre class="prettyprint linenums"> +<ul class="unstyled inline"> + <li>...</li> +</ul> </pre> <h3>{{_i}}Description{{/i}}</h3> diff --git a/less/type.less b/less/type.less index d0538fef24b23ffdf70e146725afe55c51a5c5fe..d23ecc917f589220a53e92a37fdc0f47a558eac5 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 {