From bd2caa54a548d7284e91cb7e87472deb2dcec42d Mon Sep 17 00:00:00 2001
From: Marc Englund <marc@vaadin.com>
Date: Fri, 23 Nov 2012 12:32:08 +0200
Subject: Change sass compoent @mixin parameter from $name to
 $primaryStyleName, fixes #10294

Change-Id: I548fdd3b0295db980bc4d769826e7c149ec0b3b3
---
 WebContent/VAADIN/themes/base/upload/upload.scss | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'WebContent/VAADIN/themes/base/upload')

diff --git a/WebContent/VAADIN/themes/base/upload/upload.scss b/WebContent/VAADIN/themes/base/upload/upload.scss
index a992f95f06..71827480ae 100644
--- a/WebContent/VAADIN/themes/base/upload/upload.scss
+++ b/WebContent/VAADIN/themes/base/upload/upload.scss
@@ -1,22 +1,22 @@
-@mixin base-upload($name : v-upload) {
+@mixin base-upload($primaryStyleName : v-upload) {
 
-.#{$name} {
+.#{$primaryStyleName} {
 	white-space: nowrap;
 }
 
 
-.#{$name}-immediate {
+.#{$primaryStyleName}-immediate {
 	position: relative;
 	margin: 0;
 	overflow: hidden;
 }
 
-.v-ff .#{$name}-immediate,
-.v-op .#{$name}-immediate {
+.v-ff .#{$primaryStyleName}-immediate,
+.v-op .#{$primaryStyleName}-immediate {
 	display: inline-block;
 }
 
-.#{$name}-immediate input {
+.#{$primaryStyleName}-immediate input {
 	opacity: 0;
 	filter: alpha(opacity=0);
 	z-index: 2;
@@ -28,7 +28,7 @@
 	background: transparent;
 }
 
-.#{$name}-immediate button {
+.#{$primaryStyleName}-immediate button {
 	position: relative;
 	left: 0;
 	top: 0;
-- 
cgit v1.2.3