diff options
5 files changed, 14 insertions, 21 deletions
diff --git a/WebContent/VAADIN/themes/chameleon/chameleon.scss b/WebContent/VAADIN/themes/chameleon/chameleon.scss index e510e27d70..8a24a73cbf 100644 --- a/WebContent/VAADIN/themes/chameleon/chameleon.scss +++ b/WebContent/VAADIN/themes/chameleon/chameleon.scss @@ -1,4 +1,4 @@ -@import "base.scss"; +@import "../base/base.scss"; @import "common/common.scss"; @import "components/components.scss"; @import "compound/compound.scss"; diff --git a/WebContent/VAADIN/themes/liferay/liferay.scss b/WebContent/VAADIN/themes/liferay/liferay.scss index 9491740268..7ec561ffc9 100644 --- a/WebContent/VAADIN/themes/liferay/liferay.scss +++ b/WebContent/VAADIN/themes/liferay/liferay.scss @@ -1,4 +1,4 @@ -@import "base.scss"; +@import "../base/base.scss"; @import "accordion/accordion.scss"; @import "button/button.scss"; diff --git a/WebContent/VAADIN/themes/reindeer/reindeer.scss b/WebContent/VAADIN/themes/reindeer/reindeer.scss index 52989dc487..e102e99bc5 100644 --- a/WebContent/VAADIN/themes/reindeer/reindeer.scss +++ b/WebContent/VAADIN/themes/reindeer/reindeer.scss @@ -1,4 +1,4 @@ -@import "base.scss"; +@import "../base/base.scss"; // common between others for now for backwards compatibility @import "accordion/accordion.scss"; diff --git a/WebContent/VAADIN/themes/runo/runo.scss b/WebContent/VAADIN/themes/runo/runo.scss index aca94d19d7..6db7c335cb 100644 --- a/WebContent/VAADIN/themes/runo/runo.scss +++ b/WebContent/VAADIN/themes/runo/runo.scss @@ -1,4 +1,4 @@ -@import "base.scss"; +@import "../base/base.scss"; @import "absolutelayout/absolutelayout.scss"; @import "accordion/accordion.scss"; diff --git a/theme-compiler/src/com/vaadin/sass/resolver/VaadinResolver.java b/theme-compiler/src/com/vaadin/sass/resolver/VaadinResolver.java index acf22a3168..93fdf6bfec 100644 --- a/theme-compiler/src/com/vaadin/sass/resolver/VaadinResolver.java +++ b/theme-compiler/src/com/vaadin/sass/resolver/VaadinResolver.java @@ -1,32 +1,24 @@ package com.vaadin.sass.resolver; -import java.io.File; - import org.w3c.css.sac.InputSource; public class VaadinResolver implements ScssStylesheetResolver { @Override public InputSource resolve(String identifier) { + String ext = ".scss"; if (identifier.endsWith(".css")) { - ScssStylesheetResolver resolver = new FilesystemResolver(); - return resolver.resolve(identifier); + ext = ".css"; } - if (identifier.endsWith(".scss")) { + // 'normalize' identifier to use in themeFile + String fileName = identifier; + if (identifier.endsWith(ext)) { identifier = identifier.substring(0, - identifier.length() - ".scss".length()); - } - String fileName = identifier + ".scss"; - - String name = new File(identifier).getName(); - File parent = new File(identifier).getParentFile(); - if (parent != null) { - parent = parent.getParentFile(); + identifier.length() - ext.length()); } - - String themeFile = (parent == null ? "" : parent + "/") + name + "/" - + name + ".scss"; + // also look here + String themeFile = "VAADIN/themes/" + identifier + "/" + fileName; // first plain file ScssStylesheetResolver resolver = new FilesystemResolver(); @@ -45,9 +37,10 @@ public class VaadinResolver implements ScssStylesheetResolver { } if (source == null) { // then try theme via classloader - source = resolver.resolve("VAADIN/themes/" + themeFile); + source = resolver.resolve(themeFile); } return source; } + } |