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

This commit is contained in:
fat 2013-12-24 17:00:55 -08:00
commit dffd4ffad2

View file

@ -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() })
}
}