From 56ecc6ba96550d8e66d0484c21fc20da5f8e52e6 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Sat, 31 Mar 2012 12:31:56 -0700
Subject: [PATCH] clarify use of dropdowns, href, and data-target for js docs;
 add tests to css tests page for it's display and execution in html

---
 docs/assets/bootstrap.zip                | Bin 56907 -> 56907 bytes
 docs/javascript.html                     |  14 ++++++++
 docs/templates/pages/javascript.mustache |  14 ++++++++
 less/tests/css-tests.html                |  43 +++++++++++++++++++++++
 4 files changed, 71 insertions(+)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 8711ab2e7bec5768d0572e5f1d0c6a6507f43bbb..7f95f01c6952abeb7ca08d6773bad1187770050a 100644
GIT binary patch
delta 512
zcmX@Thxzm#X5IjAW)?065IC1yKap2KB_z7sKOBflE4UdLS-vtdFtCUKWfAJm1Jwnp
zu!lj^O^&ORVg?D#v;hkNg*V>0%?T2kyo<{LCbpT8+k*ov=p$^%9tzY8v}bdRu$DPk
zaHE$gT;*FYXJclNV*;fo`_*x>LmdRR2q-+cy3PqK1~TACU4;Nh?PU9Y8@OOof0Y39
z1)$*n`O54duK+R3nUmcX=)-NQSx~72R`}zPF-+lRqr**NU?aER)MEzPF<IcQ4A_l-
zZ%a>Bx+TsG^dV48Y;yl?Hn4c~EiVkQ<G1`U#LREoGXp)2qIbq^XQ(<Eu$_Nz8$s=a
um=E$=;GF;rvBP(~;BEu?RR69aGsu_7?rOSgi{b{5x`%fi!Rl1+sR01?G{<59

delta 512
zcmX@Thxzm#X5IjAW)?065YXILH<4FC<?V_x|Mx&#TEWf0$nuqufq_K?D2u8tP=);+
zMBU`LIw@w5)|ob7A)xk+cW!fngeLFeasZ0~m2PI__TT^u`Uo4cgX{p}%`L)O=3v2%
zUZ!xtw_eW1U=stSC;QcLg2jOjf>|`Vy3Pr%_DEfY0N4QgejB)8Q-75Jvlh_)|MQjE
zL0&=D?Y2N4?xvarl}ccRKMong6mB*;+$07za{Em^W}qV{3*40f^Z(wKo~(3BoEhjF
zpqSX?{@ZL|@#tG#7-Gk7`C*8e-?oREhtNCYwlkU?Mi^=W?*w3o9lqlQ*9Y>c{#`?6
ZkS~$l)pXYu#SI{J5AQmH)v4Z70|0yB;9&p&

diff --git a/docs/javascript.html b/docs/javascript.html
index 4f777e0312..2a0f3d861f 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -493,6 +493,20 @@ $('#myModal').on('hidden', function () {
   &lt;/li&gt;
   ...
 &lt;/ul&gt;</pre>
+          <p>To keep URLs intact, use the <code>data-target</code> attribute instead of <code>href="#"</code>.</p>
+<pre class="prettyprint linenums">
+&lt;ul class="nav nav-pills"&gt;
+  &lt;li class="dropdown"&gt;
+    &lt;a class="dropdown-toggle" data-toggle="dropdown" data-target="#" href="path/to/page.html"&gt;
+      Dropdown
+      &lt;b class="caret"&gt;&lt;/b&gt;
+    &lt;/a&gt;
+    &lt;ul class="dropdown-menu"&gt;
+      ...
+    &lt;/ul&gt;
+  &lt;/li&gt;
+&lt;/ul&gt;
+</pre>
           <h3>Methods</h3>
           <h4>$().dropdown()</h4>
           <p>A programatic api for activating menus for a given navbar or tabbed navigation.</p>
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index d61a364f03..bb25f09572 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -416,6 +416,20 @@ $('#myModal').on('hidden', function () {
   &lt;/li&gt;
   ...
 &lt;/ul&gt;</pre>
+          <p>{{_i}}To keep URLs intact, use the <code>data-target</code> attribute instead of <code>href="#"</code>.{{/i}}</p>
+<pre class="prettyprint linenums">
+&lt;ul class="nav nav-pills"&gt;
+  &lt;li class="dropdown"&gt;
+    &lt;a class="dropdown-toggle" data-toggle="dropdown" data-target="#" href="path/to/page.html"&gt;
+      {{_i}}Dropdown{{/i}}
+      &lt;b class="caret"&gt;&lt;/b&gt;
+    &lt;/a&gt;
+    &lt;ul class="dropdown-menu"&gt;
+      ...
+    &lt;/ul&gt;
+  &lt;/li&gt;
+&lt;/ul&gt;
+</pre>
           <h3>{{_i}}Methods{{/i}}</h3>
           <h4>$().dropdown()</h4>
           <p>{{_i}}A programatic api for activating menus for a given navbar or tabbed navigation.{{/i}}</p>
diff --git a/less/tests/css-tests.html b/less/tests/css-tests.html
index 42cdab0457..f6f4b2351c 100644
--- a/less/tests/css-tests.html
+++ b/less/tests/css-tests.html
@@ -330,8 +330,51 @@
   </div><!--/row-->
 </div>
 
+<br>
+
+<!-- Dropdowns
+================================================== -->
+
+<div class="page-header">
+  <h1>Dropdowns</h1>
+</div>
 
 
+<h4>Dropdown link with hash URL</h4>
+<ul class="nav nav-pills">
+  <li class="active"><a href="#">Link</a></li>
+  <li><a href="#">Example link</a></li>
+  <li class="dropdown">
+    <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+      Dropdown <span class="caret"></span>
+    </a>
+    <ul class="dropdown-menu">
+      <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="#">Separated link</a></li>
+    </ul>
+  </li>
+</ul>
+
+<h4>Dropdown link with custom URL and data-target</h4>
+<ul class="nav nav-pills">
+  <li class="active"><a href="#">Link</a></li>
+  <li><a href="#">Example link</a></li>
+  <li class="dropdown">
+    <a class="dropdown-toggle" data-toggle="dropdown" data-target="#" href="path/to/page.html">
+      Dropdown <span class="caret"></span>
+    </a>
+    <ul class="dropdown-menu">
+      <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="#">Separated link</a></li>
+    </ul>
+  </li>
+</ul>