summaryrefslogtreecommitdiffstats
path: root/theme-compiler
diff options
context:
space:
mode:
authorMarc Englund <marc@vaadin.com>2012-10-15 16:01:58 +0300
committerVaadin Code Review <review@vaadin.com>2012-10-16 13:13:38 +0000
commited8f82e6ab390a4139af8440896ee9574a734894 (patch)
tree1beb701ff283c03a7fd20d2ebb46cb62ea5ff61e /theme-compiler
parent30dc9f083b981aad4b180999d6f2bacf1207bed0 (diff)
downloadvaadin-framework-ed8f82e6ab390a4139af8440896ee9574a734894.tar.gz
vaadin-framework-ed8f82e6ab390a4139af8440896ee9574a734894.zip
Fixes #9871 (originally by Seba, re-added test in reindeer.css)
Replaces c/106 (I19008aba2561e41da055bff11dd8dc1bd0632a48) Change-Id: I21703e541957b7673231788705dfc2c963480e1f
Diffstat (limited to 'theme-compiler')
-rw-r--r--theme-compiler/src/com/vaadin/sass/tree/BlockNode.java4
-rw-r--r--theme-compiler/tests/resources/basic/reindeer.css4
2 files changed, 7 insertions, 1 deletions
diff --git a/theme-compiler/src/com/vaadin/sass/tree/BlockNode.java b/theme-compiler/src/com/vaadin/sass/tree/BlockNode.java
index 3c87d3db82..5a64a928db 100644
--- a/theme-compiler/src/com/vaadin/sass/tree/BlockNode.java
+++ b/theme-compiler/src/com/vaadin/sass/tree/BlockNode.java
@@ -38,11 +38,13 @@ public class BlockNode extends Node implements IVariableNode, InterpolationNode
public String toString(boolean indent) {
StringBuilder string = new StringBuilder();
+ int i = 0;
for (final String s : selectorList) {
string.append(s);
- if (selectorList.indexOf(s) != selectorList.size() - 1) {
+ if (i != selectorList.size() - 1) {
string.append(", ");
}
+ i++;
}
string.append(" {\n");
for (Node child : children) {
diff --git a/theme-compiler/tests/resources/basic/reindeer.css b/theme-compiler/tests/resources/basic/reindeer.css
index 22ca405982..af02070e72 100644
--- a/theme-compiler/tests/resources/basic/reindeer.css
+++ b/theme-compiler/tests/resources/basic/reindeer.css
@@ -830,6 +830,10 @@ div.v-app-loading {
width: 200px;
}
+.v-app-loginpage .v-button, .v-app-loginpage .v-button {
+ float: left;
+}
+
.v-menubar {
float: left;
white-space: nowrap;