From: Marc Englund <marc@vaadin.com>
Date: Thu, 4 Oct 2012 13:29:26 +0000 (+0300)
Subject: Adds one test for sass mixins
X-Git-Tag: 7.0.0.beta6~87^2~3
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7698528c8476afe3429f7f0e4a3a109d5ae1dd74;p=vaadin-framework.git

Adds one test for sass mixins

Change-Id: I9e42bbc075cc3ef84c1a7bf5b449f18df5773327
---

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