harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix some issues with sticky-kit

Browse Source
This commit is contained in:
Mario 2017-09-19 22:40:05 +02:00
parent 4500faf463
commit 962a3f7945
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/sticky-kit/sticky-kit.js
View File

@ -77,7 +77,7 @@
padding_top = parseInt(parent.css("padding-top"), 10); padding_top = parseInt(parent.css("padding-top"), 10);
padding_bottom = parseInt(parent.css("padding-bottom"), 10); padding_bottom = parseInt(parent.css("padding-bottom"), 10);
parent_top = parent.offset().top + border_top + padding_top; parent_top = parent.offset().top + border_top + padding_top;
parent_height = parent.outerHeight(true); parent_height = parent.height();
if (fixed) { if (fixed) {
fixed = false; fixed = false;
bottomed = false; bottomed = false;

2
view/php/theme_init.php
View File

@ -23,7 +23,7 @@ head_add_js('/library/jquery-textcomplete/jquery.textcomplete.js');
head_add_js('/library/jquery.timeago.js'); head_add_js('/library/jquery.timeago.js');
head_add_js('/library/readmore.js/readmore.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/jgrowl/jquery.jgrowl_minimized.js');
head_add_js('/library/cryptojs/components/core-min.js'); head_add_js('/library/cryptojs/components/core-min.js');
head_add_js('/library/cryptojs/rollups/aes.js'); head_add_js('/library/cryptojs/rollups/aes.js');

6
view/theme/redbasic/js/redbasic.js
View File

@ -16,12 +16,10 @@ $(document).ready(function() {
} }
$('#css3-calc').remove(); // Remove the test element $('#css3-calc').remove(); // Remove the test element
if($(window).width() > 767) { if($(window).width() > 767) {
$('#left_aside_wrapper').stick_in_parent({ $('#left_aside_wrapper').stick_in_parent({
offset_top: $('nav').outerHeight(true) + 10, offset_top: parseInt($('#region_1').css('padding-top')),
parent: '#region_1', parent: 'main',
spacer: '#left_aside_spacer' spacer: '#left_aside_spacer'
}); });
} }