From 233e050adfc171685fd2c2f6ad760a8556aa0eb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20Cederstro=CC=88m?= <andreas@klydd.se>
Date: Fri, 26 Oct 2012 09:47:55 +0200
Subject: Adding .inline for ul and ol

---
 docs/base-css.html | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 10a7dc62e..a045ec87e 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -374,6 +374,21 @@
 &lt;ul class="unstyled"&gt;
   &lt;li&gt;...&lt;/li&gt;
 &lt;/ul&gt;
+</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>
 
         <h3>Description</h3>
-- 
cgit v1.2.3


From e4866c4b3c50c1d1bef5c639c13a2210416b0157 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Sun, 4 Nov 2012 12:27:18 -0800
Subject: clarify unstyled lists docs

---
 docs/base-css.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 443400463..b8d3930eb 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -350,7 +350,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>
-- 
cgit v1.2.3


From 28da31218fc5dc39ece625705c37b8c86d494801 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Sun, 4 Nov 2012 12:36:37 -0800
Subject: Refine new inline list option

---
 docs/base-css.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 8cc571210..dd34401d5 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -377,16 +377,16 @@
 </pre>
 
         <h3>Inline</h3>
-        <p>A list of floated left items. Can be combined with with <code>.unstyled</code></p>
+        <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="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 class="inline">
+            <li>Lorem ipsum</li>
+            <li>Phasellus iaculis</li>
+            <li>Nulla volutpat</li>
           </ul>
         </div>
 <pre class="prettyprint linenums">
-&lt;ul class="unstyled inline"&gt;
+&lt;ul class="inline"&gt;
   &lt;li&gt;...&lt;/li&gt;
 &lt;/ul&gt;
 </pre>
-- 
cgit v1.2.3