diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.xml | 4 | ||||
| -rw-r--r-- | build/buildhelpers/com/vaadin/buildhelpers/CompileDefaultTheme.java | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/build/build.xml b/build/build.xml index 3197f15c56..de31bb1121 100644 --- a/build/build.xml +++ b/build/build.xml @@ -269,10 +269,10 @@ <zipfileset prefix="VAADIN/themes" dir="${output-dir}/WebContent/VAADIN/themes"> <patternset> <include name="base/**/*" /> + <include name="chameleon/**/*" /> <include name="liferay/**/*" /> <include name="runo/**/*" /> <include name="reindeer/**/*" /> - <include name="default/**/*" /> </patternset> </zipfileset> @@ -819,7 +819,7 @@ <patternset> <include name="VAADIN/widgetsets/com.vaadin.terminal.gwt.DefaultWidgetSet/**/*" /> <include name="VAADIN/themes/base/**/*" /> - <include name="VAADIN/themes/default/**/*" /> + <include name="VAADIN/themes/chameleon/**/*" /> <include name="VAADIN/themes/liferay/**/*" /> <include name="VAADIN/themes/runo/**/*" /> <include name="VAADIN/themes/reindeer/**/*" /> diff --git a/build/buildhelpers/com/vaadin/buildhelpers/CompileDefaultTheme.java b/build/buildhelpers/com/vaadin/buildhelpers/CompileDefaultTheme.java index 84c025a720..eab61315a1 100644 --- a/build/buildhelpers/com/vaadin/buildhelpers/CompileDefaultTheme.java +++ b/build/buildhelpers/com/vaadin/buildhelpers/CompileDefaultTheme.java @@ -26,6 +26,7 @@ public class CompileDefaultTheme { private static final String RUNO = "runo"; private static final String REINDEER = "reindeer"; private static final String LIFERAY = "liferay"; + private static final String CHAMELEON = "chameleon"; /** * @param args @@ -45,6 +46,9 @@ public class CompileDefaultTheme { combineTheme(new String[] { BASE, RUNO }, false, ver); combineTheme(new String[] { BASE, REINDEER }, true, ver); combineTheme(new String[] { BASE, LIFERAY }, false, ver); + // Chameleon uses some images from reindeer but does not require + // compilation together with it + combineTheme(new String[] { BASE, CHAMELEON }, false, ver); } /** |