mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-05 16:42:29 +03:00
Code Activity

Merge branch '2.2.2-wip' into exploratory

Browse Source
This commit is contained in:
Mark Otto
2012-11-04 12:37:44 -08:00
parent 83a3789b5e 28da31218f
commit 269be76f4a
4 changed files with 57 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/templates/pages/base-css.mustache
Vendored
+16 -1
View File
@@ -287,7 +287,7 @@
</pre>
<h3>{{_i}}Unstyled{{/i}}</h3>
<p>{{_i}}A list of items with no <code>list-style</code> or additional left padding.{{/i}}</p>
<p>{{_i}}Remove default the <code>list-style</code> and left padding on list items (immediate children only).{{/i}}</p>
<div class="bs-docs-example">
<ul class="unstyled">
<li>Lorem ipsum dolor sit amet</li>
@@ -311,6 +311,21 @@
&lt;ul class="unstyled"&gt;
&lt;li&gt;...&lt;/li&gt;
&lt;/ul&gt;
</pre>
<h3>{{_i}}Inline{{/i}}</h3>
<p>{{_i}}Place all list items on a single line with <code>inline-block</code> and some light padding.{{/i}}</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>{{_i}}Description{{/i}}</h3>