Fix framework in compact theme stalls on applications load when there's a framework tab

This commit is contained in:
Hadi Nategh 2021-03-17 11:55:20 +01:00
parent e01059f3b6
commit 3dc697e8fc
4 changed files with 16 additions and 3 deletions

View File

@ -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;

View File

@ -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
{

View File

@ -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;
};

View File

@ -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;