3 files changed, 31 insertions, 31 deletions

diff --git a/WebContent/VAADIN/themes/base/button/button.scss b/WebContent/VAADIN/themes/base/button/button.scss
index 37a5973437..212e386e29 100644
--- a/WebContent/VAADIN/themes/base/button/button.scss
+++ b/WebContent/VAADIN/themes/base/button/button.scss
@@ -1,9 +1,9 @@
-@mixin base-button($name : v-button) {
+@mixin base-button($primaryStyleName : v-button) {
 
 /*
  * Default button (more customizable)
  * -------------------------------------- */
-.#{$name} {
+.#{$primaryStyleName} {
 	display: inline-block;
 	zoom: 1;
 	text-align: center !important;
@@ -26,12 +26,12 @@
 	box-sizing: border-box;
 }
 
-.#{$name}.v-disabled {
+.#{$primaryStyleName}.v-disabled {
 	cursor: default;
 }
 
-.#{$name}-wrap,
-.#{$name}-caption {
+.#{$primaryStyleName}-wrap,
+.#{$primaryStyleName}-caption {
 	vertical-align: baseline;
 	white-space: nowrap;
 	font: inherit;
@@ -39,13 +39,13 @@
 	line-height: normal;
 	}
 
-.#{$name} .v-icon {
+.#{$primaryStyleName} .v-icon {
 	vertical-align: middle;
 	margin-right: 3px;
 	border: none;
 	}
 
-.#{$name} .v-errorindicator {
+.#{$primaryStyleName} .v-errorindicator {
 	display: inline-block;
 	zoom: 1;
 	vertical-align: middle;
@@ -53,7 +53,7 @@
 }
 
 /* Link style (we really should deprecate this) */
-.#{$name}-link {
+.#{$primaryStyleName}-link {
 	border: none;
 	text-align: left !important;
 	background: transparent;
@@ -66,11 +66,11 @@
 }
 
 /* Inset Safari focus outline a bit */
-.v-sa .#{$name}-link:focus{
+.v-sa .#{$primaryStyleName}-link:focus{
 	outline-offset: -3px;
 	}
 
-.#{$name}-link .#{$name}-caption {
+.#{$primaryStyleName}-link .#{$primaryStyleName}-caption {
 	text-decoration: underline;
 	color: inherit;
 	text-align: left;
diff --git a/WebContent/VAADIN/themes/base/button/checkbox.scss b/WebContent/VAADIN/themes/base/button/checkbox.scss
index 9222e76975..cc6143dbc1 100644
--- a/WebContent/VAADIN/themes/base/button/checkbox.scss
+++ b/WebContent/VAADIN/themes/base/button/checkbox.scss
@@ -1,21 +1,21 @@
-@mixin base-checkbox($name : v-checkbox) {
+@mixin base-checkbox($primaryStyleName : v-checkbox) {
 
- .#{$name} {
+ .#{$primaryStyleName} {
  	display: block;
  }
 
-.#{$name},
-.#{$name} label,
-.#{$name} input,
-.#{$name} .v-icon {
+.#{$primaryStyleName},
+.#{$primaryStyleName} label,
+.#{$primaryStyleName} input,
+.#{$primaryStyleName} .v-icon {
 	vertical-align: middle;
 	white-space: nowrap;
 }
 
-.#{$name} .v-icon {
+.#{$primaryStyleName} .v-icon {
 	margin: 0 2px;
 }
-.#{$name} .v-errorindicator {
+.#{$primaryStyleName} .v-errorindicator {
 	float: none;
 	display: inline;
 	display: inline-block;
@@ -24,12 +24,12 @@
 
 
 /* Disabled by default
-.#{$name}-error {
+.#{$primaryStyleName}-error {
 	background: #ffe0e0;
 }
 */
 /* Disabled by default
-.#{$name}-required {
+.#{$primaryStyleName}-required {
 	background: #ffe0e0;
 }
 */
diff --git a/WebContent/VAADIN/themes/base/button/nativebutton.scss b/WebContent/VAADIN/themes/base/button/nativebutton.scss
index cccc51ff7b..724316a34d 100644
--- a/WebContent/VAADIN/themes/base/button/nativebutton.scss
+++ b/WebContent/VAADIN/themes/base/button/nativebutton.scss
@@ -1,13 +1,13 @@
-@mixin base-nativebutton($name : v-nativebutton) {
+@mixin base-nativebutton($primaryStyleName : v-nativebutton) {
 
 
-.#{$name} .v-icon {
+.#{$primaryStyleName} .v-icon {
 	vertical-align: middle;
 	margin-right: 3px;
 	border: none;
 	}
 
-.#{$name} .v-errorindicator {
+.#{$primaryStyleName} .v-errorindicator {
 	display: inline-block;
 	zoom: 1;
 	vertical-align: middle;
@@ -15,7 +15,7 @@
 }
 
 /* Link style (we really should deprecate this) */
-.#{$name}-link {
+.#{$primaryStyleName}-link {
 	border: none;
 	text-align: left !important;
 	background: transparent;
@@ -27,13 +27,13 @@
 	user-select: text;
 }
 
-.#{$name}-link .#{$name}-caption {
+.#{$primaryStyleName}-link .#{$primaryStyleName}-caption {
 	text-decoration: underline;
 	color: inherit;
 	text-align: left;
 	}
 
-.#{$name} {
+.#{$primaryStyleName} {
 	text-align: center !important;
 	cursor: pointer;
 	white-space: nowrap;
@@ -42,31 +42,31 @@
 	font: inherit;
 	line-height: normal;
 	}
-.#{$name} .#{$name}-caption {
+.#{$primaryStyleName} .#{$primaryStyleName}-caption {
 	vertical-align: middle;
 	white-space: nowrap;
 	font: inherit;
 	color: inherit;
 	}
 
-.#{$name} .v-icon {
+.#{$primaryStyleName} .v-icon {
 	vertical-align: middle;
 	margin-right: 3px;
 	}
 
-.#{$name} .v-errorindicator {
+.#{$primaryStyleName} .v-errorindicator {
 	display: inline-block;
 	zoom: 1;
 	float: none;
 }
 /* Fixes stretched buttons in IE7*/
-.v-ie .#{$name} {
+.v-ie .#{$primaryStyleName} {
 	overflow: visible;
 	padding-left: 1em;
 	padding-right: 1em;
 }
 
-.v-ie .#{$name}-link {
+.v-ie .#{$primaryStyleName}-link {
 	padding: 0;
 }