diff options
| author | Jonatan Kronqvist <jonatan@vaadin.com> | 2014-02-10 13:14:12 +0200 |
|---|---|---|
| committer | Jonatan Kronqvist <jonatan@vaadin.com> | 2014-02-10 13:14:12 +0200 |
| commit | 4f4ac0276b999d22a6e6b57d6073d6a643dd8c66 (patch) | |
| tree | afcb8307b5739fbf66c82117a7af29dc564c0481 /theme-compiler/tests | |
| parent | a5b079d1defa45b790a183bbc63dd1154ec0168c (diff) | |
| parent | 915c37b569600a8d37db2a0800a30474da49e255 (diff) | |
| download | vaadin-framework-4f4ac0276b999d22a6e6b57d6073d6a643dd8c66.tar.gz vaadin-framework-4f4ac0276b999d22a6e6b57d6073d6a643dd8c66.zip | |
Merge commit '915c37b569600a8d37db2a0800a30474da49e255' into master
915c37b Sass compiler now treats null-valued variables as unassigned (#12430).
Conflicts:
theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java
Change-Id: If9789f8d0638377d27e77ec4be0fdf0f96e4b1af
Diffstat (limited to 'theme-compiler/tests')
| -rw-r--r-- | theme-compiler/tests/resources/automatic/css/variable-defaults-with-null.css | 5 | ||||
| -rw-r--r-- | theme-compiler/tests/resources/automatic/scss/variable-defaults-with-null.scss | 19 |
2 files changed, 24 insertions, 0 deletions
diff --git a/theme-compiler/tests/resources/automatic/css/variable-defaults-with-null.css b/theme-compiler/tests/resources/automatic/css/variable-defaults-with-null.css new file mode 100644 index 0000000000..0e3483817b --- /dev/null +++ b/theme-compiler/tests/resources/automatic/css/variable-defaults-with-null.css @@ -0,0 +1,5 @@ +.test { + first: "Non-null"; + second: "Also non-null"; + third: "Not null"; +}
\ No newline at end of file diff --git a/theme-compiler/tests/resources/automatic/scss/variable-defaults-with-null.scss b/theme-compiler/tests/resources/automatic/scss/variable-defaults-with-null.scss new file mode 100644 index 0000000000..0bfa374304 --- /dev/null +++ b/theme-compiler/tests/resources/automatic/scss/variable-defaults-with-null.scss @@ -0,0 +1,19 @@ +$var: null; +$var: "Non-null" !default; + +$var2: null; +$var2: "Also non-null" !default; +$var2: "Null content" !default; + +$list-of-nulls: null null; +$list-of-nulls: "Non-null" !default; + +$mixed-list: null "Not null" null; +$mixed-list: "null" !default; + +.test { + first: $var; + second: $var2; + hidden: $list-of-nulls; + third: $mixed-list; +}
\ No newline at end of file |