diff options
| author | Mark Otto <[email protected]> | 2014-03-07 01:30:28 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-03-07 01:30:28 -0800 |
| commit | 0143e38a672335b7ca2d73d0de5b2a2b4618f9e9 (patch) | |
| tree | 7188809b7c2194fc0aca9a65b7d07725ee4206d5 /docs/assets/js/application.js | |
| parent | 642fd5100293755a6003448d4a481f3b314edf15 (diff) | |
| parent | 1f148427de6d35a06e225deeee0b162b11955232 (diff) | |
| download | bootstrap-0143e38a672335b7ca2d73d0de5b2a2b4618f9e9.tar.xz bootstrap-0143e38a672335b7ca2d73d0de5b2a2b4618f9e9.zip | |
Merge branch 'master' into document_popover_focus
Conflicts:
docs/assets/js/docs.min.js
Diffstat (limited to 'docs/assets/js/application.js')
| -rw-r--r-- | docs/assets/js/application.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index 4f81f84d2..678c6eace 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -34,7 +34,7 @@ var navHeight = $('.navbar').outerHeight(true) + 10 $body.scrollspy({ - target: '.bs-sidebar', + target: '.bs-docs-sidebar', // offset: navHeight }) @@ -48,7 +48,7 @@ // back to top setTimeout(function () { - var $sideBar = $('.bs-sidebar') + var $sideBar = $('.bs-docs-sidebar') $sideBar.affix({ offset: { @@ -60,7 +60,7 @@ return (this.top = offsetTop - navOuterHeight - sideBarMargin) }, bottom: function () { - return (this.bottom = $('.bs-footer').outerHeight(true)) + return (this.bottom = $('.bs-docs-footer').outerHeight(true)) } } }) |