Merge remote-tracking branch 'upstream/2.0RC' into 2.0RC-doco

1 files changed, 17 insertions, 6 deletions

diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 4a18db8ff..e31458b4e 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -14,12 +14,13 @@ $(document).ready(function() {
 			}
 		});
 	}
-
 	$('#css3-calc').remove(); // Remove the test element
 
-	$('#left_aside_wrapper').stick_in_parent({
-		offset_top: $('nav').outerHeight(true)
-	});
+	if($(window).width() > 767) {
+		$('#left_aside_wrapper').stick_in_parent({
+			offset_top: $('nav').outerHeight(true)
+		});
+	}
 
 	$('#expand-aside').on('click', toggleAside);
 
@@ -92,7 +93,17 @@ function makeFullScreen(full) {
 }
 
 function toggleAside() {
-	$(window).scroll();
 	$('#expand-aside-icon').toggleClass('fa-arrow-circle-right').toggleClass('fa-arrow-circle-left');
-	$('main').toggleClass('region_1-on');
+	if($('main').hasClass('region_1-on')){
+		$('main').removeClass('region_1-on')
+		$('#overlay').remove();
+		$('#left_aside_wrapper').trigger("sticky_kit:detach");
+	}
+	else {
+		$('main').addClass('region_1-on')
+		$('<div id="overlay"></div>').appendTo('section');
+		$('#left_aside_wrapper').stick_in_parent({
+			offset_top: $('nav').outerHeight(true)
+		});
+	}
 }