aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/redbasic
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-01-05 12:19:14 -0800
committerzotlabs <mike@macgirvin.com>2017-01-05 12:19:14 -0800
commita87d12f167ebed14736b7480d2c32be1e003c409 (patch)
tree3de27c400dcfbc20e1343fd0e983cccff7c6f493 /view/theme/redbasic
parentec18c3770bd1ff444713c94f8405b75692848274 (diff)
parent3e0ea9727fd73daafea5597e76fab8eed252f215 (diff)
downloadvolse-hubzilla-a87d12f167ebed14736b7480d2c32be1e003c409.tar.gz
volse-hubzilla-a87d12f167ebed14736b7480d2c32be1e003c409.tar.bz2
volse-hubzilla-a87d12f167ebed14736b7480d2c32be1e003c409.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'view/theme/redbasic')
-rw-r--r--view/theme/redbasic/js/redbasic.js8
1 files changed, 6 insertions, 2 deletions
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 185dc7bcd..3ff0c43ae 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -18,7 +18,9 @@ $(document).ready(function() {
if($(window).width() > 767) {
$('#left_aside_wrapper').stick_in_parent({
- offset_top: $('nav').outerHeight(true)
+ offset_top: $('nav').outerHeight(true),
+ parent: '#region_1',
+ spacer: '#left_aside_spacer'
});
}
@@ -105,7 +107,9 @@ function toggleAside() {
$('main').addClass('region_1-on')
$('<div id="overlay"></div>').appendTo('section');
$('#left_aside_wrapper').stick_in_parent({
- offset_top: $('nav').outerHeight(true) - 10
+ offset_top: $('nav').outerHeight(true) - 10,
+ parent: '#region_1',
+ spacer: '#left_aside_spacer'
});
}
}