From bd2caa54a548d7284e91cb7e87472deb2dcec42d Mon Sep 17 00:00:00 2001 From: Marc Englund Date: Fri, 23 Nov 2012 12:32:08 +0200 Subject: Change sass compoent @mixin parameter from $name to $primaryStyleName, fixes #10294 Change-Id: I548fdd3b0295db980bc4d769826e7c149ec0b3b3 --- .../base/progressindicator/progressindicator.scss | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'WebContent/VAADIN/themes/base/progressindicator') diff --git a/WebContent/VAADIN/themes/base/progressindicator/progressindicator.scss b/WebContent/VAADIN/themes/base/progressindicator/progressindicator.scss index 7af1ba1f0e..0065cf3d07 100644 --- a/WebContent/VAADIN/themes/base/progressindicator/progressindicator.scss +++ b/WebContent/VAADIN/themes/base/progressindicator/progressindicator.scss @@ -1,17 +1,17 @@ -@mixin base-progressindicator($name : v-progressindicator) { +@mixin base-progressindicator($primaryStyleName : v-progressindicator) { -.#{$name} { +.#{$primaryStyleName} { width: 150px; } -.#{$name}-wrapper { +.#{$primaryStyleName}-wrapper { height: 7px; border: 1px solid #ddd; } -.#{$name}-indicator { +.#{$primaryStyleName}-indicator { height: 7px; background: #ddd; } -div.#{$name}-indeterminate { +div.#{$primaryStyleName}-indeterminate { height: 20px; width: 20px; background: #fff url(../common/img/ajax-loader-medium.gif) no-repeat 50%; @@ -20,13 +20,13 @@ div.#{$name}-indeterminate { -moz-border-radius: 4px; } /* Hide obsolete elements in indeterminate mode */ -.#{$name}-indeterminate .#{$name}-wrapper, -.#{$name}-indeterminate .#{$name}-indicator, -.#{$name}-indeterminate-disabled .#{$name}-wrapper, -.#{$name}-indeterminate-disabled .#{$name}-indicator { +.#{$primaryStyleName}-indeterminate .#{$primaryStyleName}-wrapper, +.#{$primaryStyleName}-indeterminate .#{$primaryStyleName}-indicator, +.#{$primaryStyleName}-indeterminate-disabled .#{$primaryStyleName}-wrapper, +.#{$primaryStyleName}-indeterminate-disabled .#{$primaryStyleName}-indicator { display: none; } -div.#{$name}-indeterminate-disabled { +div.#{$primaryStyleName}-indeterminate-disabled { height: 20px; width: 20px; background: transparent; -- cgit v1.2.3