holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Hadi Nategh 2021-03-17 11:55:20 +01:00
parent 0e9f368cec
commit b882b5fdd0
4 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pixelegg/css/mobile.css
View File

@ -7538,12 +7538,18 @@ img.et2_button_icon[src*="svg"]:hover {
body #egw_fw_sidebar.avatarSubmenu { body #egw_fw_sidebar.avatarSubmenu {
top: 325px; top: 325px;
} }
body #egw_fw_sidebar {
background-color: white;
}
body #egw_fw_sidebar #egw_fw_sidemenu::-webkit-scrollbar { body #egw_fw_sidebar #egw_fw_sidemenu::-webkit-scrollbar {
width: 1px; width: 1px;
} }
body #egw_fw_sidebar #egw_fw_sidemenu { body #egw_fw_sidebar #egw_fw_sidemenu {
overflow-y: auto; 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 { body #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_apps .egw_fw_ui_sidemenu_entry_header {
margin: 0px 5px 0px 2px; margin: 0px 5px 0px 2px;
padding: 4px 10px 0 0px; padding: 4px 10px 0 0px;

2
pixelegg/css/mobile.less
View File

@ -467,10 +467,12 @@
//################### //###################
#egw_fw_sidebar.avatarSubmenu {top:325px;} #egw_fw_sidebar.avatarSubmenu {top:325px;}
#egw_fw_sidebar{ #egw_fw_sidebar{
background-color: white;
#egw_fw_sidemenu::-webkit-scrollbar {width: 1px;} #egw_fw_sidemenu::-webkit-scrollbar {width: 1px;}
//SIDE AREA //SIDE AREA
#egw_fw_sidemenu { #egw_fw_sidemenu {
overflow-y: auto; overflow-y: auto;
.egw_fw_ui_sidemenu_entry_icon {filter:none;}
.egw_fw_ui_sidemenu_entry_apps { .egw_fw_ui_sidemenu_entry_apps {
.egw_fw_ui_sidemenu_entry_header .egw_fw_ui_sidemenu_entry_header
{ {

5
pixelegg/js/fw_mobile.js
View File

@ -547,7 +547,7 @@
{ {
var restore = this._super.apply(this, arguments); var restore = this._super.apply(this, arguments);
var activeApp = ''; var activeApp = '';
if (!egwIsMobile()) _apps = this.apps;
/** /**
* Check if the given app is in the navbar or not * Check if the given app is in the navbar or not
* *
@ -559,8 +559,7 @@
for(var i=0; i< _apps.length; i++) for(var i=0; i< _apps.length; i++)
{ {
// Do not show applications which are not suppose to be shown on nabvar, except home // Do not show applications which are not suppose to be shown on nabvar, except home
if ((appName == _apps[i].name && !_apps[i]['noNavbar']) || if (appName == _apps[i].name && (!_apps[i]['noNavbar'] || _apps[i]['name'] == 'home')) return true;
(appName == _apps[i].name && _apps[i]['name'] == 'home')) return true;
} }
return false; return false;
}; };

6
pixelegg/mobile/fw_mobile.css
View File

@ -7359,12 +7359,18 @@ img.et2_button_icon[src*="svg"]:hover {
body #egw_fw_sidebar.avatarSubmenu { body #egw_fw_sidebar.avatarSubmenu {
top: 325px; top: 325px;
} }
body #egw_fw_sidebar {
background-color: white;
}
body #egw_fw_sidebar #egw_fw_sidemenu::-webkit-scrollbar { body #egw_fw_sidebar #egw_fw_sidemenu::-webkit-scrollbar {
width: 1px; width: 1px;
} }
body #egw_fw_sidebar #egw_fw_sidemenu { body #egw_fw_sidebar #egw_fw_sidemenu {
overflow-y: auto; 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 { body #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_apps .egw_fw_ui_sidemenu_entry_header {
margin: 0px 5px 0px 2px; margin: 0px 5px 0px 2px;
padding: 4px 10px 0 0px; padding: 4px 10px 0 0px;