summaryrefslogtreecommitdiffstats
path: root/theme-compiler/tests/resources
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2013-10-22 09:12:59 +0300
committerLeif Åstrand <leif@vaadin.com>2013-10-22 09:12:59 +0300
commitd70961ff2539aabe99eea22683a8ae77efdc81e5 (patch)
treec3876e2266ace7e90d8dc82e35f22631e2ce29e5 /theme-compiler/tests/resources
parenta48370a761a6d0b6c54196da0defdb30b47a5bb1 (diff)
parentee809e5985d7a438e031c40bed160ac78ae8d0bc (diff)
downloadvaadin-framework-d70961ff2539aabe99eea22683a8ae77efdc81e5.tar.gz
vaadin-framework-d70961ff2539aabe99eea22683a8ae77efdc81e5.zip
Merge changes from origin/7.1
c7ae45c Validate that the connector is enabled before triggering actions for it (#12743) ce89a75 Created constants for tested browser versions (#12786) f9ea9b3 Allow running tests locally by overriding runLocally() (#12786) e70ba25 Added liferay module for building liferay.zip #12748 7c12694 Add sub directory support to sass test scanner (#12790) 39fdf66 Handle numbers in the same way if they do not have a unit (#12732) 6155d61 Disable fallback in a way compatible with Atmosphere JS 2.0.3 (#12241) f401595 Test for pushing large chunks of data (#12567) d41967d Skip compilation of TB2 tests if tests.tb2.skip is set 6c1ba81 Reverted button click() logic check (#12743) 779c8a0 Disable automated testing on Opera until issues are resolved (#12487, #12367, #12800) 962c1c3 Fix compilation error 7ee11a7 Remove unused test super class (#12786) a4211dc Resolve concurrency issue in running TB3 tests 20c28aa Fixed javadoc 0d36896 Add more hax to make test work with new Atmosphere JS (#12241) ed50200 Fix serialization issue (#12703) dd51b7f Added more exception handling to PushHandler (#12578, #11882) 6f76840 Sass variables can now start with underscore (#12716) ab5b20c Ticket #12727 - Panels get unnecessary scroll bars in WebKit when content is 100% wide. 361ad17 Fixed focus issue in TableMoveFocusWithSelectionTest (#12540) ee809e5 Revert broken fix and test (#12446) Change-Id: I71b6e3c2dc6b02845794df0934ba807d7ccac784
Diffstat (limited to 'theme-compiler/tests/resources')
-rw-r--r--theme-compiler/tests/resources/automatic/css/functions/abs.css11
-rw-r--r--theme-compiler/tests/resources/automatic/css/functions/ceil.css11
-rw-r--r--theme-compiler/tests/resources/automatic/css/functions/floor.css11
-rw-r--r--theme-compiler/tests/resources/automatic/css/functions/round.css11
-rw-r--r--theme-compiler/tests/resources/automatic/scss/foo/_bar.scss (renamed from theme-compiler/tests/resources/automatic/scss/foo/bar.scss)0
-rw-r--r--theme-compiler/tests/resources/automatic/scss/functions/abs.scss11
-rw-r--r--theme-compiler/tests/resources/automatic/scss/functions/ceil.scss11
-rw-r--r--theme-compiler/tests/resources/automatic/scss/functions/floor.scss11
-rw-r--r--theme-compiler/tests/resources/automatic/scss/functions/round.scss11
-rw-r--r--theme-compiler/tests/resources/automatic/scss/import-file-which-contains-comment-in-last-line.scss2
-rw-r--r--theme-compiler/tests/resources/automatic/scss/nested-import.scss2
-rw-r--r--theme-compiler/tests/resources/automatic/scss/to-be-imported/_imported-file-contains-comments-in-last-line.scss (renamed from theme-compiler/tests/resources/automatic/scss/to-be-imported/imported-file-contains-comments-in-last-line.scss)0
-rw-r--r--theme-compiler/tests/resources/automatic/scss/url-path.scss2
-rw-r--r--theme-compiler/tests/resources/automatic/scss/utf8-imported/_to-be-imported-scss-file-contains-utf8.scss (renamed from theme-compiler/tests/resources/automatic/scss/utf8-imported/to-be-imported-scss-file-contains-utf8.scss)0
-rw-r--r--theme-compiler/tests/resources/automatic/scss/utf8.scss2
15 files changed, 92 insertions, 4 deletions
diff --git a/theme-compiler/tests/resources/automatic/css/functions/abs.css b/theme-compiler/tests/resources/automatic/css/functions/abs.css
new file mode 100644
index 0000000000..3c43804a13
--- /dev/null
+++ b/theme-compiler/tests/resources/automatic/css/functions/abs.css
@@ -0,0 +1,11 @@
+.foo {
+ a: 0;
+ b: 12.51;
+ c: 1.1px;
+ d: 12;
+ e: 12px;
+ f: 12.9999;
+ g: 12.9999em;
+ h: 13.0001;
+ i: 13.0001%;
+} \ No newline at end of file
diff --git a/theme-compiler/tests/resources/automatic/css/functions/ceil.css b/theme-compiler/tests/resources/automatic/css/functions/ceil.css
new file mode 100644
index 0000000000..9956ff3612
--- /dev/null
+++ b/theme-compiler/tests/resources/automatic/css/functions/ceil.css
@@ -0,0 +1,11 @@
+.foo {
+ a: 0;
+ b: -12;
+ c: -1px;
+ d: 12;
+ e: 12px;
+ f: 13;
+ g: 13em;
+ h: 14;
+ i: 14%;
+} \ No newline at end of file
diff --git a/theme-compiler/tests/resources/automatic/css/functions/floor.css b/theme-compiler/tests/resources/automatic/css/functions/floor.css
new file mode 100644
index 0000000000..f96e99d809
--- /dev/null
+++ b/theme-compiler/tests/resources/automatic/css/functions/floor.css
@@ -0,0 +1,11 @@
+.foo {
+ a: 0;
+ b: -13;
+ c: -2px;
+ d: 12;
+ e: 12px;
+ f: 12;
+ g: 12em;
+ h: 13;
+ i: 13%;
+} \ No newline at end of file
diff --git a/theme-compiler/tests/resources/automatic/css/functions/round.css b/theme-compiler/tests/resources/automatic/css/functions/round.css
new file mode 100644
index 0000000000..72d9a8596d
--- /dev/null
+++ b/theme-compiler/tests/resources/automatic/css/functions/round.css
@@ -0,0 +1,11 @@
+.foo {
+ a: 0;
+ b: -13;
+ c: -1px;
+ d: 12;
+ e: 12px;
+ f: 13;
+ g: 13em;
+ h: 13;
+ i: 13%;
+} \ No newline at end of file
diff --git a/theme-compiler/tests/resources/automatic/scss/foo/bar.scss b/theme-compiler/tests/resources/automatic/scss/foo/_bar.scss
index 326d34232d..326d34232d 100644
--- a/theme-compiler/tests/resources/automatic/scss/foo/bar.scss
+++ b/theme-compiler/tests/resources/automatic/scss/foo/_bar.scss
diff --git a/theme-compiler/tests/resources/automatic/scss/functions/abs.scss b/theme-compiler/tests/resources/automatic/scss/functions/abs.scss
new file mode 100644
index 0000000000..91946f0556
--- /dev/null
+++ b/theme-compiler/tests/resources/automatic/scss/functions/abs.scss
@@ -0,0 +1,11 @@
+.foo {
+a: abs(0);
+b: abs(-12.51);
+c: abs(-1.1px);
+d: abs(12);
+e: abs(12px);
+f: abs(12.9999);
+g: abs(12.9999em);
+h: abs(-13.0001);
+i: abs(-13.0001%);
+}
diff --git a/theme-compiler/tests/resources/automatic/scss/functions/ceil.scss b/theme-compiler/tests/resources/automatic/scss/functions/ceil.scss
new file mode 100644
index 0000000000..ad7ceed4b4
--- /dev/null
+++ b/theme-compiler/tests/resources/automatic/scss/functions/ceil.scss
@@ -0,0 +1,11 @@
+.foo {
+a: ceil(0);
+b: ceil(-12.51);
+c: ceil(-1.1px);
+d: ceil(12);
+e: ceil(12px);
+f: ceil(12.9999);
+g: ceil(12.9999em);
+h: ceil(13.000001);
+i: ceil(13.000001%);
+}
diff --git a/theme-compiler/tests/resources/automatic/scss/functions/floor.scss b/theme-compiler/tests/resources/automatic/scss/functions/floor.scss
new file mode 100644
index 0000000000..a10f1b4fc1
--- /dev/null
+++ b/theme-compiler/tests/resources/automatic/scss/functions/floor.scss
@@ -0,0 +1,11 @@
+.foo {
+a: floor(0);
+b: floor(-12.51);
+c: floor(-1.1px);
+d: floor(12);
+e: floor(12px);
+f: floor(12.9999);
+g: floor(12.9999em);
+h: floor(13.000001);
+i: floor(13.000001%);
+}
diff --git a/theme-compiler/tests/resources/automatic/scss/functions/round.scss b/theme-compiler/tests/resources/automatic/scss/functions/round.scss
new file mode 100644
index 0000000000..3f1fa06aec
--- /dev/null
+++ b/theme-compiler/tests/resources/automatic/scss/functions/round.scss
@@ -0,0 +1,11 @@
+.foo {
+a: round(0);
+b: round(-12.51);
+c: round(-1.1px);
+d: round(12);
+e: round(12px);
+f: round(12.9999);
+g: round(12.9999em);
+h: round(13.000001);
+i: round(13.000001%);
+}
diff --git a/theme-compiler/tests/resources/automatic/scss/import-file-which-contains-comment-in-last-line.scss b/theme-compiler/tests/resources/automatic/scss/import-file-which-contains-comment-in-last-line.scss
index 41adc908ed..8292d4efe3 100644
--- a/theme-compiler/tests/resources/automatic/scss/import-file-which-contains-comment-in-last-line.scss
+++ b/theme-compiler/tests/resources/automatic/scss/import-file-which-contains-comment-in-last-line.scss
@@ -1,4 +1,4 @@
-@import "to-be-imported/imported-file-contains-comments-in-last-line.scss";
+@import "to-be-imported/_imported-file-contains-comments-in-last-line.scss";
.foo{
foo: $foo;
} \ No newline at end of file
diff --git a/theme-compiler/tests/resources/automatic/scss/nested-import.scss b/theme-compiler/tests/resources/automatic/scss/nested-import.scss
index 605d64a13a..df720a5584 100644
--- a/theme-compiler/tests/resources/automatic/scss/nested-import.scss
+++ b/theme-compiler/tests/resources/automatic/scss/nested-import.scss
@@ -1,3 +1,3 @@
.foo {
- @import "foo/bar.scss";
+ @import "foo/_bar.scss";
} \ No newline at end of file
diff --git a/theme-compiler/tests/resources/automatic/scss/to-be-imported/imported-file-contains-comments-in-last-line.scss b/theme-compiler/tests/resources/automatic/scss/to-be-imported/_imported-file-contains-comments-in-last-line.scss
index 16244f2bfd..16244f2bfd 100644
--- a/theme-compiler/tests/resources/automatic/scss/to-be-imported/imported-file-contains-comments-in-last-line.scss
+++ b/theme-compiler/tests/resources/automatic/scss/to-be-imported/_imported-file-contains-comments-in-last-line.scss
diff --git a/theme-compiler/tests/resources/automatic/scss/url-path.scss b/theme-compiler/tests/resources/automatic/scss/url-path.scss
index 0cc954bfb4..6903d389b5 100644
--- a/theme-compiler/tests/resources/automatic/scss/url-path.scss
+++ b/theme-compiler/tests/resources/automatic/scss/url-path.scss
@@ -1 +1 @@
-@import "foo/bar.scss"; \ No newline at end of file
+@import "foo/_bar.scss"; \ No newline at end of file
diff --git a/theme-compiler/tests/resources/automatic/scss/utf8-imported/to-be-imported-scss-file-contains-utf8.scss b/theme-compiler/tests/resources/automatic/scss/utf8-imported/_to-be-imported-scss-file-contains-utf8.scss
index f8a08a4a96..f8a08a4a96 100644
--- a/theme-compiler/tests/resources/automatic/scss/utf8-imported/to-be-imported-scss-file-contains-utf8.scss
+++ b/theme-compiler/tests/resources/automatic/scss/utf8-imported/_to-be-imported-scss-file-contains-utf8.scss
diff --git a/theme-compiler/tests/resources/automatic/scss/utf8.scss b/theme-compiler/tests/resources/automatic/scss/utf8.scss
index b568674073..251d6e6513 100644
--- a/theme-compiler/tests/resources/automatic/scss/utf8.scss
+++ b/theme-compiler/tests/resources/automatic/scss/utf8.scss
@@ -1,4 +1,4 @@
@charset "UTF-8";
-@import "utf8-imported/to-be-imported-scss-file-contains-utf8";
+@import "utf8-imported/_to-be-imported-scss-file-contains-utf8";
.bar {content: "\1f4c5";}
.raw_utf {content: "📈";} \ No newline at end of file