diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css index 63abdc936e..2590826a7d 100644 --- a/pixelegg/css/mobile.css +++ b/pixelegg/css/mobile.css @@ -7381,12 +7381,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 6a38884fed..62f66686eb 100644 --- a/pixelegg/css/mobile.less +++ b/pixelegg/css/mobile.less @@ -465,10 +465,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 06504b7fc1..6777dd89a6 100644 --- a/pixelegg/js/fw_mobile.js +++ b/pixelegg/js/fw_mobile.js @@ -546,7 +546,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 * @@ -558,8 +558,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 40d09b985c..8d4291cc39 100644 --- a/pixelegg/mobile/fw_mobile.css +++ b/pixelegg/mobile/fw_mobile.css @@ -7202,12 +7202,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;