diff options
| author | denisanisimov <denis@vaadin.com> | 2014-01-31 10:46:55 +0200 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2014-02-03 12:30:08 +0000 |
| commit | eca905f8d6b527d7af41416eb96cf4d328167047 (patch) | |
| tree | c6ed8b1b01f519c93189095deb40377fd511d9d3 /theme-compiler/tests | |
| parent | fb597c1a4cb823a74e1738f612f2416b9b85b27d (diff) | |
| download | vaadin-framework-eca905f8d6b527d7af41416eb96cf4d328167047.tar.gz vaadin-framework-eca905f8d6b527d7af41416eb96cf4d328167047.zip | |
Parser recognizes @content directive inside @media (#13279).
Change-Id: I7fd8868233e9378aaf3725bb202d4b34f3f27713
Diffstat (limited to 'theme-compiler/tests')
3 files changed, 33 insertions, 0 deletions
diff --git a/theme-compiler/tests/resources/automatic/css/media.css b/theme-compiler/tests/resources/automatic/css/media.css index f4183d9a07..5f7267fa9a 100644 --- a/theme-compiler/tests/resources/automatic/css/media.css +++ b/theme-compiler/tests/resources/automatic/css/media.css @@ -1,3 +1,14 @@ +@media screen { + .v-view { + overflow: visible; + } + .details { + font-size: 1pt; + font-weight: bold; + } + width: 100%; +} + @media screen and (max-width: 480px) { .abc { background: red; diff --git a/theme-compiler/tests/resources/automatic/scss/media.scss b/theme-compiler/tests/resources/automatic/scss/media.scss index 7db52de9ed..311c5088c8 100644 --- a/theme-compiler/tests/resources/automatic/scss/media.scss +++ b/theme-compiler/tests/resources/automatic/scss/media.scss @@ -1,3 +1,24 @@ +@mixin media-settings { + @media screen { + .v-view { + overflow: visible; + } + @content; + } +} + +@include media-settings { + .details { + font: { + size : 1pt; + weight: bold; + } + } + + width:100%; +} + + @media screen and (max-width: 480px) { .abc { background: red; diff --git a/theme-compiler/tests/src/com/vaadin/sass/testcases/css/Media.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/css/Media.java index 1c84bf8c49..b7ca325aa7 100644 --- a/theme-compiler/tests/src/com/vaadin/sass/testcases/css/Media.java +++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/css/Media.java @@ -33,4 +33,5 @@ public class Media extends AbstractTestBase { IOException { testParser(css); } + } |