diff options
| author | zotlabs <mike@macgirvin.com> | 2017-09-19 17:41:13 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-09-19 17:41:13 -0700 |
| commit | 373af6d4f4afe8599f45764d5b289f714b84f630 (patch) | |
| tree | 525462ecbe1dcfa96ada6c170a6ebf9a312d2281 /library | |
| parent | 72a19a14aff7a13a8c1fb10e773784643f68d234 (diff) | |
| parent | a7d0c45606042dbf1c60019c508cfe6939b85f4b (diff) | |
| download | volse-hubzilla-373af6d4f4afe8599f45764d5b289f714b84f630.tar.gz volse-hubzilla-373af6d4f4afe8599f45764d5b289f714b84f630.tar.bz2 volse-hubzilla-373af6d4f4afe8599f45764d5b289f714b84f630.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'library')
| -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; |