diff options
author | Marc Englund <marc@vaadin.com> | 2012-11-23 12:32:08 +0200 |
---|---|---|
committer | Marc Englund <marc@vaadin.com> | 2012-11-23 12:50:53 +0200 |
commit | bd2caa54a548d7284e91cb7e87472deb2dcec42d (patch) | |
tree | f800bc5a9a4f847b22637106ea848b3397d5ec05 /WebContent/VAADIN/themes/base/slider/slider.scss | |
parent | 8b90d2e2d32e63411e44932fffbe8a06cf1dcb8b (diff) | |
download | vaadin-framework-bd2caa54a548d7284e91cb7e87472deb2dcec42d.tar.gz vaadin-framework-bd2caa54a548d7284e91cb7e87472deb2dcec42d.zip |
Change sass compoent @mixin parameter from $name to $primaryStyleName, fixes #10294
Change-Id: I548fdd3b0295db980bc4d769826e7c149ec0b3b3
Diffstat (limited to 'WebContent/VAADIN/themes/base/slider/slider.scss')
-rw-r--r-- | WebContent/VAADIN/themes/base/slider/slider.scss | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/WebContent/VAADIN/themes/base/slider/slider.scss b/WebContent/VAADIN/themes/base/slider/slider.scss index bfb4c3b950..9ef94d9d9e 100644 --- a/WebContent/VAADIN/themes/base/slider/slider.scss +++ b/WebContent/VAADIN/themes/base/slider/slider.scss @@ -1,9 +1,9 @@ -@mixin base-slider($name : v-slider) { +@mixin base-slider($primaryStyleName : v-slider) { -.#{$name} { +.#{$primaryStyleName} { margin: 5px 0; } -.#{$name}-base { +.#{$primaryStyleName}-base { /* changing the borders will require adjustments to ISlider.java */ height: 2px; border-top: 1px solid #ddd; @@ -12,7 +12,7 @@ border-right: 1px solid #eee; } -.#{$name}-handle { +.#{$primaryStyleName}-handle { background: #aaa; width: 12px; height: 12px; @@ -20,7 +20,7 @@ font-size: 0; } -.#{$name}-vertical { +.#{$primaryStyleName}-vertical { width: 2px; height: auto; margin: 0 5px; @@ -28,19 +28,19 @@ border-left: 1px solid #cccfd0; border-right: 1px solid #cccfd0; } -.#{$name}-vertical .#{$name}-base { +.#{$primaryStyleName}-vertical .#{$primaryStyleName}-base { width: 2px; border-bottom: 1px solid #eee; border-right: none; } -.#{$name}-vertical .#{$name}-handle { +.#{$primaryStyleName}-vertical .#{$primaryStyleName}-handle { width: 12px; height: 12px; font-size: 0; margin-left: -5px; } -.#{$name}-feedback { +.#{$primaryStyleName}-feedback { padding: 2px 5px; background: #444; color: #fff; @@ -56,12 +56,12 @@ } /* Disabled by default -.#{$name}-error .#{$name}-base { +.#{$primaryStyleName}-error .#{$primaryStyleName}-base { background: #FFE0E0; } */ /* Disabled by default -.#{$name}-required .#{$name}-base { +.#{$primaryStyleName}-required .#{$primaryStyleName}-base { background: #FFE0E0; } */ |