From 912767b4ecfdb291a74909529352213ee3d8805a Mon Sep 17 00:00:00 2001 From: hengsin Date: Wed, 6 May 2020 20:42:37 +0800 Subject: [PATCH] IDEMPIERE-4266 Remove hard coded modal dialog height (#32) * IDEMPIERE-4266 Remove hard coded modal dialog height Replace fixed process modal dialog height with css flex box rule. * IDEMPIERE-4266 Remove hard coded modal dialog height Fix css for process/report dialog. --- .../default/css/fragment/parameter-process.css.dsp | 10 ++++++++-- .../theme/default/css/fragment/window-size.css.dsp | 10 ---------- 2 files changed, 8 insertions(+), 12 deletions(-) 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 9dd9e9e3aa..8f8a668c84 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 @@ -5,11 +5,15 @@ it fix some issue relate resize, but can make side effect when detect side effect, fix to only apply for parameter window*/ .z-window.z-window-noborder.z-window-noheader.z-window-embedded, .z-window.z-window-noborder.z-window-noheader.z-window-embedded .z-window-content, -.main-parameter-layout{ +.main-parameter-layout { height: 100%; } +.process-modal-dialog .main-parameter-layout{ + height: auto; + flex-basis: auto; +} .process-modal-dialog.z-window > .z-window-content { - flex: 1 1 0; + flex: 1 1 auto; } .main-parameter-layout, @@ -28,6 +32,8 @@ when detect side effect, fix to only apply for parameter window*/ } .top-parameter-layout{ overflow: auto; + padding-bottom: 2vh; + flex-basis: auto; } .bottom-parameter-layout{ diff --git a/org.adempiere.ui.zk/theme/default/css/fragment/window-size.css.dsp b/org.adempiere.ui.zk/theme/default/css/fragment/window-size.css.dsp index d69950d3e7..236cf36090 100644 --- a/org.adempiere.ui.zk/theme/default/css/fragment/window-size.css.dsp +++ b/org.adempiere.ui.zk/theme/default/css/fragment/window-size.css.dsp @@ -386,13 +386,3 @@ } } -@media screen and (max-height: 500px) { - .popup-dialog.process-modal-dialog { - height: 100%; - } -} -@media screen and (min-height: 501px) { - .popup-dialog.process-modal-dialog { - min-height: 500px; - } -}