summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Englund <marc@vaadin.com>2012-10-04 16:29:26 +0300
committerMarc Englund <marc@vaadin.com>2012-10-04 16:29:26 +0300
commit7698528c8476afe3429f7f0e4a3a109d5ae1dd74 (patch)
tree3d4e4fb493d2641c9dfd0f1f604a679463af1304
parent879b0f9c2168c2f7a5f2d9e4f575e04f081e65c6 (diff)
downloadvaadin-framework-7698528c8476afe3429f7f0e4a3a109d5ae1dd74.tar.gz
vaadin-framework-7698528c8476afe3429f7f0e4a3a109d5ae1dd74.zip
Adds one test for sass mixins
Change-Id: I9e42bbc075cc3ef84c1a7bf5b449f18df5773327
-rw-r--r--theme-compiler/tests/resources/css/mixins.css10
-rw-r--r--theme-compiler/tests/resources/scss/mixins.scss16
2 files changed, 24 insertions, 2 deletions
diff --git a/theme-compiler/tests/resources/css/mixins.css b/theme-compiler/tests/resources/css/mixins.css
index 9bb9c95efa..d0cf0b3d1d 100644
--- a/theme-compiler/tests/resources/css/mixins.css
+++ b/theme-compiler/tests/resources/css/mixins.css
@@ -52,4 +52,12 @@ font-family: arial;
font-size: 16px;
-font-weight: bold; \ No newline at end of file
+font-weight: bold;
+
+.default .default-inner {
+ color: green;
+}
+
+.custom .custom-inner {
+ color: green;
+} \ 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 cb05cc87e3..e1fa80f357 100644
--- a/theme-compiler/tests/resources/scss/mixins.scss
+++ b/theme-compiler/tests/resources/scss/mixins.scss
@@ -71,4 +71,18 @@ $mixinVar : 1px;
}
}
-@include layout; \ No newline at end of file
+@include layout;
+
+@mixin parent($color : green, $name : default) {
+ .#{$name}-inner {
+ color: $color;
+ }
+}
+
+.default {
+ @include parent;
+}
+
+.custom {
+ @include parent($name : custom);
+} \ No newline at end of file