diff options
| author | Jacob Thornton <[email protected]> | 2011-07-02 10:47:25 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2011-07-02 10:47:25 -0700 |
| commit | e112d34b42d3ad23f662a646159f6266ab1b86ba (patch) | |
| tree | e8f06bd35b007c7895c5484d5cd9934daa544ee1 /docs | |
| parent | 088bfcc13a1f85557d12553a7942e3284c6ceae5 (diff) | |
| parent | 5992b4e0af8b65ecbd429ccb4c6809aaa50edbd9 (diff) | |
| download | bootstrap-e112d34b42d3ad23f662a646159f6266ab1b86ba.tar.xz bootstrap-e112d34b42d3ad23f662a646159f6266ab1b86ba.zip | |
Merge branch 'master' of http://git.local.twitter.com/bootstrap
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/js/application.js | 2 | ||||
| -rw-r--r-- | docs/index.html | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index 8b29f6c21..82cf307e9 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -86,7 +86,7 @@ $(document).ready(function(){ // Disable certain links in docs // ============================= - $('ul.tabs a, ul.pills a, .pagination a').click(function(e) { + $('ul.tabs a, ul.pills a, .pagination a, .well .btn, .actions .btn, .alert-message .btn, a.close').click(function(e) { e.preventDefault(); }); diff --git a/docs/index.html b/docs/index.html index 1caea7c8f..ef5c7372a 100644 --- a/docs/index.html +++ b/docs/index.html @@ -32,7 +32,7 @@ <li><a href="#forms">Forms</a></li> <li><a href="#navigation">Navigation</a></li> <li><a href="#alerts">Alerts</a></li> - <li><a href="#modals">Modals</a></li> + <li><a href="#popovers">Popovers</a></li> <li><a href="#less">LESS</a></li> </ul> </div> @@ -1056,9 +1056,9 @@ </section> -<section id="modals"> +<section id="popovers"> <div class="page-header"> - <h1>Modals <small>Rules and conditions for displaying content in dialog boxes</small></h1> + <h1>Popovers <small>Components for displaying content in modals, tooltips, and popovers</small></h1> </div> <div class="row"> <div class="span4 columns"> |