Merge branch 'master' of github.com:twbs/bootstrap

dffd4ffa · fat · 394e0fa6 · 0fab6e7e · dffd4ffa
Commit dffd4ffa authored 11 years ago by fat
Hide whitespace changes
Inline Side-by-side

Showing

with 1 addition and 1 deletion
+1 -1
--- 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() })
    }
  }