aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/redbasic/js/redbasic.js
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2017-10-25 13:29:19 +0200
committerMario <mario@mariovavti.com>2017-10-25 13:29:19 +0200
commit344aa13c64f0fa7a246f3284bf9cdb267e6101d3 (patch)
tree943809c01164dda7b6e4a26bc3d6c7e8c48bd6eb /view/theme/redbasic/js/redbasic.js
parent61c86212b944efa0d78dcc0364b81bfb8a0d19bc (diff)
parent69b22e3f7916b5ba19b5ed03a55ad72bf5995291 (diff)
downloadvolse-hubzilla-344aa13c64f0fa7a246f3284bf9cdb267e6101d3.tar.gz
volse-hubzilla-344aa13c64f0fa7a246f3284bf9cdb267e6101d3.tar.bz2
volse-hubzilla-344aa13c64f0fa7a246f3284bf9cdb267e6101d3.zip
Merge branch '2.8RC'
Diffstat (limited to 'view/theme/redbasic/js/redbasic.js')
-rw-r--r--view/theme/redbasic/js/redbasic.js47
1 files changed, 38 insertions, 9 deletions
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 5a586b9f9..04199ea95 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -16,20 +16,26 @@ $(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: $('nav').outerHeight(true) + 10,
- parent: '#region_1',
+ offset_top: parseInt($('aside').css('padding-top')),
+ parent: 'main',
spacer: '#left_aside_spacer'
});
}
- if(($(window).width() < 767) && ($('#left_aside_wrapper .widget, #left_aside_wrapper .vcard').length > 0))
- $('#expand-aside').show();
- else
- $('#expand-aside').hide();
+ if($(window).width() >= 1200) {
+ $('#right_aside_wrapper').stick_in_parent({
+ 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);
@@ -48,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');
@@ -66,6 +82,19 @@ $(document).ready(function() {
}
});
+ var notifications_parent = $('#notifications_wrapper')[0].parentElement.id;
+ $('#notifications-btn').click(function() {
+ if($('#notifications_wrapper').hasClass('fs'))
+ $('#notifications_wrapper').prependTo('#' + notifications_parent);
+ else
+ $('#notifications_wrapper').prependTo('section');
+
+ $('#notifications_wrapper').toggleClass('fs');
+ if($('#navbar-collapse-2').hasClass('show')){
+ $('#navbar-collapse-2').removeClass('show');
+ }
+ });
+
$("input[data-role=cat-tagsinput]").tagsinput({
tagClass: 'badge badge-pill badge-warning text-dark'
});