diff options
| author | Henri Kerola <henri.kerola@itmill.com> | 2010-09-17 10:33:44 +0000 |
|---|---|---|
| committer | Henri Kerola <henri.kerola@itmill.com> | 2010-09-17 10:33:44 +0000 |
| commit | 9a7024c8dd199b7f76350d5a4f09a4cead79e39f (patch) | |
| tree | 28b3fa3a6e01153a87074fc19cc44f3cd5428750 /build/buildhelpers/com | |
| parent | 425bb03b222da153ac252b01b3ca46d1e714d869 (diff) | |
| download | vaadin-framework-9a7024c8dd199b7f76350d5a4f09a4cead79e39f.tar.gz vaadin-framework-9a7024c8dd199b7f76350d5a4f09a4cead79e39f.zip | |
Liferay Alloy UI theme for Vaadin
svn changeset:14986/svn branch:6.4
Diffstat (limited to 'build/buildhelpers/com')
| -rw-r--r-- | build/buildhelpers/com/vaadin/buildhelpers/CompileDefaultTheme.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/build/buildhelpers/com/vaadin/buildhelpers/CompileDefaultTheme.java b/build/buildhelpers/com/vaadin/buildhelpers/CompileDefaultTheme.java index b4c016d434..84c025a720 100644 --- a/build/buildhelpers/com/vaadin/buildhelpers/CompileDefaultTheme.java +++ b/build/buildhelpers/com/vaadin/buildhelpers/CompileDefaultTheme.java @@ -25,6 +25,7 @@ public class CompileDefaultTheme { private static final String BASE = "base"; private static final String RUNO = "runo"; private static final String REINDEER = "reindeer"; + private static final String LIFERAY = "liferay"; /** * @param args @@ -43,6 +44,7 @@ public class CompileDefaultTheme { combineTheme(new String[] { BASE }, false, ver); combineTheme(new String[] { BASE, RUNO }, false, ver); combineTheme(new String[] { BASE, REINDEER }, true, ver); + combineTheme(new String[] { BASE, LIFERAY }, false, ver); } /** @@ -163,7 +165,9 @@ public class CompileDefaultTheme { urlPrefix = "../" + themeName + "/"; } - if (strLine.indexOf("url(../") > 0) { + if (strLine.indexOf("url(/") > 0) { + // Do nothing for urls beginning with / + } else if (strLine.indexOf("url(../") > 0) { strLine = strLine.replaceAll("url\\(../", ("url\\(" + urlPrefix)); |