diff options
| author | Artur Signell <artur@vaadin.com> | 2013-02-22 16:23:49 +0200 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2013-02-22 16:24:06 +0200 |
| commit | fbdc52551e258d938db2e230366ca0e21d35c5bc (patch) | |
| tree | 640740bcb63c2757facc9f19748a65eb46b50174 /theme-compiler/tests/resources | |
| parent | d9a8a21a62b977e32b65bcf436bbd229c9b798f4 (diff) | |
| parent | 7af5b3fceb75b6f505a9a6d0a843b788bb06d9a7 (diff) | |
| download | vaadin-framework-fbdc52551e258d938db2e230366ca0e21d35c5bc.tar.gz vaadin-framework-fbdc52551e258d938db2e230366ca0e21d35c5bc.zip | |
Merge remote-tracking branch 'origin/7.0'
Change-Id: Id48ccb3c400a78cddb8bb5c7bbcf2d65174e59d0
Diffstat (limited to 'theme-compiler/tests/resources')
| -rw-r--r-- | theme-compiler/tests/resources/automatic/css/nested-selector-begin-with-plus.css | 9 | ||||
| -rw-r--r-- | theme-compiler/tests/resources/automatic/scss/nested-selector-begin-with-plus.scss | 9 | ||||
| -rw-r--r-- | theme-compiler/tests/resources/sasslang/css/95-test_nested_selector_with_child_selector_hack_extender_and_sibling_selector_extendee.css (renamed from theme-compiler/tests/resources/sasslangbroken/css/95-test_nested_selector_with_child_selector_hack_extender_and_sibling_selector_extendee.css) | 0 | ||||
| -rw-r--r-- | theme-compiler/tests/resources/sasslang/scss/95-test_nested_selector_with_child_selector_hack_extender_and_sibling_selector_extendee.scss (renamed from theme-compiler/tests/resources/sasslangbroken/scss/95-test_nested_selector_with_child_selector_hack_extender_and_sibling_selector_extendee.scss) | 0 | ||||
| -rw-r--r-- | theme-compiler/tests/resources/scss/mixin-extra-params.scss | 4 |
5 files changed, 22 insertions, 0 deletions
diff --git a/theme-compiler/tests/resources/automatic/css/nested-selector-begin-with-plus.css b/theme-compiler/tests/resources/automatic/css/nested-selector-begin-with-plus.css new file mode 100644 index 0000000000..fa8d2861a6 --- /dev/null +++ b/theme-compiler/tests/resources/automatic/css/nested-selector-begin-with-plus.css @@ -0,0 +1,9 @@ +.v-panel { + display: block; + max-width: 84em; + margin: auto; +} + +.v-panel + .abc { + margin-top: 1em; +}
\ No newline at end of file diff --git a/theme-compiler/tests/resources/automatic/scss/nested-selector-begin-with-plus.scss b/theme-compiler/tests/resources/automatic/scss/nested-selector-begin-with-plus.scss new file mode 100644 index 0000000000..f5a61b86ea --- /dev/null +++ b/theme-compiler/tests/resources/automatic/scss/nested-selector-begin-with-plus.scss @@ -0,0 +1,9 @@ +.v-panel { + display: block; + max-width: 84em; + margin: auto; + + + .abc { + margin-top: 1em; + } + }
\ No newline at end of file diff --git a/theme-compiler/tests/resources/sasslangbroken/css/95-test_nested_selector_with_child_selector_hack_extender_and_sibling_selector_extendee.css b/theme-compiler/tests/resources/sasslang/css/95-test_nested_selector_with_child_selector_hack_extender_and_sibling_selector_extendee.css index 09b4ccac27..09b4ccac27 100644 --- a/theme-compiler/tests/resources/sasslangbroken/css/95-test_nested_selector_with_child_selector_hack_extender_and_sibling_selector_extendee.css +++ b/theme-compiler/tests/resources/sasslang/css/95-test_nested_selector_with_child_selector_hack_extender_and_sibling_selector_extendee.css diff --git a/theme-compiler/tests/resources/sasslangbroken/scss/95-test_nested_selector_with_child_selector_hack_extender_and_sibling_selector_extendee.scss b/theme-compiler/tests/resources/sasslang/scss/95-test_nested_selector_with_child_selector_hack_extender_and_sibling_selector_extendee.scss index 73f6254f21..73f6254f21 100644 --- a/theme-compiler/tests/resources/sasslangbroken/scss/95-test_nested_selector_with_child_selector_hack_extender_and_sibling_selector_extendee.scss +++ b/theme-compiler/tests/resources/sasslang/scss/95-test_nested_selector_with_child_selector_hack_extender_and_sibling_selector_extendee.scss diff --git a/theme-compiler/tests/resources/scss/mixin-extra-params.scss b/theme-compiler/tests/resources/scss/mixin-extra-params.scss new file mode 100644 index 0000000000..af376adf90 --- /dev/null +++ b/theme-compiler/tests/resources/scss/mixin-extra-params.scss @@ -0,0 +1,4 @@ +@mixin test ($p1) { + color: $p1; +} +@include test(foo, bar);
\ No newline at end of file |