From 4e121d20eed189f9c603fbf87899e6bd1857d49d Mon Sep 17 00:00:00 2001 From: hengsin Date: Tue, 10 Nov 2020 03:52:50 +0800 Subject: [PATCH] IDEMPIERE-4529 Set Default Desktop Font size by Screen Width (#365) --- .../theme/default/css/theme.css.dsp | 28 +++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/org.adempiere.ui.zk/theme/default/css/theme.css.dsp b/org.adempiere.ui.zk/theme/default/css/theme.css.dsp index 488630827d..07ce46c298 100644 --- a/org.adempiere.ui.zk/theme/default/css/theme.css.dsp +++ b/org.adempiere.ui.zk/theme/default/css/theme.css.dsp @@ -18,15 +18,39 @@ html,body { } [class*="z-"]:not([class*="z-icon-"]):not([class*="z-group-icon-"]) { - font-size: 14px; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif; } +@media screen and (min-device-width: 2500px) { + [class*="z-"]:not([class*="z-icon-"]):not([class*="z-group-icon-"]) { + font-size: 15px; + } +} +@media screen and (max-device-width: 2499px) { + [class*="z-"]:not([class*="z-icon-"]):not([class*="z-group-icon-"]) { + font-size: 14px; + } +} +@media screen and (max-device-width: 1899px) { + [class*="z-"]:not([class*="z-icon-"]):not([class*="z-group-icon-"]) { + font-size: 13px; + } +} +@media screen and (max-device-width: 1399px) { + [class*="z-"]:not([class*="z-icon-"]):not([class*="z-group-icon-"]) { + font-size: 12px; + } +} <%-- Mobile/Tablet --%> .tablet-scrolling { -webkit-overflow-scrolling: touch; } -.mobile [class*="z-"] { +<%-- default font size for mobile --%> +.mobile [class*="z-"]:not([class*="z-icon-"]):not([class*="z-group-icon-"]) { + font-size: 16px; +} +<%-- the not=xyz is needed to get this selected over standard zk rule --%> +.mobile [class*="z-icon-"]:not([class*="xyz"]), .mobile [class*="z-group-icon-"] { font-size: 16px; }