1 files changed, 27 insertions, 27 deletions

diff --git a/WebContent/VAADIN/themes/chameleon/components/label/label.scss b/WebContent/VAADIN/themes/chameleon/components/label/label.scss
index a1c75ad2f1..5952ee2802 100644
--- a/WebContent/VAADIN/themes/chameleon/components/label/label.scss
+++ b/WebContent/VAADIN/themes/chameleon/components/label/label.scss
@@ -1,40 +1,40 @@
-@mixin chameleon-label {
+@mixin chameleon-label($primaryStyleName : v-label) {
 
 /*******************************************************************************
  * Different headers
  ******************************************************************************/
-.v-label-h1,
-.v-label h1,
-.v-label-h2,
-.v-label h2,
-.v-label-h3,
-.v-label h3,
-.v-label-h4,
-.v-label h4 {
+.#{$primaryStyleName}-h1,
+.#{$primaryStyleName} h1,
+.#{$primaryStyleName}-h2,
+.#{$primaryStyleName} h2,
+.#{$primaryStyleName}-h3,
+.#{$primaryStyleName} h3,
+.#{$primaryStyleName}-h4,
+.#{$primaryStyleName} h4 {
 	margin: 0;
 	font-weight: bold;
 	}
 
-.v-label-h1,
-.v-label h1 {
+.#{$primaryStyleName}-h1,
+.#{$primaryStyleName} h1 {
 	padding: .75em 0 .5em 0;
 	font-size: 1.85em;
 	}
 
-.v-label-h2,
-.v-label h2 {
+.#{$primaryStyleName}-h2,
+.#{$primaryStyleName} h2 {
 	padding: .67em 0 .33em 0;
 	font-size: 1.4em;
 	}
 
-.v-label-h3,
-.v-label h3 {
+.#{$primaryStyleName}-h3,
+.#{$primaryStyleName} h3 {
 	margin: .71em 0 .29em 0;
 	font-size: 1.1em;
 	}
 
-.v-label-h4,
-.v-label h4 {
+.#{$primaryStyleName}-h4,
+.#{$primaryStyleName} h4 {
 	padding: .23em 0;
 	font-size: 1em;
 	}
@@ -43,7 +43,7 @@
 /*******************************************************************************
  * Big
  ******************************************************************************/
-.v-label-big {
+.#{$primaryStyleName}-big {
 	font-size: 1.2em;
 	}
 
@@ -51,7 +51,7 @@
 /*******************************************************************************
  * Small
  ******************************************************************************/
-.v-label-small {
+.#{$primaryStyleName}-small {
 	font-size: 0.9em;
 	line-height: 1.3;
 	opacity: .8;
@@ -62,7 +62,7 @@
 /*******************************************************************************
  * Tiny
  ******************************************************************************/
-.v-label-tiny {
+.#{$primaryStyleName}-tiny {
 	font-size: 0.85em;
 	line-height: 1.2;
 	opacity: .7;
@@ -73,8 +73,8 @@
 /*******************************************************************************
  * Warning & error
  ******************************************************************************/
-&.v-app .v-label-warning,
-&.v-app .v-label-error {
+&.v-app .#{$primaryStyleName}-warning,
+&.v-app .#{$primaryStyleName}-error {
 	color: #574734;
 	background: #fffec8 url(../../img/label-warning-icon.png) no-repeat .2em 50%;
 	white-space: nowrap;
@@ -87,7 +87,7 @@
 	text-shadow: none;
 	}
 
-&.v-app .v-label-error {
+&.v-app .#{$primaryStyleName}-error {
 	color: #fff;
 	font-weight: bold;
 	background: #c22f24 url(../../img/label-error-icon.png) no-repeat .2em 50%;
@@ -98,14 +98,14 @@
 /*******************************************************************************
  * Big warning & big error
  ******************************************************************************/
-.v-label-big.v-label-warning,
-.v-label-big.v-label-error {
+.#{$primaryStyleName}-big.#{$primaryStyleName}-warning,
+.#{$primaryStyleName}-big.#{$primaryStyleName}-error {
 	background-image: url(../../img/label-warning-icon-big.png);
 	background-position: 0 50%;
 	padding: .5em 1em .5em 3em;
 	}
 
-.v-label-big.v-label-error {
+.#{$primaryStyleName}-big.#{$primaryStyleName}-error {
 	background-image: url(../../img/label-error-icon-big.png);
 	}
 
@@ -113,7 +113,7 @@
 /*******************************************************************************
  * Loading
  ******************************************************************************/
-&.v-app .v-label-loading {
+&.v-app .#{$primaryStyleName}-loading {
 	height: 32px;
 	line-height: 32px;
 	background-image: url(../../../base/common/img/loading-indicator.gif);