diff options
| author | James Friend <[email protected]> | 2014-08-28 09:32:08 +0800 |
|---|---|---|
| committer | James Friend <[email protected]> | 2014-08-28 09:32:08 +0800 |
| commit | 9aeaf19b1dca68ee71e916ae415a0c270a47d301 (patch) | |
| tree | bc8385acb8ec7a46bba03ff2ef7e4283cd9f1146 /docs/_includes/nav/javascript.html | |
| parent | e7991a9a1e2f474c8f1d8a2e0ed113816f1c5e82 (diff) | |
| parent | 35f09315ed543a0479719afa2143240952c215db (diff) | |
| download | bootstrap-9aeaf19b1dca68ee71e916ae415a0c270a47d301.tar.xz bootstrap-9aeaf19b1dca68ee71e916ae415a0c270a47d301.zip | |
Merge remote-tracking branch 'upstream/master' into node-requirable
Conflicts:
Gruntfile.js
Diffstat (limited to 'docs/_includes/nav/javascript.html')
| -rw-r--r-- | docs/_includes/nav/javascript.html | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/docs/_includes/nav/javascript.html b/docs/_includes/nav/javascript.html index 9cccf1d99..3459bb1e4 100644 --- a/docs/_includes/nav/javascript.html +++ b/docs/_includes/nav/javascript.html @@ -6,6 +6,7 @@ <li><a href="#js-programmatic-api">Programmatic API</a></li> <li><a href="#js-noconflict">No conflict</a></li> <li><a href="#js-events">Events</a></li> + <li><a href="#js-disabled">When JavaScript is disabled</a></li> <li><a href="#callout-third-party-libs">Third-party libraries</a></li> </ul> </li> @@ -64,8 +65,10 @@ <li> <a href="#buttons">Button</a> <ul class="nav"> - <li><a href="#buttons-examples">Examples</a></li> - <li><a href="#buttons-usage">Usage</a></li> + <li><a href="#buttons-stateful">Stateful</a></li> + <li><a href="#buttons-single-toggle">Single toggle</a></li> + <li><a href="#buttons-checkbox-radio">Checkbox / Radio</a></li> + <li><a href="#buttons-methods">Methods</a></li> </ul> </li> <li> |