From 95f47026cf55dc029d266e80bb4fab00b85af0e8 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Sat, 7 Jan 2012 21:09:02 -0800
Subject: fix up dropdowns and navbar docs for the new dropdown styles

---
 docs/components.html | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'docs/components.html')

diff --git a/docs/components.html b/docs/components.html
index eb9932473..934a90fbc 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -386,27 +386,30 @@
           <li><a href="#">Link</a></li>
           <li><a href="#">Link</a></li>
           <li class="dropdown">
-            <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown</a>
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
             <ul class="dropdown-menu">
-              <li><a href="#">Secondary link</a></li>
+              <li><a href="#">Action</a></li>
+              <li><a href="#">Another action</a></li>
               <li><a href="#">Something else here</a></li>
               <li class="divider"></li>
-              <li><a href="#">Another link</a></li>
+              <li><a href="#">Separated link</a></li>
             </ul>
           </li>
         </ul>
         <form class="navbar-search pull-left" action="">
           <input type="text" class="search-query span2" placeholder="Search">
         </form>
-        <ul class="nav secondary-nav">
+        <ul class="nav pull-right">
+          <li><a href="#">Link</a></li>
           <li class="vertical-divider"></li>
           <li class="dropdown">
-            <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown</a>
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
             <ul class="dropdown-menu">
-              <li><a href="#">Secondary link</a></li>
+              <li><a href="#">Action</a></li>
+              <li><a href="#">Another action</a></li>
               <li><a href="#">Something else here</a></li>
               <li class="divider"></li>
-              <li><a href="#">Another link</a></li>
+              <li><a href="#">Separated link</a></li>
             </ul>
           </li>
         </ul>
@@ -460,7 +463,8 @@
   &lt;li&gt;&lt;a href="#"&gt;Link&lt;/a&gt;&lt;/li&gt;
 &lt;/ul&gt;
 </pre>
-      <p>Adding dropdowns to the nav is super simple, but does require the use of <a href="./javascript.html/#dropdowns">our javascript plugin</a>.</p>
+      <h3>Adding dropdowns</h3>
+      <p>Adding dropdowns to the nav is super simple, but does require the use of <a href="./javascript.html/#dropdown">our javascript plugin</a>.</p>
 <pre class="prettyprint linenums">
 &lt;ul class="nav"&gt;
   &lt;li class="dropdown"&gt;
@@ -468,6 +472,7 @@
           class="dropdown-toggle"
           data-toggle="dropdown">
           Account
+          &lt;b class="caret"&gt;&lt;/b&gt;
     &lt;/a&gt;
     &lt;ul class="dropdown-menu"&gt;
       ...
@@ -475,6 +480,7 @@
   &lt;/li&gt;
 &lt;/ul&gt;
 </pre>
+    <p><a class="btn" href="./javascript.html/#dropdown">Get the javascript &rarr;</a></p>
     </div>
   </div>
 
-- 
cgit v1.2.3