diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 8711ab2e7..7f95f01c6 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/javascript.html b/docs/javascript.html index 4f777e031..2a0f3d861 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -493,6 +493,20 @@ $('#myModal').on('hidden', function () { </li> ... </ul> +
To keep URLs intact, use the data-target attribute instead of href="#".
+<ul class="nav nav-pills"> + <li class="dropdown"> + <a class="dropdown-toggle" data-toggle="dropdown" data-target="#" href="path/to/page.html"> + Dropdown + <b class="caret"></b> + </a> + <ul class="dropdown-menu"> + ... + </ul> + </li> +</ul> +
A programatic api for activating menus for a given navbar or tabbed navigation.
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index d61a364f0..bb25f0957 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -416,6 +416,20 @@ $('#myModal').on('hidden', function () { </li> ... </ul> +{{_i}}To keep URLs intact, use the data-target attribute instead of href="#".{{/i}}
+<ul class="nav nav-pills">
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" data-target="#" href="path/to/page.html">
+ {{_i}}Dropdown{{/i}}
+ <b class="caret"></b>
+ </a>
+ <ul class="dropdown-menu">
+ ...
+ </ul>
+ </li>
+</ul>
+
{{_i}}A programatic api for activating menus for a given navbar or tabbed navigation.{{/i}}
diff --git a/less/tests/css-tests.html b/less/tests/css-tests.html index 42cdab045..f6f4b2351 100644 --- a/less/tests/css-tests.html +++ b/less/tests/css-tests.html @@ -330,8 +330,51 @@ +