diff options
| author | fat <[email protected]> | 2013-12-24 17:00:55 -0800 |
|---|---|---|
| committer | fat <[email protected]> | 2013-12-24 17:00:55 -0800 |
| commit | dffd4ffad2b6cad7fb0bab747671d524d791054d (patch) | |
| tree | 7bac4189339cef00c965b6d3828a32b3198c93a4 /js | |
| parent | 394e0fa6118febbe62ecfb431ab91fff42bdf7d8 (diff) | |
| parent | 0fab6e7ea77ef838adaf78adf56c951ae6e16cdc (diff) | |
| download | bootstrap-dffd4ffad2b6cad7fb0bab747671d524d791054d.tar.xz bootstrap-dffd4ffad2b6cad7fb0bab747671d524d791054d.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
Diffstat (limited to 'js')
| -rw-r--r-- | js/affix.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/affix.js b/js/affix.js index 3ec487a78..bc11feaa8 100644 --- a/js/affix.js +++ b/js/affix.js @@ -83,7 +83,7 @@ .trigger($.Event(affixType.replace('affix', 'affixed'))) if (affix == 'bottom') { - this.$element.offset({ top: document.body.offsetHeight - offsetBottom - this.$element.height() }) + this.$element.offset({ top: scrollHeight - offsetBottom - this.$element.height() }) } } |