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/button/button.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/button/button.scss')
-rw-r--r-- | WebContent/VAADIN/themes/base/button/button.scss | 20 |
1 files changed, 10 insertions, 10 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; |