From ae27f90efe554d3a8a069165fe14cfd50445855d Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Thu, 6 Aug 2015 11:45:12 +0200
Subject: [PATCH] Fix app-content scrollbar when app-sidebar is open

---
 core/css/apps.css   |  6 +++---
 core/css/mobile.css |  6 +-----
 core/js/apps.js     | 10 ++++------
 core/js/js.js       |  4 ++--
 4 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/core/css/apps.css b/core/css/apps.css
index 091bb2c22f..5769120c5e 100644
--- a/core/css/apps.css
+++ b/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 {
diff --git a/core/css/mobile.css b/core/css/mobile.css
index e38d9756d9..2256d821d7 100644
--- a/core/css/mobile.css
+++ b/core/css/mobile.css
@@ -103,11 +103,7 @@
 	z-index: 1000;
 }
 
-#app-sidebar {
-	width: 250px;
-}
-
-#app-sidebar ~ .with-app-sidebar {
+#app-sidebar{
 	width: 100%;
 }
 
diff --git a/core/js/apps.js b/core/js/apps.js
index 5d9bbeb870..d0d351f514 100644
--- a/core/js/apps.js
+++ b/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');
 	};
 
 	/**
diff --git a/core/js/js.js b/core/js/js.js
index 45c9c90362..72d4edd28d 100644
--- a/core/js/js.js
+++ b/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();
 					}