summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Englund <marc@vaadin.com>2012-11-12 11:01:38 +0000
committerVaadin Code Review <review@vaadin.com>2012-11-12 11:01:38 +0000
commitb1e30ac14f4e885d993a77e3ad077daf2a4867ce (patch)
tree6c2e3aebf1f9f184c96d9a9a3bc42e422e1208cc
parentc6fce8f5ea541625483a988b193935a6ae886a10 (diff)
parent0c9b86505c56ea8c19d6710fc99b8c3bdebbef48 (diff)
downloadvaadin-framework-b1e30ac14f4e885d993a77e3ad077daf2a4867ce.tar.gz
vaadin-framework-b1e30ac14f4e885d993a77e3ad077daf2a4867ce.zip
Merge "Fixes #10166 SassCompiler parent reference in middle of selector bugs"
-rw-r--r--theme-compiler/src/com/vaadin/sass/visitor/ParentSelectorHandler.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/theme-compiler/src/com/vaadin/sass/visitor/ParentSelectorHandler.java b/theme-compiler/src/com/vaadin/sass/visitor/ParentSelectorHandler.java
index 3cc49b06dd..4098cc7cad 100644
--- a/theme-compiler/src/com/vaadin/sass/visitor/ParentSelectorHandler.java
+++ b/theme-compiler/src/com/vaadin/sass/visitor/ParentSelectorHandler.java
@@ -35,7 +35,7 @@ public class ParentSelectorHandler {
BlockNode parentBlock = (BlockNode) parentNode;
for (final String s : block.getSelectorList()) {
- if (s.startsWith("&") || s.endsWith("&")) {
+ if (s.contains("&")) {
for (final String parentSelector : parentBlock
.getSelectorList()) {
newList.add(s.replace("&", parentSelector));