diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-12-21 15:00:17 -0500 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-12-21 15:00:17 -0500 |
| commit | c37b8f7f9da278e13b092c4334730e49e7fdf230 (patch) | |
| tree | d884ee4ad3c8bc2ead5ca8afc6f5cb2dd9260848 /library | |
| parent | 1ee5dba9b3786fa9125a15bd72fa3337caa034f5 (diff) | |
| parent | e8be8139cb46daa912babcb6c0cdd74d366b9b3b (diff) | |
| download | volse-hubzilla-c37b8f7f9da278e13b092c4334730e49e7fdf230.tar.gz volse-hubzilla-c37b8f7f9da278e13b092c4334730e49e7fdf230.tar.bz2 volse-hubzilla-c37b8f7f9da278e13b092c4334730e49e7fdf230.zip | |
Merge remote-tracking branch 'upstream/2.0RC' into 2.0RC-doco
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 00b1ea2ff..eb2ea8a26 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.height(); + parent_height = parent.outerHeight(true); if (fixed) { fixed = false; bottomed = false; |