diff options
| author | Henri Sara <henri.sara@itmill.com> | 2011-07-28 13:39:15 +0000 |
|---|---|---|
| committer | Henri Sara <henri.sara@itmill.com> | 2011-07-28 13:39:15 +0000 |
| commit | 2cfdbc9becea1f9f26db1542a4cc4c7198d2225e (patch) | |
| tree | b47d503a071372126b9186cca02000f4899c17dd /build | |
| parent | a142bc4fc4f4a582f53915ac3eb7872df9429c44 (diff) | |
| download | vaadin-framework-2cfdbc9becea1f9f26db1542a4cc4c7198d2225e.tar.gz vaadin-framework-2cfdbc9becea1f9f26db1542a4cc4c7198d2225e.zip | |
#7053 Chameleon theme integration, first phase: basic theme in Vaadin and JAR, compiled into a single styles.css
svn changeset:20007/svn branch:6.7
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); } /** |