midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-2569:ZK7 - Unexpected token in DSP/CSS

This commit is contained in:
hieplq 2015-04-10 13:19:44 +07:00
parent 71e60b3f41
commit 6c8e1d4d0a
4 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
org.adempiere.ui.zk/theme.zs
View File

@ -3,3 +3,16 @@ var themeStyleSheet = ThemeManager.getStyleSheet();
var themeStyleSheetByBrowser = ThemeManager.getStyleSheetByBrowser(); var themeStyleSheetByBrowser = ThemeManager.getStyleSheetByBrowser();
var browserIcon = ThemeManager.getBrowserIcon(); var browserIcon = ThemeManager.getBrowserIcon();
var themePreference = ThemeManager.getPreference(); var themePreference = ThemeManager.getPreference();
var fontSizeM = org.zkoss.lang.Library.getProperty("org.zkoss.zul.theme.fontSizeM");
var fontSizeS = org.zkoss.lang.Library.getProperty("org.zkoss.zul.theme.fontSizeS");
var fontSizeXS = org.zkoss.lang.Library.getProperty("org.zkoss.zul.theme.fontSizeXS");
var fontSizeMS = org.zkoss.lang.Library.getProperty("org.zkoss.zul.theme.fontSizeMS");
var fontFamilyC = org.zkoss.lang.Library.getProperty("org.zkoss.zul.theme.fontFamilyC");
if (fontFamilyC != null){
fontFamilyC = "font-family:" + fontFamilyC + ";";
}
if (fontSizeM != null){
fontSizeM = "font-size:" + fontSizeM + ";";
}

2
org.adempiere.ui.zk/theme/default/css/fragment/adwindow.css.dsp
View File

@ -134,7 +134,7 @@
.adwindow-detailpane-toolbar .z-toolbar-body .docstatus-normal .z-label, .adwindow-detailpane-toolbar .z-toolbar-body .docstatus-normal .z-label,
.adwindow-detailpane-toolbar .z-toolbar-body .docstatus-error .z-label { .adwindow-detailpane-toolbar .z-toolbar-body .docstatus-error .z-label {
font-size: ${c:property('org.zkoss.zul.theme.fontSizeM')}; ${fontSizeM};
} }
.adwindow-detailpane-message { .adwindow-detailpane-message {

20
org.adempiere.ui.zk/theme/default/css/fragment/menu-tree.css.dsp
View File

@ -2,8 +2,8 @@
<%@ taglib uri="http://www.idempiere.org/dsp/web/util" prefix="u" %> <%@ taglib uri="http://www.idempiere.org/dsp/web/util" prefix="u" %>
.menu-treecell-cnt { .menu-treecell-cnt {
border: 0; margin: 0; padding: 0; border: 0; margin: 0; padding: 0;
font-family: ${c:property('org.zkoss.zul.theme.fontFamilyC')}; ${fontFamilyC};
font-size: ${c:property('org.zkoss.zul.theme.fontSizeM')}; ${fontSizeM};
font-weight: normal; font-weight: normal;
overflow-x: hidden; overflow-x: hidden;
white-space: nowrap; white-space: nowrap;
@ -14,15 +14,16 @@
div.z-tree-body td.menu-tree-cell { div.z-tree-body td.menu-tree-cell {
cursor: pointer; cursor: pointer;
padding: 0 2px; padding: 0 2px;
font-size: ${c:property('org.zkoss.zul.theme.fontSizeM')}; ${fontSizeM};
font-weight: normal; font-weight: normal;
overflow: visible; overflow: visible;
} }
div.menu-tree-cell-cnt { div.menu-tree-cell-cnt {
border: 0; margin: 0; padding: 0; border: 0; margin: 0; padding: 0;
font-family: ${c:property('org.zkoss.zul.theme.fontFamilyC')}; ${fontFamilyC};
font-size: ${c:property('org.zkoss.zul.theme.fontSizeM')}; font-weight: normal; ${fontSizeM};
font-weight: normal;
white-space:nowrap white-space:nowrap
} }
@ -38,15 +39,18 @@ td.menu-tree-cell-disd a:visited, td.menu-tree-cell-disd a:hover {
div.z-dottree-body td.menu-tree-cell { div.z-dottree-body td.menu-tree-cell {
cursor: pointer; padding: 0 2px; cursor: pointer; padding: 0 2px;
font-size: ${c:property('org.zkoss.zul.theme.fontSizeM')}; font-weight: normal; overflow: visible; ${fontSizeM};
font-weight: normal; overflow: visible;
} }
div.z-filetree-body td.menu-tree-cell { div.z-filetree-body td.menu-tree-cell {
cursor: pointer; padding: 0 2px; cursor: pointer; padding: 0 2px;
font-size: ${c:property('org.zkoss.zul.theme.fontSizeM')}; font-weight: normal; overflow: visible; ${fontSizeM};
font-weight: normal; overflow: visible;
} }
div.z-vfiletree-body td.menu-tree-cell { div.z-vfiletree-body td.menu-tree-cell {
cursor: pointer; padding: 0 2px; cursor: pointer; padding: 0 2px;
font-size: ${c:property('org.zkoss.zul.theme.fontSizeM')}; font-weight: normal; overflow: visible; ${fontSizeM};
font-weight: normal; overflow: visible;
} }

4
org.adempiere.ui.zk/theme/default/css/fragment/tree.css.dsp
View File

@ -1,7 +1,7 @@
<%@ taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c" %> <%@ taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c" %>
.z-treecell-content { .z-treecell-content {
font-family: ${c:property('org.zkoss.zul.theme.fontFamilyC')}; ${fontFamilyC};
font-size: ${c:property('org.zkoss.zul.theme.fontSizeM')}; ${fontSizeM};
} }
.z-treecell-content { .z-treecell-content {