Fix app-content scrollbar when app-sidebar is open

core/css/apps.css

@@ -430,7 +430,7 @@
 	right: 0;
 	left: auto;
 	bottom: 0;
-	width: 300px;
+	width: 27%;
 	display: block;
 	background: #eee;
 	-webkit-transition: margin-right 300ms;
@@ -443,8 +443,8 @@
 	z-index: 500;
 }
 
-#app-sidebar ~ .with-app-sidebar {
-	width: 73%;
+#app-content.with-app-sidebar {
+	margin-right: 27%;
 }
 
 #app-sidebar.disappear {

core/css/mobile.css

@@ -103,11 +103,7 @@
 	z-index: 1000;
 }
 
-#app-sidebar {
-	width: 250px;
-}
-
-#app-sidebar ~ .with-app-sidebar {
+#app-sidebar{
 	width: 100%;
 }
 

core/js/apps.js

@@ -25,9 +25,8 @@
 	 */
 	exports.Apps.showAppSidebar = function() {
 		var $appSidebar = $('#app-sidebar');
-		$appSidebar
-			.removeClass('disappear')
-			.find('~').addClass('with-app-sidebar');
+		$appSidebar.removeClass('disappear')
+		$('#app-content').addClass('with-app-sidebar');
 
 	};
 
@@ -37,9 +36,8 @@
 	 */
 	exports.Apps.hideAppSidebar = function() {
 		var $appSidebar = $('#app-sidebar');
-		$appSidebar
-			.addClass('disappear')
-			.find('~ .with-app-sidebar').removeClass('with-app-sidebar');
+		$appSidebar.addClass('disappear');
+		$('#app-content').removeClass('with-app-sidebar');
 	};
 
 	/**

core/js/js.js

@@ -1366,13 +1366,13 @@ function initCore() {
 				// if there is a scrollbar …
 				if($('#app-content').get(0).scrollHeight > $('#app-content').height()) {
 					if($(window).width() > 768) {
-						controlsWidth = $('#content').width() - $('#app-navigation').width() - getScrollBarWidth();
+						controlsWidth = $('#content').width() - $('#app-navigation').width() - $('#app-sidebar').width() - getScrollBarWidth();
 					} else {
 						controlsWidth = $('#content').width() - getScrollBarWidth();
 					}
 				} else { // if there is none
 					if($(window).width() > 768) {
-						controlsWidth = $('#content').width() - $('#app-navigation').width();
+						controlsWidth = $('#content').width() - $('#app-navigation').width() - $('#app-sidebar').width();
 					} else {
 						controlsWidth = $('#content').width();
 					}