diff options
6 files changed, 16 insertions, 3 deletions
diff --git a/WebContent/VAADIN/themes/runo/panel/panel.scss b/WebContent/VAADIN/themes/runo/panel/panel.scss index 1243cfbb77..66fb751d88 100644 --- a/WebContent/VAADIN/themes/runo/panel/panel.scss +++ b/WebContent/VAADIN/themes/runo/panel/panel.scss @@ -38,7 +38,7 @@ } .#{$primaryStyleName}-deco:before { display: block; - + content: ""; width: 9px; height: 9px; margin-left: -9px; diff --git a/server/src/com/vaadin/ui/AbstractSplitPanel.java b/server/src/com/vaadin/ui/AbstractSplitPanel.java index 5e3f7ec24d..689feda7ed 100644 --- a/server/src/com/vaadin/ui/AbstractSplitPanel.java +++ b/server/src/com/vaadin/ui/AbstractSplitPanel.java @@ -357,7 +357,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer { * the unit (from {@link Sizeable}) in which the size is given. * Allowed units are UNITS_PERCENTAGE and UNITS_PIXELS */ - public void setMinSplitPosition(int pos, Unit unit) { + public void setMinSplitPosition(float pos, Unit unit) { setSplitPositionLimits(pos, unit, getSplitterState().maxPosition, posMaxUnit); } diff --git a/theme-compiler/src/com/vaadin/sass/internal/visitor/ImportNodeHandler.java b/theme-compiler/src/com/vaadin/sass/internal/visitor/ImportNodeHandler.java index 1ba1072767..67e6df6383 100644 --- a/theme-compiler/src/com/vaadin/sass/internal/visitor/ImportNodeHandler.java +++ b/theme-compiler/src/com/vaadin/sass/internal/visitor/ImportNodeHandler.java @@ -100,7 +100,9 @@ public class ImportNodeHandler { LexicalUnit value = ((RuleNode) child).getValue(); while (value != null) { if (value.getLexicalUnitType() == LexicalUnit.SAC_URI) { - String path = value.getStringValue(); + String path = value.getStringValue() + .replaceAll("^\"|\"$", "") + .replaceAll("^'|'$", ""); if (!path.startsWith("/") && !path.contains(":")) { path = prefix + path; path = StringUtil.cleanPath(path); diff --git a/theme-compiler/tests/resources/automatic/css/url-path.css b/theme-compiler/tests/resources/automatic/css/url-path.css new file mode 100644 index 0000000000..1045948ac8 --- /dev/null +++ b/theme-compiler/tests/resources/automatic/css/url-path.css @@ -0,0 +1,5 @@ +.bar { + background: url(foo/lorem.png); + background: url(foo/lorem.png); + background: url(foo/lorem.png); +}
\ No newline at end of file diff --git a/theme-compiler/tests/resources/automatic/scss/foo/bar.scss b/theme-compiler/tests/resources/automatic/scss/foo/bar.scss new file mode 100644 index 0000000000..326d34232d --- /dev/null +++ b/theme-compiler/tests/resources/automatic/scss/foo/bar.scss @@ -0,0 +1,5 @@ +.bar { + background: url("lorem.png"); + background: url('lorem.png'); + background: url(lorem.png); +}
\ No newline at end of file diff --git a/theme-compiler/tests/resources/automatic/scss/url-path.scss b/theme-compiler/tests/resources/automatic/scss/url-path.scss new file mode 100644 index 0000000000..0cc954bfb4 --- /dev/null +++ b/theme-compiler/tests/resources/automatic/scss/url-path.scss @@ -0,0 +1 @@ +@import "foo/bar.scss";
\ No newline at end of file |