From b882b5fdd069615665aaf09d5857d42cf8ead7aa Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hnategh@gmail.com>
Date: Wed, 17 Mar 2021 11:55:20 +0100
Subject: [PATCH] Fix framework in compact theme stalls on applications load
 when there's a framework tab

---
 pixelegg/css/mobile.css       | 6 ++++++
 pixelegg/css/mobile.less      | 2 ++
 pixelegg/js/fw_mobile.js      | 5 ++---
 pixelegg/mobile/fw_mobile.css | 6 ++++++
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css
index 73dd0a0c60..54c91b9421 100644
--- a/pixelegg/css/mobile.css
+++ b/pixelegg/css/mobile.css
@@ -7538,12 +7538,18 @@ img.et2_button_icon[src*="svg"]:hover {
   body #egw_fw_sidebar.avatarSubmenu {
     top: 325px;
   }
+  body #egw_fw_sidebar {
+    background-color: white;
+  }
   body #egw_fw_sidebar #egw_fw_sidemenu::-webkit-scrollbar {
     width: 1px;
   }
   body #egw_fw_sidebar #egw_fw_sidemenu {
     overflow-y: auto;
   }
+  body #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_icon {
+    filter: none;
+  }
   body #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_apps .egw_fw_ui_sidemenu_entry_header {
     margin: 0px 5px 0px 2px;
     padding: 4px 10px 0 0px;
diff --git a/pixelegg/css/mobile.less b/pixelegg/css/mobile.less
index f54cdd6f83..157f0ca402 100644
--- a/pixelegg/css/mobile.less
+++ b/pixelegg/css/mobile.less
@@ -467,10 +467,12 @@
 		//###################
 		#egw_fw_sidebar.avatarSubmenu {top:325px;}
 		#egw_fw_sidebar{
+			background-color: white;
 			#egw_fw_sidemenu::-webkit-scrollbar {width: 1px;}
 			//SIDE AREA
 			#egw_fw_sidemenu {
 				overflow-y: auto;
+				.egw_fw_ui_sidemenu_entry_icon {filter:none;}
 				.egw_fw_ui_sidemenu_entry_apps {
 					.egw_fw_ui_sidemenu_entry_header
 					{
diff --git a/pixelegg/js/fw_mobile.js b/pixelegg/js/fw_mobile.js
index a84566af64..92ee49c3bd 100644
--- a/pixelegg/js/fw_mobile.js
+++ b/pixelegg/js/fw_mobile.js
@@ -547,7 +547,7 @@
 		{
 			var restore = this._super.apply(this, arguments);
 			var activeApp = '';
-
+			if (!egwIsMobile()) _apps = this.apps;
 			/**
 			 * Check if the given app is in the navbar or not
 			 *
@@ -559,8 +559,7 @@
 				for(var i=0; i< _apps.length; i++)
 				{
 					// Do not show applications which are not suppose to be shown on nabvar, except home
-					if ((appName == _apps[i].name && !_apps[i]['noNavbar']) ||
-							(appName == _apps[i].name && _apps[i]['name'] == 'home')) return true;
+					if (appName == _apps[i].name && (!_apps[i]['noNavbar'] || _apps[i]['name'] == 'home')) return true;
 				}
 				return false;
 			};
diff --git a/pixelegg/mobile/fw_mobile.css b/pixelegg/mobile/fw_mobile.css
index f87e60e29f..400bffb3b1 100644
--- a/pixelegg/mobile/fw_mobile.css
+++ b/pixelegg/mobile/fw_mobile.css
@@ -7359,12 +7359,18 @@ img.et2_button_icon[src*="svg"]:hover {
   body #egw_fw_sidebar.avatarSubmenu {
     top: 325px;
   }
+  body #egw_fw_sidebar {
+    background-color: white;
+  }
   body #egw_fw_sidebar #egw_fw_sidemenu::-webkit-scrollbar {
     width: 1px;
   }
   body #egw_fw_sidebar #egw_fw_sidemenu {
     overflow-y: auto;
   }
+  body #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_icon {
+    filter: none;
+  }
   body #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_apps .egw_fw_ui_sidemenu_entry_header {
     margin: 0px 5px 0px 2px;
     padding: 4px 10px 0 0px;