diff options
| author | Mark Otto <[email protected]> | 2012-11-04 12:27:30 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-11-04 12:27:30 -0800 |
| commit | 68f26d959f97c761206bf5f6f808e6199d620ca2 (patch) | |
| tree | 506883677bb42f6fbda60540ec82a9d7f68b8fdb | |
| parent | e4866c4b3c50c1d1bef5c639c13a2210416b0157 (diff) | |
| parent | 233e050adfc171685fd2c2f6ad760a8556aa0eb2 (diff) | |
| download | bootstrap-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
| -rw-r--r-- | docs/assets/css/bootstrap.css | 31 | ||||
| -rw-r--r-- | docs/base-css.html | 15 | ||||
| -rw-r--r-- | docs/templates/pages/base-css.mustache | 15 | ||||
| -rw-r--r-- | less/type.less | 15 |
4 files changed, 76 insertions, 0 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index b921274a0..35cfe8240 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 b8d3930eb..8cc571210 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -376,6 +376,21 @@ </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> <p>A list of terms with their associated descriptions.</p> <div class="bs-docs-example"> diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 3439ce1c3..38201f683 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -313,6 +313,21 @@ </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> <p>{{_i}}A list of terms with their associated descriptions.{{/i}}</p> <div class="bs-docs-example"> 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 { |