aboutsummaryrefslogtreecommitdiff
path: root/assets
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-07-26 20:53:26 -0700
committerMark Otto <[email protected]>2013-07-26 20:53:26 -0700
commit27a656f72e8b31bda944f4e083ce8d667d96a0e8 (patch)
treed8e3ad1500db2cc8fffb459c948ae599e4047058 /assets
parent425ec58ea964b632b085c65daf415988ce12a4cb (diff)
parent93eeb8578d3d5d2629f27316af71395817b23bdd (diff)
downloadbootstrap-27a656f72e8b31bda944f4e083ce8d667d96a0e8.tar.xz
bootstrap-27a656f72e8b31bda944f4e083ce8d667d96a0e8.zip
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Diffstat (limited to 'assets')
-rw-r--r--assets/js/application.js6
1 files changed, 2 insertions, 4 deletions
diff --git a/assets/js/application.js b/assets/js/application.js
index 95fc7b7fe..8adb5dccb 100644
--- a/assets/js/application.js
+++ b/assets/js/application.js
@@ -15,13 +15,11 @@
offset: navHeight
})
- // Disable certain links in docs
- $('.bs-docs-container [href=#]').click(function (e) {
+ $('[href^=#]').click(function (e) {
e.preventDefault()
})
- $(document.body).on('click', '[href^=#]', function (e) {
-
+ $(document.body).on('click', '.bs-sidenav [href^=#]', function (e) {
var $target = $(this.getAttribute('href'))
e.preventDefault() // prevent browser scroll