diff options
| author | Artur Signell <artur@vaadin.com> | 2013-11-11 16:24:45 +0200 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2013-11-11 16:24:45 +0200 |
| commit | 9562c6fad9f36c64b1b640574f93b7da959e0013 (patch) | |
| tree | f903eca8f03173d6ec274bd0d998f42b561f9644 /theme-compiler/tests | |
| parent | 9835a829de6d30566442dfecb400f973b7c7ee7d (diff) | |
| parent | a2f255448e6a755892a97b7df9fc2b65efc5dccc (diff) | |
| download | vaadin-framework-9562c6fad9f36c64b1b640574f93b7da959e0013.tar.gz vaadin-framework-9562c6fad9f36c64b1b640574f93b7da959e0013.zip | |
Merge commit 'a2f255448e6a755892a97b7df9fc2b65efc5dccc'
Conflicts:
theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java
Change-Id: I6b295f9225785eb6bf07bf2cd2d5c1c3bc181afc
Diffstat (limited to 'theme-compiler/tests')
| -rw-r--r-- | theme-compiler/tests/resources/automatic/css/at-directive-in-if.css | 1 | ||||
| -rw-r--r-- | theme-compiler/tests/resources/automatic/scss/at-directive-in-if.scss | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/theme-compiler/tests/resources/automatic/css/at-directive-in-if.css b/theme-compiler/tests/resources/automatic/css/at-directive-in-if.css new file mode 100644 index 0000000000..80d4821ead --- /dev/null +++ b/theme-compiler/tests/resources/automatic/css/at-directive-in-if.css @@ -0,0 +1 @@ +@font-face {}
\ No newline at end of file diff --git a/theme-compiler/tests/resources/automatic/scss/at-directive-in-if.scss b/theme-compiler/tests/resources/automatic/scss/at-directive-in-if.scss new file mode 100644 index 0000000000..30556fb382 --- /dev/null +++ b/theme-compiler/tests/resources/automatic/scss/at-directive-in-if.scss @@ -0,0 +1,8 @@ +@mixin test($italic: true) { + @if $italic { + @font-face { + } + } +} + +@include test;
\ No newline at end of file |