Commit 233e050a authored by Andreas Cederström's avatar Andreas Cederström

Adding .inline for ul and ol

parent c33169a6
This diff is collapsed.
...@@ -374,6 +374,21 @@ ...@@ -374,6 +374,21 @@
<ul class="unstyled"> <ul class="unstyled">
<li>...</li> <li>...</li>
</ul> </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">&nbsp;&nbsp;</span> Stop signal</li>
<li><span class="label label-warning">&nbsp;&nbsp;</span> Prepare for signal</li>
<li><span class="label label-success">&nbsp;&nbsp;</span> Go!</li>
</ul>
</div>
<pre class="prettyprint linenums">
&lt;ul class="unstyled inline"&gt;
&lt;li&gt;...&lt;/li&gt;
&lt;/ul&gt;
</pre> </pre>
<h3>Description</h3> <h3>Description</h3>
......
...@@ -311,6 +311,21 @@ ...@@ -311,6 +311,21 @@
&lt;ul class="unstyled"&gt; &lt;ul class="unstyled"&gt;
&lt;li&gt;...&lt;/li&gt; &lt;li&gt;...&lt;/li&gt;
&lt;/ul&gt; &lt;/ul&gt;
</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">&nbsp;&nbsp;</span> Stop signal</li>
<li><span class="label label-warning">&nbsp;&nbsp;</span> Prepare for signal</li>
<li><span class="label label-success">&nbsp;&nbsp;</span> Go!</li>
</ul>
</div>
<pre class="prettyprint linenums">
&lt;ul class="unstyled inline"&gt;
&lt;li&gt;...&lt;/li&gt;
&lt;/ul&gt;
</pre> </pre>
<h3>{{_i}}Description{{/i}}</h3> <h3>{{_i}}Description{{/i}}</h3>
......
...@@ -117,6 +117,21 @@ ol.unstyled { ...@@ -117,6 +117,21 @@ ol.unstyled {
margin-left: 0; margin-left: 0;
list-style: none; 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 // Description Lists
dl { dl {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment