diff options
| author | Mark Otto <[email protected]> | 2012-04-14 17:16:37 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-04-14 17:16:37 -0700 |
| commit | ce30d19c1507e71199f7dbbf680cf0d2b0ea6477 (patch) | |
| tree | 1279731abc8cf141a3fd683282ad2cae32ae6653 /docs/assets/js/application.js | |
| parent | dbde2dc9e40f077af4fcaa1714ade7bc94398da9 (diff) | |
| parent | 3408064d00bc1e4322c3ea1575bc2cab5aaa2be2 (diff) | |
| download | bootstrap-ce30d19c1507e71199f7dbbf680cf0d2b0ea6477.tar.xz bootstrap-ce30d19c1507e71199f7dbbf680cf0d2b0ea6477.zip | |
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
Conflicts:
docs/assets/bootstrap.zip
Diffstat (limited to 'docs/assets/js/application.js')
| -rw-r--r-- | docs/assets/js/application.js | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index 732bed458..f1b7c090a 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -51,6 +51,11 @@ processScroll() + // hack sad times - holdover until rewrite for 2.1 + $nav.on('click', function () { + if (!isFixed) setTimeout(function () { $win.scrollTop($win.scrollTop() - 47) }, 10) + }) + $win.on('scroll', processScroll) function processScroll() { |