aboutsummaryrefslogtreecommitdiff
path: root/docs/assets/js
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2011-07-02 10:47:25 -0700
committerJacob Thornton <[email protected]>2011-07-02 10:47:25 -0700
commite112d34b42d3ad23f662a646159f6266ab1b86ba (patch)
treee8f06bd35b007c7895c5484d5cd9934daa544ee1 /docs/assets/js
parent088bfcc13a1f85557d12553a7942e3284c6ceae5 (diff)
parent5992b4e0af8b65ecbd429ccb4c6809aaa50edbd9 (diff)
downloadbootstrap-e112d34b42d3ad23f662a646159f6266ab1b86ba.tar.xz
bootstrap-e112d34b42d3ad23f662a646159f6266ab1b86ba.zip
Merge branch 'master' of http://git.local.twitter.com/bootstrap
Diffstat (limited to 'docs/assets/js')
-rw-r--r--docs/assets/js/application.js2
1 files changed, 1 insertions, 1 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();
});