1 files changed, 17 insertions, 17 deletions

diff --git a/WebContent/VAADIN/themes/chameleon/components/textfield/textfield.scss b/WebContent/VAADIN/themes/chameleon/components/textfield/textfield.scss
index 026a7e5bfe..860d91a6e7 100644
--- a/WebContent/VAADIN/themes/chameleon/components/textfield/textfield.scss
+++ b/WebContent/VAADIN/themes/chameleon/components/textfield/textfield.scss
@@ -1,6 +1,6 @@
-@mixin chameleon-textfield {
+@mixin chameleon-textfield($primaryStyleName : v-textfield) {
 
-input.v-textfield,
+input.#{$primaryStyleName},
 textarea.v-textarea,
 .v-filterselect {
 	line-height: normal;
@@ -17,40 +17,40 @@ textarea.v-textarea,
 	margin: 0;
 	}
 
-input.v-textfield[type="text"],
+input.#{$primaryStyleName}[type="text"],
 textarea.v-textarea,
 .v-filterselect {
 	padding: .2em;
 	}
 
-input.v-textfield[type="text"] {
+input.#{$primaryStyleName}[type="text"] {
 	height: 1.2em;
 	}
 
-input.v-widget.v-textfield[type="text"],
+input.v-widget.#{$primaryStyleName}[type="text"],
 .v-filterselect {
 	height: 1.6em;
 	}
 
-&.v-app input.v-textfield,
+&.v-app input.#{$primaryStyleName},
 &.v-app textarea.v-textarea,
 &.v-app input.v-filterselect-input {
 	color: #222;
 	}
 
-.v-ie & input.v-textfield,
+.v-ie & input.#{$primaryStyleName},
 .v-ie & textarea.v-textarea,
 .v-ie & .v-filterselect {
 	border-top-color: #808080;
 	}
 
-&.v-app input.v-textfield-prompt,
+&.v-app input.#{$primaryStyleName}-prompt,
 &.v-app textarea.v-textarea-prompt {
 	font-style: normal;
 	color: #999;
 	}
 
-input.v-textfield-focus,
+input.#{$primaryStyleName}-focus,
 textarea.v-textarea-focus {
 	background-color: #fffce1;
 	}
@@ -59,7 +59,7 @@ textarea.v-textarea-focus {
 /*******************************************************************************
  * Readonly
  ******************************************************************************/
-input.v-textfield-readonly,
+input.#{$primaryStyleName}-readonly,
 textarea.v-textarea-readonly {
 	border: none;
 	background: transparent;
@@ -69,7 +69,7 @@ textarea.v-textarea-readonly {
 /*******************************************************************************
  * Small
  ******************************************************************************/
-&.v-app input.v-textfield-small,
+&.v-app input.#{$primaryStyleName}-small,
 &.v-app textarea.v-textarea-small,
 .v-datefield-small .v-datefield-textfield,
 .v-datefield-small .v-datefield-button,
@@ -81,7 +81,7 @@ textarea.v-textarea-readonly {
 /*******************************************************************************
  * Big (and big search)
  ******************************************************************************/
-&.v-app input.v-textfield-big,
+&.v-app input.#{$primaryStyleName}-big,
 &.v-app textarea.v-textarea-big,
 .v-datefield-big .v-datefield-textfield,
 .v-datefield-big .v-datefield-button,
@@ -89,7 +89,7 @@ textarea.v-textarea-readonly {
 	font-size: 1.2em;
 	}
 
-input.v-textfield-big[type=text],
+input.#{$primaryStyleName}-big[type=text],
 .v-datefield-big input.v-datefield-textfield[type=text] {
 	padding: .3em;
 	}
@@ -99,14 +99,14 @@ textarea.v-textarea,
 	padding: .3em;
 	}
 
-input.v-textfield-big.v-textfield-search,
+input.#{$primaryStyleName}-big.#{$primaryStyleName}-search,
 .v-filterselect-search.v-filterselect-big {
 	background-image: url(../../img/magnifier-big.png);
 	background-repeat: no-repeat;
 	background-position: 4px 50%;
 	}
 
-input.v-textfield-big.v-textfield-search[type=text] {
+input.#{$primaryStyleName}-big.#{$primaryStyleName}-search[type=text] {
 	padding-left: 26px;
 	}
 
@@ -118,14 +118,14 @@ input.v-textfield-big.v-textfield-search[type=text] {
 /*******************************************************************************
  * Search
  ******************************************************************************/
-input.v-textfield-search,
+input.#{$primaryStyleName}-search,
 .v-filterselect-search {
 	background-image: url(../../img/magnifier.png);
 	background-repeat: no-repeat;
 	background-position: 3px 50%;
 	}
 
-input.v-textfield-search[type=text],
+input.#{$primaryStyleName}-search[type=text],
 .v-filterselect-search {
 	padding-left: 17px;
 	}