merge master (sass theme changes)

7 files changed, 45 insertions, 13 deletions

diff --git a/WebContent/VAADIN/themes/reindeer/button/button-ie.css b/WebContent/VAADIN/themes/reindeer/button/button-ie.scss
index 47d9496e81..5bf38c4442 100644
--- a/WebContent/VAADIN/themes/reindeer/button/button-ie.css
+++ b/WebContent/VAADIN/themes/reindeer/button/button-ie.scss
@@ -1,4 +1,8 @@
+@mixin reindeer-button-ie {
+
 .v-ie8 .v-nativebutton-link {
 	padding: 0;
 	text-align: left;
 }
+
+}
\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/reindeer/button/button-link-style.css b/WebContent/VAADIN/themes/reindeer/button/button-link-style.scss
index f4ba80b3cd..aebda24cd4 100644
--- a/WebContent/VAADIN/themes/reindeer/button/button-link-style.css
+++ b/WebContent/VAADIN/themes/reindeer/button/button-link-style.scss
@@ -1,3 +1,5 @@
+@mixin reindeer-button-link-style {
+
 .v-button.v-button-link,
 .v-button.v-button-link:focus,
 .v-button.v-button-link:active,
@@ -32,4 +34,6 @@
 .v-button-link:focus .v-button-caption,
 .v-nativebutton-link:focus .v-nativebutton-caption {
 	outline: 1px dotted #1b699f;
-	}
\ No newline at end of file
+	}
+
+}
\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/reindeer/button/button-primary-style.css b/WebContent/VAADIN/themes/reindeer/button/button-primary-style.scss
index fdfe90ce3a..ffb4d250d3 100644
--- a/WebContent/VAADIN/themes/reindeer/button/button-primary-style.css
+++ b/WebContent/VAADIN/themes/reindeer/button/button-primary-style.scss
@@ -1,3 +1,5 @@
+@mixin reindeer-button-primary-style {
+
 .v-button-primary:focus {
 	background-image: url(img/primary-left-focus.png); /** sprite-ref: buttons */
 	}
@@ -60,3 +62,5 @@
 .black .v-disabled.v-button-primary .v-button-wrap {
 	background-image: url(img/black/primary-right.png); /** sprite-ref: black-buttons; sprite-alignment: right */
 	}
+
+}
\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/reindeer/button/button-small-style.css b/WebContent/VAADIN/themes/reindeer/button/button-small-style.scss
index fa6b177624..0ec33e330c 100644
--- a/WebContent/VAADIN/themes/reindeer/button/button-small-style.css
+++ b/WebContent/VAADIN/themes/reindeer/button/button-small-style.scss
@@ -1,3 +1,5 @@
+@mixin reindeer-button-small-style {
+
 .v-button-small:focus {
 	background-image: url(img/small-left-focus.png); /** sprite-ref: buttons */
 	}
@@ -64,4 +66,6 @@
 .black .v-button-small .v-button-wrap,
 .black .v-disabled.v-button-small .v-button-wrap {
 	background-image: url(img/black/small-right.png); /** sprite-ref: black-buttons; sprite-alignment: right */
-	}
\ No newline at end of file
+	}
+
+}
\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/reindeer/button/button-standard.css b/WebContent/VAADIN/themes/reindeer/button/button-standard.scss
index becd20457d..4df09bc1bd 100644
--- a/WebContent/VAADIN/themes/reindeer/button/button-standard.css
+++ b/WebContent/VAADIN/themes/reindeer/button/button-standard.scss
@@ -1,3 +1,5 @@
+@mixin reindeer-button-standard {
+
 .v-button:focus {
 	background-image: url(img/left-focus.png); /** sprite-ref: buttons */
 	outline: none;
@@ -87,4 +89,6 @@
 .black .v-button-caption {
 	color: #c9ccce;
 	text-shadow: #121314 0 -1px 0;
-	}
\ No newline at end of file
+	}
+
+}
\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/reindeer/button/button.css b/WebContent/VAADIN/themes/reindeer/button/button.css
deleted file mode 100644
index 1948e5aafb..0000000000
--- a/WebContent/VAADIN/themes/reindeer/button/button.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* Standard implementation of the button theme
- * These files contain styles that apply to all browsers
- */
-@import "button-standard.css";
-@import "button-primary-style.css";
-@import "button-small-style.css";
-@import "button-link-style.css";
-
-/* Browser-specific corrections to the standard implementation */
-@import "button-ie.css";
\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/reindeer/button/button.scss b/WebContent/VAADIN/themes/reindeer/button/button.scss
new file mode 100644
index 0000000000..34a4efda04
--- /dev/null
+++ b/WebContent/VAADIN/themes/reindeer/button/button.scss
@@ -0,0 +1,22 @@
+/* Standard implementation of the button theme
+ * These files contain styles that apply to all browsers
+ */
+@import "button-standard.scss";
+@import "button-primary-style.scss";
+@import "button-small-style.scss";
+@import "button-link-style.scss";
+
+/* Browser-specific corrections to the standard implementation */
+@import "button-ie.scss";
+
+@mixin reindeer-button {
+
+	@include reindeer-button-standard;
+	@include reindeer-button-primary-style;
+	@include reindeer-button-small-style;
+	@include reindeer-button-link-style;
+
+	/* Browser-specific corrections to the standard implementation */
+	@include reindeer-button-ie;
+
+}