Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge

2 files changed, 4 insertions, 18 deletions

diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index c905c92cb..70d196a02 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -18,26 +18,12 @@ $(document).ready(function() {
 	$('#css3-calc').remove(); // Remove the test element
 
 	if($(window).width() >= 992) {
-		$('#left_aside_wrapper').stick_in_parent({
-			offset_top: parseInt($('aside').css('padding-top')),
-			parent: 'main',
-			spacer: '#left_aside_spacer'
-		});
-	}
-
-	if($(window).width() >= 992) {
-		$('#right_aside_wrapper').stick_in_parent({
+		$('#left_aside_wrapper, #right_aside_wrapper').stick_in_parent({
 			offset_top: parseInt($('aside').css('padding-top')),
-			parent: 'main',
-			spacer: '#right_aside_spacer'
+			parent: 'main'
 		});
 	}
 
-
-	$('#notifications_wrapper.fs #notifications').stick_in_parent({
-		parent: '#notifications_wrapper'
-	});
-
 	$('#expand-aside').on('click', toggleAside);
 
 	$('section').on('click', function() {
diff --git a/view/theme/redbasic/php/theme_init.php b/view/theme/redbasic/php/theme_init.php
index d9750de42..5f73f6736 100644
--- a/view/theme/redbasic/php/theme_init.php
+++ b/view/theme/redbasic/php/theme_init.php
@@ -1,14 +1,14 @@
 <?php
 
 head_add_css('/library/fork-awesome/css/fork-awesome.min.css');
-head_add_css('/library/bootstrap/css/bootstrap.min.css');
+head_add_css('/vendor/twbs/bootstrap/dist/css/bootstrap.min.css');
 head_add_css('/library/bootstrap-tagsinput/bootstrap-tagsinput.css');
 head_add_css('/view/css/bootstrap-red.css');
 head_add_css('/library/datetimepicker/jquery.datetimepicker.css');
 head_add_css('/library/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.min.css');
 require_once('view/php/theme_init.php');
 
-head_add_js('/library/bootstrap/js/bootstrap.bundle.min.js');
+head_add_js('/vendor/twbs/bootstrap/dist/js/bootstrap.bundle.min.js');
 head_add_js('/library/bootbox/bootbox.min.js');
 head_add_js('/library/bootstrap-tagsinput/bootstrap-tagsinput.js');
 head_add_js('/library/datetimepicker/jquery.datetimepicker.js');