diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessModalDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessModalDialog.java index a68116e8a2..ddcb1db99a 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessModalDialog.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessModalDialog.java @@ -87,7 +87,7 @@ public class ProcessModalDialog extends AbstractProcessDialog implements EventLi if (mainParameterLayout != null)// when auto start it's null { mainParameterLayout.setStyle("max-height:" + ClientInfo.get().desktopHeight + "px"); - ZKUpdateUtil.setVflex(mainParameterLayout, "min"); + ZKUpdateUtil.setVflex(mainParameterLayout, "1"); } if (topParameterLayout != null) { diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/UserPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/UserPanel.java index 7b23d1a960..2093fc4e48 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/UserPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/UserPanel.java @@ -307,8 +307,8 @@ public class UserPanel implements EventListener, Composer popup.detach(); } popup = new Popup(); + popup.setSclass("user-panel-popup"); Vlayout layout = new Vlayout(); - layout.setStyle("padding: 8px 16px"); String email = getUserEmail(); if (!Util.isEmpty(email)) { @@ -330,6 +330,7 @@ public class UserPanel implements EventListener, Composer popup.setPage(component.getPage()); popup.setVflex("min"); popup.setHflex("min"); + popup.setStyle("max-width: " + ClientInfo.get().desktopWidth + "px"); popup.addEventListener(Events.ON_OPEN, (OpenEvent oe) -> { if (!oe.isOpen()) popup.setAttribute(popup.getUuid(), System.currentTimeMillis()); diff --git a/org.adempiere.ui.zk/theme/default/css/fragment/desktop.css.dsp b/org.adempiere.ui.zk/theme/default/css/fragment/desktop.css.dsp index 2339727015..4205f0dc70 100644 --- a/org.adempiere.ui.zk/theme/default/css/fragment/desktop.css.dsp +++ b/org.adempiere.ui.zk/theme/default/css/fragment/desktop.css.dsp @@ -241,3 +241,11 @@ padding: 3px 3px; } +.user-panel-popup .z-popup-content { + padding-left: 0px; + padding-right: 0px; +} +.user-panel-popup .z-popup-content > .z-vlayout { + overflow-x: auto; + padding: 8px; +} diff --git a/org.adempiere.ui.zk/theme/default/css/fragment/parameter-process.css.dsp b/org.adempiere.ui.zk/theme/default/css/fragment/parameter-process.css.dsp index 835e68fbaa..022b789362 100644 --- a/org.adempiere.ui.zk/theme/default/css/fragment/parameter-process.css.dsp +++ b/org.adempiere.ui.zk/theme/default/css/fragment/parameter-process.css.dsp @@ -76,12 +76,12 @@ when detect side effect, fix to only apply for parameter window*/ } @media screen and (max-width: 700px) { .input-paramenter-layout{ - width: 90%; + width: 90% !important; } } @media screen and (max-width: 500px) { .input-paramenter-layout{ - width: 100%; + width: 100% !important; } }