Merge "Change sass compoent @mixin parameter from $name to $primaryStyleName, fixes #10294"

1 files changed, 23 insertions, 23 deletions

diff --git a/WebContent/VAADIN/themes/reindeer/button/button-standard.scss b/WebContent/VAADIN/themes/reindeer/button/button-standard.scss
index f950060d4a..632340f228 100644
--- a/WebContent/VAADIN/themes/reindeer/button/button-standard.scss
+++ b/WebContent/VAADIN/themes/reindeer/button/button-standard.scss
@@ -1,29 +1,29 @@
-@mixin reindeer-button-standard($name : v-button) {
+@mixin reindeer-button-standard($primaryStyleName : v-button) {
 
-.#{$name}:focus {
+.#{$primaryStyleName}:focus {
 	background-image: url(img/left-focus.png); /** sprite-ref: buttons */
 	outline: none;
 	}
 
-.#{$name}:focus .#{$name}-wrap {
+.#{$primaryStyleName}:focus .#{$primaryStyleName}-wrap {
 	background-image: url(img/right-focus.png); /** sprite-ref: buttons; sprite-alignment: right */
 	outline: none;
 	}
 
-.#{$name}:active,
-.#{$name}.v-pressed {
+.#{$primaryStyleName}:active,
+.#{$primaryStyleName}.v-pressed {
 	background-image: url(img/left-pressed.png); /** sprite-ref: buttons */
 	outline: none;
 	}
 
-.#{$name}:active .#{$name}-wrap,
-.#{$name}.v-pressed .#{$name}-wrap {
+.#{$primaryStyleName}:active .#{$primaryStyleName}-wrap,
+.#{$primaryStyleName}.v-pressed .#{$primaryStyleName}-wrap {
 	background-image: url(img/right-pressed.png); /** sprite-ref: buttons; sprite-alignment: right */
 	outline: none;
 	}
 
-.#{$name},
-.v-disabled.#{$name} {
+.#{$primaryStyleName},
+.v-disabled.#{$primaryStyleName} {
 	height: 26px;
 	padding: 0 0 0 6px;
 	background-color: transparent;
@@ -33,8 +33,8 @@
 	cursor: default;
 	}
 
-.#{$name}-wrap,
-.v-disabled.#{$name} .#{$name}-wrap {
+.#{$primaryStyleName}-wrap,
+.v-disabled.#{$primaryStyleName} .#{$primaryStyleName}-wrap {
 	display: block;
 	height: 22px;
 	padding: 4px 15px 0 9px;
@@ -44,7 +44,7 @@
 	background-image: url(img/right.png);  /** sprite-ref: buttons; sprite-alignment: right */
 	}
 
-.#{$name}-caption {
+.#{$primaryStyleName}-caption {
 	color: #222;
 	text-shadow: #fff 0 1px 0;
 	font-weight: bold;
@@ -58,35 +58,35 @@
 /**************************
  * Black style
  **************************/
-.black .#{$name}:focus {
+.black .#{$primaryStyleName}:focus {
 	background-image: url(img/black/left-focus.png); /** sprite-ref: black-buttons */
 	}
 	
-.black .#{$name}:focus .#{$name}-wrap {
+.black .#{$primaryStyleName}:focus .#{$primaryStyleName}-wrap {
 	background-image: url(img/black/right-focus.png); /** sprite-ref: black-buttons; sprite-alignment: right */
 	}
 	
-.black .#{$name}:active,
-.black .#{$name}.v-pressed {
+.black .#{$primaryStyleName}:active,
+.black .#{$primaryStyleName}.v-pressed {
 	background-image: url(img/black/left-pressed.png); /** sprite-ref: black-buttons */
 	}
 	
-.black .#{$name}:active .#{$name}-wrap,
-.black .#{$name}.v-pressed .#{$name}-wrap {
+.black .#{$primaryStyleName}:active .#{$primaryStyleName}-wrap,
+.black .#{$primaryStyleName}.v-pressed .#{$primaryStyleName}-wrap {
 	background-image: url(img/black/right-pressed.png); /** sprite-ref: black-buttons; sprite-alignment: right */
 	}
 
-.black .#{$name},
-.black .v-disabled.#{$name} {
+.black .#{$primaryStyleName},
+.black .v-disabled.#{$primaryStyleName} {
 	background-image: url(img/black/left.png); /** sprite-ref: black-buttons */
 	}
 	
-.black .#{$name}-wrap,
-.black .v-disabled.#{$name} .#{$name}-wrap {
+.black .#{$primaryStyleName}-wrap,
+.black .v-disabled.#{$primaryStyleName} .#{$primaryStyleName}-wrap {
 	background-image: url(img/black/right.png); /** sprite-ref: black-buttons; sprite-alignment: right */
 	}
 	
-.black .#{$name}-caption {
+.black .#{$primaryStyleName}-caption {
 	color: #c9ccce;
 	text-shadow: #121314 0 -1px 0;
 	}