merge master (sass theme changes)

3 files changed, 61 insertions, 50 deletions

diff --git a/WebContent/VAADIN/themes/base/textfield/textfield-normal.css b/WebContent/VAADIN/themes/base/textfield/textfield-normal.css
deleted file mode 100644
index 51ad0a9077..0000000000
--- a/WebContent/VAADIN/themes/base/textfield/textfield-normal.css
+++ /dev/null
@@ -1,48 +0,0 @@
-.v-textfield {
-	text-align: left /* Force default alignment */
-}
-.v-textarea {
-	resize: none;
-	white-space: pre-wrap;
-}
-.v-textfield-focus,
-.v-textarea-focus {
-}
-input.v-textfield-prompt,
-textarea.v-textarea-prompt {
-	color: #999;
-	font-style: italic;
-}
-input.v-textfield-readonly,
-textarea.v-textarea-readonly {
-	background: transparent;
-	border: none;
-	resize: none;
-}
-input.v-disabled,
-textarea.v-disabled {
-	resize: none;
-}
-input.v-textfield-readonly:focus,
-textarea.v-textarea-readonly:focus {
-	outline: none;
-}
-/* Disabled by default
-.v-textarea-error,
-.v-textfield-error,
-.v-richtextarea-error iframe.gwt-RichTextArea {
-	background: #FFE0E0;	
-}
-*/
-/* Disabled by default
-.v-textarea-required,
-.v-textfield-required,
-.v-richtextarea-required iframe.gwt-RichTextArea {
-	background: #FFE0E0;	
-}
-*/
-/* Safari focus glow fix */
-.v-sa input:focus, 
-.v-sa textarea:focus {
-	outline-width: medium;
-}
\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/base/textfield/textfield.css b/WebContent/VAADIN/themes/base/textfield/textfield.css
deleted file mode 100644
index 956b302efe..0000000000
--- a/WebContent/VAADIN/themes/base/textfield/textfield.css
+++ /dev/null
@@ -1,2 +0,0 @@
-@import "textfield-normal.css";
-@import "richtext.css";
\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/base/textfield/richtext.css b/WebContent/VAADIN/themes/base/textfield/textfield.scss
index 6a236886cc..dc6a4d9aa3 100644
--- a/WebContent/VAADIN/themes/base/textfield/richtext.css
+++ b/WebContent/VAADIN/themes/base/textfield/textfield.scss
@@ -1,3 +1,62 @@
+// textfield-normal.css
+
+@mixin base-textfield {
+
+.v-textfield {
+	text-align: left; /* Force default alignment */
+}
+.v-textarea {
+	resize: none;
+	white-space: pre-wrap;
+}
+.v-textfield-focus,
+.v-textarea-focus {
+}
+input.v-textfield-prompt,
+textarea.v-textarea-prompt {
+	color: #999;
+	font-style: italic;
+}
+input.v-textfield-readonly,
+textarea.v-textarea-readonly {
+	background: transparent;
+	border: none;
+	resize: none;
+}
+input.v-disabled,
+textarea.v-disabled {
+	resize: none;
+}
+input.v-textfield-readonly:focus,
+textarea.v-textarea-readonly:focus {
+	outline: none;
+}
+/* Disabled by default
+.v-textarea-error,
+.v-textfield-error,
+.v-richtextarea-error iframe.gwt-RichTextArea {
+	background: #FFE0E0;	
+}
+*/
+/* Disabled by default
+.v-textarea-required,
+.v-textfield-required,
+.v-richtextarea-required iframe.gwt-RichTextArea {
+	background: #FFE0E0;	
+}
+*/
+/* Safari focus glow fix */
+.v-sa input:focus, 
+.v-sa textarea:focus {
+	outline-width: medium;
+}
+
+}
+
+// richtext.css
+
+@mixin base-richtextarea {
+
 .v-richtextarea {
 	border: 1px solid #aaa;
 	overflow: hidden;
@@ -55,4 +114,6 @@
 
 .v-richtextarea-readonly {
 	border: none;
+}
+
 }
\ No newline at end of file