From a27bf30f0d7a42f356d661db9835710bc8917067 Mon Sep 17 00:00:00 2001
From: Quy Ton <quy@fluxbb.org>
Date: Thu, 20 Dec 2012 21:38:53 -0800
Subject: Miscellaneous changes to docs

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

(limited to 'docs/components.html')

diff --git a/docs/components.html b/docs/components.html
index bd528866c..10ffd2e0c 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -2488,7 +2488,7 @@
             <p><button class="close" style="float: none;">&times;</button></p>
           </div>
           <pre class="prettyprint linenums">&lt;button class="close"&gt;&amp;times;&lt;/button&gt;</pre>
-          <p>iOS devices require an href="#" for click events if you would rather use an anchor.</p>
+          <p>iOS devices require an <code>href="#"</code> for click events if you would rather use an anchor.</p>
           <pre class="prettyprint linenums">&lt;a class="close" href="#"&gt;&amp;times;&lt;/a&gt;</pre>
 
           <h2>Helper classes</h2>
-- 
cgit v1.2.3


From 88e816956a731c9e3284c55a7be0c81b447c2601 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Fri, 11 Jan 2013 20:52:39 -0800
Subject: Fixes #6552: example fix for button group

---
 docs/components.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'docs/components.html')

diff --git a/docs/components.html b/docs/components.html
index 10ffd2e0c..751418816 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -272,9 +272,9 @@
           </div>
 <pre class="prettyprint linenums">
 &lt;div class="btn-group"&gt;
-  &lt;button class="btn"&gt;1&lt;/button&gt;
-  &lt;button class="btn"&gt;2&lt;/button&gt;
-  &lt;button class="btn"&gt;3&lt;/button&gt;
+  &lt;button class="btn"&gt;Left&lt;/button&gt;
+  &lt;button class="btn"&gt;Middle&lt;/button&gt;
+  &lt;button class="btn"&gt;Right&lt;/button&gt;
 &lt;/div&gt;
 </pre>
 
-- 
cgit v1.2.3


From a7231854c91399aafb371ccdf2b930037a7ac5ed Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Sat, 12 Jan 2013 00:33:12 -0800
Subject: Address #6459 and add mention of disabled links in dropdowns to le
 docs

---
 docs/components.html | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'docs/components.html')

diff --git a/docs/components.html b/docs/components.html
index 751418816..bbb0dc39d 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -161,6 +161,25 @@
 &lt;ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dLabel"&gt;
   ...
 &lt;/ul&gt;
+</pre>
+
+          <h3>Disabled menu options</h3>
+          <p>Add <code>.disabled</code> to a <code>&lt;li&gt;</code> in the dropdown to disable the link.</p>
+          <div class="bs-docs-example">
+            <div class="dropdown clearfix">
+              <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu" style="display: block; position: static; margin-bottom: 5px; *width: 180px;">
+                <li><a tabindex="-1" href="#">Regular link</a></li>
+                <li class="disabled"><a tabindex="-1" href="#">Disabled link</a></li>
+                <li><a tabindex="-1" href="#">Another link</a></li>
+              </ul>
+            </div>
+          </div>
+<pre class="prettyprint linenums">
+&lt;ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu"&gt;
+  &lt;li&gt;&lt;a tabindex="-1" href="#"&gt;Regular link&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a tabindex="-1" href="#"&gt;Disabled link&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a tabindex="-1" href="#"&gt;Another link&lt;/a&gt;&lt;/li&gt;
+&lt;/ul&gt;
 </pre>
 
           <h3>Sub menus on dropdowns</h3>
-- 
cgit v1.2.3