From 8ea0b2051a2f037ee67571c01b816b3a286fb5ee Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Fri, 13 Jan 2017 13:04:30 +0100
Subject: another try on preventing double scrollbars when a modal is larger
 than the viewport

---
 view/theme/redbasic/css/style.css  | 2 --
 view/theme/redbasic/js/redbasic.js | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index c6f075479..401f052d0 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -9,7 +9,6 @@
 /* generals */
 html {
 	font-size: 100%;
-	overflow-x: hidden;
 }
 
 body {
@@ -21,7 +20,6 @@ body {
 	background-size: cover;
 	color: $font_colour;
 	margin: 0px;
-	overflow-x: hidden;
 }
 
 aside {
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 3ff0c43ae..5410999b4 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -99,11 +99,13 @@ function makeFullScreen(full) {
 function toggleAside() {
 	$('#expand-aside-icon').toggleClass('fa-arrow-circle-right').toggleClass('fa-arrow-circle-left');
 	if($('main').hasClass('region_1-on')){
+		$('html, body').css('overflow-x', '');
 		$('main').removeClass('region_1-on')
 		$('#overlay').remove();
 		$('#left_aside_wrapper').trigger("sticky_kit:detach");
 	}
 	else {
+		$('html, body').css('overflow-x', 'hidden');
 		$('main').addClass('region_1-on')
 		$('<div id="overlay"></div>').appendTo('section');
 		$('#left_aside_wrapper').stick_in_parent({
-- 
cgit v1.2.3