diff options
| -rw-r--r-- | WebContent/VAADIN/themes/valo/shared/_variables.scss | 2 | ||||
| -rwxr-xr-x | build/ide.xml | 3 | ||||
| -rw-r--r-- | buildhelpers/src/com/vaadin/buildhelpers/CompileTheme.java | 11 | ||||
| -rw-r--r-- | themes/build.xml | 3 |
4 files changed, 15 insertions, 4 deletions
diff --git a/WebContent/VAADIN/themes/valo/shared/_variables.scss b/WebContent/VAADIN/themes/valo/shared/_variables.scss index c7f9693eef..8adc3667d3 100644 --- a/WebContent/VAADIN/themes/valo/shared/_variables.scss +++ b/WebContent/VAADIN/themes/valo/shared/_variables.scss @@ -129,4 +129,4 @@ $valo-include-common-stylenames : true // The Vaadin compiler parses URL paths differently than the regular Sass compiler (i.e. Vaadin modifies relative url paths). // This boolean is used to flag which compiler is used, so that paths are correct for different resources. // false == Ruby, true == Vaadin -$v-relative-paths: false !default; +$v-relative-paths: true !default; diff --git a/build/ide.xml b/build/ide.xml index 525e16d88d..0775a67505 100755 --- a/build/ide.xml +++ b/build/ide.xml @@ -53,6 +53,9 @@ <antcall target="compile-theme"> <param name="theme" value="liferay" /> </antcall> + <antcall target="compile-theme"> + <param name="theme" value="valo" /> + </antcall> </target> <target name="compile-theme"> diff --git a/buildhelpers/src/com/vaadin/buildhelpers/CompileTheme.java b/buildhelpers/src/com/vaadin/buildhelpers/CompileTheme.java index 0fa4a7e8ab..d97025bdb6 100644 --- a/buildhelpers/src/com/vaadin/buildhelpers/CompileTheme.java +++ b/buildhelpers/src/com/vaadin/buildhelpers/CompileTheme.java @@ -73,9 +73,14 @@ public class CompileTheme { } // Legacy theme w/o .themename{} wrapping try { - processSassTheme(themeFolder, themeName, "legacy-styles", version); - System.out.println("Compiling theme " + themeName - + " legacy-styles successful"); + String legacyFile = themeFolder + File.separator + themeName + + File.separator + "legacy-styles.scss"; + if (new File(legacyFile).exists()) { + processSassTheme(themeFolder, themeName, "legacy-styles", + version); + System.out.println("Compiling theme " + themeName + + " legacy-styles successful"); + } } catch (Exception e) { System.err.println("Compiling theme " + themeName + " legacy-styles failed"); diff --git a/themes/build.xml b/themes/build.xml index efbaaaa18f..0135f55071 100644 --- a/themes/build.xml +++ b/themes/build.xml @@ -40,6 +40,9 @@ <antcall target="compile-theme"> <param name="theme" value="liferay" /> </antcall> + <antcall target="compile-theme"> + <param name="theme" value="valo" /> + </antcall> </target> <target name="jar" depends="compile-themes"> |