Merge branch '2.2.2-wip' into exploratory

3 files changed, 44 insertions, 2 deletions

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index e3460137e..fa5d69331 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -550,6 +550,18 @@ ol.unstyled {
   list-style: none;
 }
 
+ul.inline,
+ol.inline {
+  list-style: none;
+}
+
+ul.inline > li,
+ol.inline > li {
+  display: inline-block;
+  padding-right: 5px;
+  padding-left: 5px;
+}
+
 dl {
   margin-bottom: 20px;
 }
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">
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index c8085d9a7..027c6da2a 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -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>
@@ -313,6 +313,21 @@
 &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>
         <p>{{_i}}A list of terms with their associated descriptions.{{/i}}</p>
         <div class="bs-docs-example">