mirror of
https://github.com/twbs/bootstrap.git
synced 2025-02-19 16:54:24 +01:00
Merge branch '2.1.2-list-inline' of https://github.com/andriijas/bootstrap into andriijas-2.1.2-list-inline
This commit is contained in:
commit
68f26d959f
31
docs/assets/css/bootstrap.css
vendored
31
docs/assets/css/bootstrap.css
vendored
@ -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;
|
||||
}
|
||||
|
@ -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>
|
||||
|
15
docs/templates/pages/base-css.mustache
vendored
15
docs/templates/pages/base-css.mustache
vendored
@ -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>
|
||||
|
@ -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 {
|
||||
|
Loading…
x
Reference in New Issue
Block a user