diff options
| author | zotlabs <mike@macgirvin.com> | 2017-09-24 16:59:56 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-09-24 16:59:56 -0700 |
| commit | 8b7ab90836ef313e7eaf0a3fd1f29ad8ab1a716c (patch) | |
| tree | 04add36aa35ce8cda58c5594a783737b25346175 /library/sticky-kit/sticky-kit.js | |
| parent | 4d3b0577c9538644ca0eeb2751b285521d2cc86d (diff) | |
| parent | 866dc9a9b3ca1cd98fc032afe0aec14ccdb86ba0 (diff) | |
| download | volse-hubzilla-8b7ab90836ef313e7eaf0a3fd1f29ad8ab1a716c.tar.gz volse-hubzilla-8b7ab90836ef313e7eaf0a3fd1f29ad8ab1a716c.tar.bz2 volse-hubzilla-8b7ab90836ef313e7eaf0a3fd1f29ad8ab1a716c.zip | |
Merge branch 'master' into tagging
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; |