From a0da163fd5c23f1d961fc5c686efd6ffc50ecd61 Mon Sep 17 00:00:00 2001
From: Sebastian Nyholm <sebastian@vaadin.com>
Date: Mon, 22 Oct 2012 11:11:04 +0300
Subject: Fixes #9546, #9974, #10100, #10105

Change-Id: I1baccb5604899707960b1cf06887ada0fe217d08
---
 .../tests/resources/scss/_partial-for-import.scss      | 18 +++++++++++-------
 theme-compiler/tests/resources/scss/mixins.scss        |  4 +++-
 .../tests/resources/scss/parent-selector.scss          |  6 ++++++
 3 files changed, 20 insertions(+), 8 deletions(-)

(limited to 'theme-compiler/tests/resources/scss')

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
-- 
cgit v1.2.3