diff options
| author | Henrik Paul <henrik@vaadin.com> | 2013-10-18 15:09:43 +0300 |
|---|---|---|
| committer | Henrik Paul <henrik@vaadin.com> | 2013-10-18 15:09:53 +0300 |
| commit | 7cba636d8938c4491ae4c1995064ed0ef83ccdd7 (patch) | |
| tree | da0f777665d1e0a56eb892d02d156b29c6c517b1 /theme-compiler/tests | |
| parent | df3d643b3aaa3112d59e2ae0fb3649dd37e927a7 (diff) | |
| parent | 6a99730d898f8e0663d69dbeba6682113c29ca52 (diff) | |
| download | vaadin-framework-7cba636d8938c4491ae4c1995064ed0ef83ccdd7.tar.gz vaadin-framework-7cba636d8938c4491ae4c1995064ed0ef83ccdd7.zip | |
Merge changes from origin/7.1
377d49e Allow configuring deployment port for TB3 tests
6779857 Updatet servlet tests to follow the same *Test naming convention
e1c38bf Avoid obsolete calendar panel renderings to avoid various NPEs. (#12504,#12667)
63f10ec Fixed compilation error in TB3 test
3e593b0 Focus selected row in Table #12540
3c842b7 added small pause to make test pass
1b7e40d Only fetch rows if there are some (#11189)
f595d05 Make the various Writers member fields instead of local variables (#12446)
4cb304d Converted broken test to TB3
2aa2fdc Handle ClientMethodInvocation serialization with JSONArray as parameter (#12532)
1449425 Also hide shim iframe of VOverlay on setVisible(false) (#12731)
25fc2f2 Fix whitespace after including a mixin (#12715)
c29ca5e Update to atmosphere javascript 2.0.3-vaadin1 (#12241, #12127)
f75164f Disable unit cache to avoid compilation issues when switching between branches
6a99730 Allow skipping TB2/TB3 tests using tests.tb2/tb3.skip
Change-Id: I5a92798e66575c2cfd1d3f761a5f00af7e83dc64
Diffstat (limited to 'theme-compiler/tests')
| -rw-r--r-- | theme-compiler/tests/resources/automatic/css/mixin-content-parameters.css | 2 | ||||
| -rw-r--r-- | theme-compiler/tests/resources/automatic/scss/mixin-content-parameters.scss | 9 |
2 files changed, 11 insertions, 0 deletions
diff --git a/theme-compiler/tests/resources/automatic/css/mixin-content-parameters.css b/theme-compiler/tests/resources/automatic/css/mixin-content-parameters.css new file mode 100644 index 0000000000..ddae1ed036 --- /dev/null +++ b/theme-compiler/tests/resources/automatic/css/mixin-content-parameters.css @@ -0,0 +1,2 @@ +foo { + lorem: ipsum; }
\ No newline at end of file diff --git a/theme-compiler/tests/resources/automatic/scss/mixin-content-parameters.scss b/theme-compiler/tests/resources/automatic/scss/mixin-content-parameters.scss new file mode 100644 index 0000000000..dc64ddf6f8 --- /dev/null +++ b/theme-compiler/tests/resources/automatic/scss/mixin-content-parameters.scss @@ -0,0 +1,9 @@ +@mixin test($foo) { + #{$foo} { + @content; + } +} + +@include test("foo") { + lorem: ipsum; +}
\ No newline at end of file |