diff options
| author | Mark Otto <[email protected]> | 2014-03-06 21:32:52 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-03-06 21:32:52 -0800 |
| commit | c8614c0f15f0ce78426c6403e57aff22c3ce2beb (patch) | |
| tree | 673d1a347374a8bf53a127c050dbc57762af3782 /docs/assets/js/application.js | |
| parent | d1a7271ea1272e0f9775d49e6a84ee49819e0094 (diff) | |
| parent | fab10b643eb1a2038fb31305f0b038b7a9a8554d (diff) | |
| download | bootstrap-c8614c0f15f0ce78426c6403e57aff22c3ce2beb.tar.xz bootstrap-c8614c0f15f0ce78426c6403e57aff22c3ce2beb.zip | |
Merge branch 'master' into pr/12490
Conflicts:
less/list-group.less
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 742b83ed8..1a92aaf02 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)) } } }) |