diff options
| author | Henri Sara <hesara@vaadin.com> | 2012-08-09 14:45:42 +0300 |
|---|---|---|
| committer | Henri Sara <hesara@vaadin.com> | 2012-08-09 14:45:42 +0300 |
| commit | ef64d5becc40d85a5a27735775376062fa4ed8ff (patch) | |
| tree | 4b90acdfb9e9ad0819303d01d5163c59a8c4781a /tests | |
| parent | 30f0f85cf04edef6f04610ee9f8190ffe49585d8 (diff) | |
| download | vaadin-framework-ef64d5becc40d85a5a27735775376062fa4ed8ff.tar.gz vaadin-framework-ef64d5becc40d85a5a27735775376062fa4ed8ff.zip | |
Manual merge for SASS: fixed a bug in VariableVisitor
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/sass/resources/css/functions.css | 4 | ||||
| -rw-r--r-- | tests/sass/resources/css/variables.css | 1 | ||||
| -rw-r--r-- | tests/sass/resources/scss/variables.scss | 1 | ||||
| -rw-r--r-- | tests/sass/src/com/vaadin/sass/testcases/scss/Variables.java | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/tests/sass/resources/css/functions.css b/tests/sass/resources/css/functions.css index 3757096667..de87462b46 100644 --- a/tests/sass/resources/css/functions.css +++ b/tests/sass/resources/css/functions.css @@ -7,8 +7,8 @@ color: hsl(25, 100%, 50%); color: rgb(36, 0, 0); color: rgb(240, 0, 0); - color: #200; color: #240000; - color: #f00; + color: #200; color: #f00000; + color: #f00; } diff --git a/tests/sass/resources/css/variables.css b/tests/sass/resources/css/variables.css index 67ca5fdb7a..7c56a24c90 100644 --- a/tests/sass/resources/css/variables.css +++ b/tests/sass/resources/css/variables.css @@ -1,6 +1,7 @@ .content-navigation { border-color: #3bbfce; color: #0000ff; + color1: #cc0000; font-family: Arial, Helvetica, "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif; } diff --git a/tests/sass/resources/scss/variables.scss b/tests/sass/resources/scss/variables.scss index 2b39ef4a8d..3d9dada294 100644 --- a/tests/sass/resources/scss/variables.scss +++ b/tests/sass/resources/scss/variables.scss @@ -6,6 +6,7 @@ $chameleon-font-family: Arial, Helvetica, "Lucida Grande", "Lucida Sans Unicode" border-color: $blue; $blue: #0000ff; color: $blue; + color1: darken($blue); font-family: $chameleon-font-family; } diff --git a/tests/sass/src/com/vaadin/sass/testcases/scss/Variables.java b/tests/sass/src/com/vaadin/sass/testcases/scss/Variables.java index 9b6a506890..61208229cf 100644 --- a/tests/sass/src/com/vaadin/sass/testcases/scss/Variables.java +++ b/tests/sass/src/com/vaadin/sass/testcases/scss/Variables.java @@ -48,7 +48,7 @@ public class Variables extends AbstractTestBase { Assert.assertEquals("chameleon-font-family", varNode3.getName()); BlockNode blockNode1 = (BlockNode) root.getChildren().get(3); - Assert.assertEquals(4, blockNode1.getChildren().size()); + Assert.assertEquals(5, blockNode1.getChildren().size()); RuleNode ruleNode1Block1 = (RuleNode) blockNode1.getChildren().get(0); Assert.assertEquals("border-color", ruleNode1Block1.getVariable()); Assert.assertEquals(SCSSLexicalUnit.SCSS_VARIABLE, ruleNode1Block1 |