aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-09-19 17:40:52 -0700
committerzotlabs <mike@macgirvin.com>2017-09-19 17:40:52 -0700
commit4ae503bef7e54601bf665e96a2af269d95a54e82 (patch)
tree9a065108f3cf4dcdf085263995ad6c8b2ae3ab55 /view/theme
parent51e40add661219c26c73f4b8d6da1f691e0b9b6d (diff)
parenta7d0c45606042dbf1c60019c508cfe6939b85f4b (diff)
downloadvolse-hubzilla-4ae503bef7e54601bf665e96a2af269d95a54e82.tar.gz
volse-hubzilla-4ae503bef7e54601bf665e96a2af269d95a54e82.tar.bz2
volse-hubzilla-4ae503bef7e54601bf665e96a2af269d95a54e82.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'view/theme')
-rw-r--r--view/theme/redbasic/js/redbasic.js6
1 files changed, 2 insertions, 4 deletions
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'
});
}