1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-27 22:09:04 +02:00

Merge branch '2.2.2-wip' into exploratory

This commit is contained in:
Mark Otto
2012-11-04 12:37:44 -08:00
4 changed files with 57 additions and 2 deletions

View File

@@ -347,7 +347,7 @@
</pre>
<h3>Unstyled</h3>
<p>A list of items with no <code>list-style</code> or additional left padding.</p>
<p>Remove default the <code>list-style</code> and left padding on list items (immediate children only).</p>
<div class="bs-docs-example">
<ul class="unstyled">
<li>Lorem ipsum dolor sit amet</li>
@@ -371,6 +371,21 @@
&lt;ul class="unstyled"&gt;
&lt;li&gt;...&lt;/li&gt;
&lt;/ul&gt;
</pre>
<h3>Inline</h3>
<p>Place all list items on a single line with <code>inline-block</code> and some light padding.</p>
<div class="bs-docs-example">
<ul class="inline">
<li>Lorem ipsum</li>
<li>Phasellus iaculis</li>
<li>Nulla volutpat</li>
</ul>
</div>
<pre class="prettyprint linenums">
&lt;ul class="inline"&gt;
&lt;li&gt;...&lt;/li&gt;
&lt;/ul&gt;
</pre>
<h3>Description</h3>