aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2017-10-10 12:08:51 +0200
committerMario Vavti <mario@mariovavti.com>2017-10-10 12:08:51 +0200
commit41cf846ee3c51257dc8ba05e498345b3e568e422 (patch)
tree6debd02675d83f150dea5151a64ccf031f76117b /view/theme
parentcc1ffff7cdfe5881636b6d2de3fe16f0094b5d69 (diff)
downloadvolse-hubzilla-41cf846ee3c51257dc8ba05e498345b3e568e422.tar.gz
volse-hubzilla-41cf846ee3c51257dc8ba05e498345b3e568e422.tar.bz2
volse-hubzilla-41cf846ee3c51257dc8ba05e498345b3e568e422.zip
new notification fixes
Diffstat (limited to 'view/theme')
-rw-r--r--view/theme/redbasic/js/redbasic.js34
1 files changed, 26 insertions, 8 deletions
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 3fa9d2a76..4f71c1e73 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -16,19 +16,27 @@ $(document).ready(function() {
}
$('#css3-calc').remove(); // Remove the test element
- if($(window).width() > 767) {
+ if($(window).width() >= 767) {
$('#left_aside_wrapper').stick_in_parent({
- offset_top: parseInt($('#region_1').css('padding-top')),
+ offset_top: parseInt($('aside').css('padding-top')),
parent: 'main',
spacer: '#left_aside_spacer'
});
+ }
+
+ if($(window).width() >= 1200) {
$('#right_aside_wrapper').stick_in_parent({
- offset_top: parseInt($('#region_3').css('padding-top')),
+ offset_top: parseInt($('aside').css('padding-top')),
parent: 'main',
spacer: '#right_aside_spacer'
});
}
+
+ $('#notifications_wrapper.fs #notifications').stick_in_parent({
+ parent: '#notifications_wrapper'
+ });
+
$('#expand-aside').on('click', toggleAside);
$('section').on('click', function() {
@@ -46,6 +54,16 @@ $(document).ready(function() {
}
});
+
+ var right_aside_height = $('#rightt_aside_wrapper').height();
+
+ $('#right_aside_wrapper').on('click', function() {
+ if(right_aside_height != $('#right_aside_wrapper').height()) {
+ $(document.body).trigger("sticky_kit:recalc");
+ right_aside_height = $('#right_aside_wrapper').height();
+ }
+ });
+
$('.usermenu').click(function() {
if($('#navbar-collapse-1, #navbar-collapse-2').hasClass('show')){
$('#navbar-collapse-1, #navbar-collapse-2').removeClass('show');
@@ -64,14 +82,14 @@ $(document).ready(function() {
}
});
- var notifications_parent = $('#notifications')[0].parentElement.id;
+ var notifications_parent = $('#notifications_wrapper')[0].parentElement.id;
$('#notifications-btn-1').click(function() {
- if($('#notifications').hasClass('fs'))
- $('#notifications').prependTo('#' + notifications_parent);
+ if($('#notifications_wrapper').hasClass('fs'))
+ $('#notifications_wrapper').prependTo('#' + notifications_parent);
else
- $('#notifications').prependTo('body');
+ $('#notifications_wrapper').prependTo('section');
- $('#notifications').toggleClass('fs');
+ $('#notifications_wrapper').toggleClass('fs');
if($('#navbar-collapse-2').hasClass('show')){
$('#navbar-collapse-2').removeClass('show');
}