diff options
| author | Henri Sara <hesara@vaadin.com> | 2012-08-10 09:10:40 +0300 |
|---|---|---|
| committer | Henri Sara <hesara@vaadin.com> | 2012-08-10 09:10:40 +0300 |
| commit | 239ce71f498fcdf2809c5561bf5028bf216265ca (patch) | |
| tree | 01b7abefa7a870902c80848577d554595ea5da82 /tests | |
| parent | 0a4a462fd1e4edc71682d4b350cd03bb27700b72 (diff) | |
| download | vaadin-framework-239ce71f498fcdf2809c5561bf5028bf216265ca.tar.gz vaadin-framework-239ce71f498fcdf2809c5561bf5028bf216265ca.zip | |
Merge SASS fixes keeping comments, remove hack for reindeer (#9223)
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/sass/resources/css/comments.css | 2 | ||||
| -rw-r--r-- | tests/sass/resources/scss/comments.scss | 3 | ||||
| -rw-r--r-- | tests/sass/src/com/vaadin/sass/testcases/scss/Comments.java | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/tests/sass/resources/css/comments.css b/tests/sass/resources/css/comments.css index 2a32b49ec2..1c773f7974 100644 --- a/tests/sass/resources/css/comments.css +++ b/tests/sass/resources/css/comments.css @@ -2,6 +2,8 @@ /** 1sprite: verticals; sprite-image: url(../common/img/vertical-sprites.png); sprite-layout: vertical */ +/** 2sprite: verticals; sprite-image: url(../common/img/vertical-sprites.png); sprite-layout: vertical */ + .v-button:focus { background-image: url(img/left-focus.png);/** sprite-ref: buttons */ outline: none; diff --git a/tests/sass/resources/scss/comments.scss b/tests/sass/resources/scss/comments.scss index 7e2ccac3b5..de3fbe8e0d 100644 --- a/tests/sass/resources/scss/comments.scss +++ b/tests/sass/resources/scss/comments.scss @@ -1,6 +1,7 @@ /** 0sprite: verticals; sprite-image: url(../common/img/vertical-sprites.png); sprite-layout: vertical */ -$black:#000000; /** 1sprite: verticals; sprite-image: url(../common/img/vertical-sprites.png); sprite-layout: vertical */ +/** 2sprite: verticals; sprite-image: url(../common/img/vertical-sprites.png); sprite-layout: vertical */ +$black:#000000; .v-button:focus { background-image: url(img/left-focus.png);/** sprite-ref: buttons */ outline: none; diff --git a/tests/sass/src/com/vaadin/sass/testcases/scss/Comments.java b/tests/sass/src/com/vaadin/sass/testcases/scss/Comments.java index 1dcc18e568..3dbafc9d43 100644 --- a/tests/sass/src/com/vaadin/sass/testcases/scss/Comments.java +++ b/tests/sass/src/com/vaadin/sass/testcases/scss/Comments.java @@ -32,7 +32,7 @@ public class Comments extends AbstractTestBase { parser.parseStyleSheet(getClass().getResource(scss).getPath()); ScssStylesheet root = handler.getStyleSheet(); Assert.assertNotNull(root); - Assert.assertEquals(5, root.getChildren().size()); + Assert.assertEquals(6, root.getChildren().size()); Assert.assertTrue(root.getChildren().get(0) instanceof CommentNode); Assert.assertTrue(root.getChildren().get(2) instanceof CommentNode); } @@ -40,7 +40,5 @@ public class Comments extends AbstractTestBase { @Test public void testCompiler() throws Exception { testCompiler(scss, css); - Assert.assertEquals("Original CSS and parsed CSS doesn't match", - comparisonCss, parsedScss); } } |