diff options
| author | Sebastian Nyholm <sebastian@vaadin.com> | 2012-10-22 11:11:04 +0300 |
|---|---|---|
| committer | Sebastian Nyholm <sebastian@vaadin.com> | 2012-11-08 17:16:10 +0200 |
| commit | a0da163fd5c23f1d961fc5c686efd6ffc50ecd61 (patch) | |
| tree | 093e40a12de854d48920335b67b08144b98556bf /theme-compiler/tests/resources/scss | |
| parent | e8ae9f7d6427f7f6daae300dee7931a6e8394bdb (diff) | |
| download | vaadin-framework-a0da163fd5c23f1d961fc5c686efd6ffc50ecd61.tar.gz vaadin-framework-a0da163fd5c23f1d961fc5c686efd6ffc50ecd61.zip | |
Fixes #9546, #9974, #10100, #10105
Change-Id: I1baccb5604899707960b1cf06887ada0fe217d08
Diffstat (limited to 'theme-compiler/tests/resources/scss')
| -rw-r--r-- | theme-compiler/tests/resources/scss/_partial-for-import.scss | 18 | ||||
| -rw-r--r-- | theme-compiler/tests/resources/scss/mixins.scss | 4 | ||||
| -rw-r--r-- | theme-compiler/tests/resources/scss/parent-selector.scss | 6 |
3 files changed, 20 insertions, 8 deletions
diff --git a/theme-compiler/tests/resources/scss/_partial-for-import.scss b/theme-compiler/tests/resources/scss/_partial-for-import.scss index 32c3149a5b..96af1c78ff 100644 --- a/theme-compiler/tests/resources/scss/_partial-for-import.scss +++ b/theme-compiler/tests/resources/scss/_partial-for-import.scss @@ -1,9 +1,13 @@ $foo : red; -.caption { - $side: right; - border: 1px solid black; - background: #ff0000; - padding: 10px; - margin: 10px; -}
\ No newline at end of file +@mixin caption { + .caption { + $side: right; + border: 1px solid black; + background: #ff0000; + padding: 10px; + margin: 10px; + } +} + +@include caption;
\ No newline at end of file diff --git a/theme-compiler/tests/resources/scss/mixins.scss b/theme-compiler/tests/resources/scss/mixins.scss index e1fa80f357..6107897131 100644 --- a/theme-compiler/tests/resources/scss/mixins.scss +++ b/theme-compiler/tests/resources/scss/mixins.scss @@ -71,7 +71,9 @@ $mixinVar : 1px; } } -@include layout; +$layoutVariable : layout; + +@include $layoutVariable; @mixin parent($color : green, $name : default) { .#{$name}-inner { diff --git a/theme-compiler/tests/resources/scss/parent-selector.scss b/theme-compiler/tests/resources/scss/parent-selector.scss index 60e7608c07..ee02f8bf76 100644 --- a/theme-compiler/tests/resources/scss/parent-selector.scss +++ b/theme-compiler/tests/resources/scss/parent-selector.scss @@ -21,4 +21,10 @@ a { .mixin-parent { @include parent; +} + +.part { + &.one, &.two { + color: blue; + } }
\ No newline at end of file |