diff options
| author | Artur Signell <artur@vaadin.com> | 2013-11-11 16:32:36 +0200 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2013-11-11 16:32:36 +0200 |
| commit | f51b8911ad7d9ee8f651cf037e30a09e09a5e530 (patch) | |
| tree | 5bed9252028bbe49ff5ccc1388cf89880c15244c /theme-compiler/tests | |
| parent | dc5183c62552135a1f2aa5a94ef6796ffebfcf15 (diff) | |
| parent | a3aa6cc93e22fd6ff37ea6f3aa91810cab2aa624 (diff) | |
| download | vaadin-framework-f51b8911ad7d9ee8f651cf037e30a09e09a5e530.tar.gz vaadin-framework-f51b8911ad7d9ee8f651cf037e30a09e09a5e530.zip | |
Merge commit 'a3aa6cc93e22fd6ff37ea6f3aa91810cab2aa624'
Conflicts:
theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java
theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj
Change-Id: I3421c2d5c114765e924d7847cee46ebd370dfca6
Diffstat (limited to 'theme-compiler/tests')
4 files changed, 32 insertions, 0 deletions
diff --git a/theme-compiler/tests/resources/automatic/css/interpolation-singlequote.css b/theme-compiler/tests/resources/automatic/css/interpolation-singlequote.css new file mode 100644 index 0000000000..58c6a3d37a --- /dev/null +++ b/theme-compiler/tests/resources/automatic/css/interpolation-singlequote.css @@ -0,0 +1 @@ +body { background-color: white; }
\ No newline at end of file diff --git a/theme-compiler/tests/resources/automatic/css/mixin-keyframes.css b/theme-compiler/tests/resources/automatic/css/mixin-keyframes.css new file mode 100644 index 0000000000..c1f2ccd6c0 --- /dev/null +++ b/theme-compiler/tests/resources/automatic/css/mixin-keyframes.css @@ -0,0 +1,10 @@ +@-webkit-keyframes fade-in { + 0% { opacity: 0; } + 20% , 50%,100% { opacity: 1; } + 30%, 75% { opacity: 0; } +} +@-moz-keyframes fade-in { + 0% { opacity: 0; } + 20% , 50%,100% { opacity: 1; } + 30%, 75% { opacity: 0; } +}
\ No newline at end of file diff --git a/theme-compiler/tests/resources/automatic/scss/interpolation-singlequote.scss b/theme-compiler/tests/resources/automatic/scss/interpolation-singlequote.scss new file mode 100644 index 0000000000..4cdd7bf165 --- /dev/null +++ b/theme-compiler/tests/resources/automatic/scss/interpolation-singlequote.scss @@ -0,0 +1,7 @@ +@mixin bgcolor ($name, $color) { + #{$name}{ + background-color: $color; + } +} + +@include bgcolor('body', white); diff --git a/theme-compiler/tests/resources/automatic/scss/mixin-keyframes.scss b/theme-compiler/tests/resources/automatic/scss/mixin-keyframes.scss new file mode 100644 index 0000000000..931d102e3f --- /dev/null +++ b/theme-compiler/tests/resources/automatic/scss/mixin-keyframes.scss @@ -0,0 +1,14 @@ +@mixin keyframes ($name) { + @-webkit-keyframes #{$name} { + @content; + } + @-moz-keyframes #{$name} { + @content; + } +} + +@include keyframes("fade-in") { + 0% {opacity: 0;} + 20% , 50%,100%{opacity: 1;} + 30%, 75% {opacity: 0;} +}
\ No newline at end of file |