aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2017-09-19 22:40:05 +0200
committerMario <mario@mariovavti.com>2017-09-19 22:40:05 +0200
commit962a3f7945df3fcc2fe533f2a645dc246fbd4dca (patch)
treebb6b5432a1c02ceac888d043b7616b935357ee26
parent4500faf463e7fd6fcf9948666421c941a1292df9 (diff)
downloadvolse-hubzilla-962a3f7945df3fcc2fe533f2a645dc246fbd4dca.tar.gz
volse-hubzilla-962a3f7945df3fcc2fe533f2a645dc246fbd4dca.tar.bz2
volse-hubzilla-962a3f7945df3fcc2fe533f2a645dc246fbd4dca.zip
fix some issues with sticky-kit
-rw-r--r--library/sticky-kit/sticky-kit.js2
-rw-r--r--view/php/theme_init.php2
-rw-r--r--view/theme/redbasic/js/redbasic.js6
3 files changed, 4 insertions, 6 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;
diff --git a/view/php/theme_init.php b/view/php/theme_init.php
index ff37023cf..a420323ac 100644
--- a/view/php/theme_init.php
+++ b/view/php/theme_init.php
@@ -23,7 +23,7 @@ head_add_js('/library/jquery-textcomplete/jquery.textcomplete.js');
head_add_js('/library/jquery.timeago.js');
head_add_js('/library/readmore.js/readmore.js');
-head_add_js('/library/sticky-kit/sticky-kit.js');
+head_add_js('/library/sticky-kit/sticky-kit.min.js');
head_add_js('/library/jgrowl/jquery.jgrowl_minimized.js');
head_add_js('/library/cryptojs/components/core-min.js');
head_add_js('/library/cryptojs/rollups/aes.js');
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 5a586b9f9..b36e35ccc 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -16,12 +16,10 @@ $(document).ready(function() {
}
$('#css3-calc').remove(); // Remove the test element
-
-
if($(window).width() > 767) {
$('#left_aside_wrapper').stick_in_parent({
- offset_top: $('nav').outerHeight(true) + 10,
- parent: '#region_1',
+ offset_top: parseInt($('#region_1').css('padding-top')),
+ parent: 'main',
spacer: '#left_aside_spacer'
});
}