diff options
author | Mika Murtojarvi <mika@vaadin.com> | 2013-11-08 11:23:35 +0200 |
---|---|---|
committer | Vaadin Code Review <review@vaadin.com> | 2013-11-08 10:59:26 +0000 |
commit | a3aa6cc93e22fd6ff37ea6f3aa91810cab2aa624 (patch) | |
tree | 072c3db692a0a5f2a25a59ad57e417f8ba1f805d /theme-compiler/src/com/vaadin/sass/internal/tree/BlockNode.java | |
parent | 13858578966dad8cf5a6f10448b42961817beafc (diff) | |
download | vaadin-framework-a3aa6cc93e22fd6ff37ea6f3aa91810cab2aa624.tar.gz vaadin-framework-a3aa6cc93e22fd6ff37ea6f3aa91810cab2aa624.zip |
Fixes for sass compiler, handling mixins (#11288).
Keyframe selectors can now be comma-separated lists, interpolation
unquotes a quoted string and the parameters of an @include are no longer
lost.
Change-Id: I2622aca7471adc8004371affbb803d850e801307
Diffstat (limited to 'theme-compiler/src/com/vaadin/sass/internal/tree/BlockNode.java')
-rw-r--r-- | theme-compiler/src/com/vaadin/sass/internal/tree/BlockNode.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/theme-compiler/src/com/vaadin/sass/internal/tree/BlockNode.java b/theme-compiler/src/com/vaadin/sass/internal/tree/BlockNode.java index 4b364168cf..6ce67a3abd 100644 --- a/theme-compiler/src/com/vaadin/sass/internal/tree/BlockNode.java +++ b/theme-compiler/src/com/vaadin/sass/internal/tree/BlockNode.java @@ -80,7 +80,8 @@ public class BlockNode extends Node implements IVariableNode { String interpolation = "#{$" + var.getName() + "}"; if (selector.contains(interpolation)) { String replace = selector.replace(interpolation, var - .getExpr().toString()); + .getExpr().unquotedString()); + selectorList.add(selectorList.indexOf(selector), replace); selectorList.remove(selector); } |