Merge branch '2.2.2-wip' into exploratory

1 files changed, 16 insertions, 1 deletions

diff --git a/docs/base-css.html b/docs/base-css.html
index cb7af3fe4..d3e4ec307 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -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>
@@ -373,6 +373,21 @@
 &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>
         <p>A list of terms with their associated descriptions.</p>
         <div class="bs-docs-example">