aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob <[email protected]>2014-05-10 09:41:12 -0700
committerJacob <[email protected]>2014-05-10 09:41:12 -0700
commit0e91b85d2a03054ce3465eaee0020471ed9c6305 (patch)
tree22b97dc3bcb64a8e363af9ae1813fad02ad10357
parented98b3dfc012166d01c72fc80caa0113e37b4d45 (diff)
parent78cac11cef392a740e4fae390e9957371243838b (diff)
downloadbootstrap-0e91b85d2a03054ce3465eaee0020471ed9c6305.tar.xz
bootstrap-0e91b85d2a03054ce3465eaee0020471ed9c6305.zip
Merge pull request #13541 from gpakosz/patch-2
Fixed affix-bottom positioning
-rw-r--r--js/affix.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/affix.js b/js/affix.js
index 992ae7ff1..270b039bf 100644
--- a/js/affix.js
+++ b/js/affix.js
@@ -82,7 +82,7 @@
.trigger($.Event(affixType.replace('affix', 'affixed')))
if (affix == 'bottom') {
- this.$element.offset({ top: position.top })
+ this.$element.offset({ top: scrollHeight - this.$element.height() - offsetBottom })
}
}