diff options
author | zotlabs <mike@macgirvin.com> | 2017-09-19 17:40:52 -0700 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2017-09-19 17:40:52 -0700 |
commit | 4ae503bef7e54601bf665e96a2af269d95a54e82 (patch) | |
tree | 9a065108f3cf4dcdf085263995ad6c8b2ae3ab55 /library/sticky-kit/sticky-kit.js | |
parent | 51e40add661219c26c73f4b8d6da1f691e0b9b6d (diff) | |
parent | a7d0c45606042dbf1c60019c508cfe6939b85f4b (diff) | |
download | volse-hubzilla-4ae503bef7e54601bf665e96a2af269d95a54e82.tar.gz volse-hubzilla-4ae503bef7e54601bf665e96a2af269d95a54e82.tar.bz2 volse-hubzilla-4ae503bef7e54601bf665e96a2af269d95a54e82.zip |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'library/sticky-kit/sticky-kit.js')
-rw-r--r-- | library/sticky-kit/sticky-kit.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/sticky-kit/sticky-kit.js b/library/sticky-kit/sticky-kit.js index eb2ea8a26..00b1ea2ff 100644 --- a/library/sticky-kit/sticky-kit.js +++ b/library/sticky-kit/sticky-kit.js @@ -77,7 +77,7 @@ padding_top = parseInt(parent.css("padding-top"), 10); padding_bottom = parseInt(parent.css("padding-bottom"), 10); parent_top = parent.offset().top + border_top + padding_top; - parent_height = parent.outerHeight(true); + parent_height = parent.height(); if (fixed) { fixed = false; bottomed = false; |