aboutsummaryrefslogtreecommitdiff
path: root/docs/components.html
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-01-07 21:09:02 -0800
committerMark Otto <[email protected]>2012-01-07 21:09:02 -0800
commit95f47026cf55dc029d266e80bb4fab00b85af0e8 (patch)
treec52e772d05c87037a7b59612419a8510a6b04379 /docs/components.html
parent343dd9616d0c596f67331ce30e4811cedccf2d39 (diff)
downloadbootstrap-95f47026cf55dc029d266e80bb4fab00b85af0e8.tar.xz
bootstrap-95f47026cf55dc029d266e80bb4fab00b85af0e8.zip
fix up dropdowns and navbar docs for the new dropdown styles
Diffstat (limited to 'docs/components.html')
-rw-r--r--docs/components.html22
1 files changed, 14 insertions, 8 deletions
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>