diff options
| author | Artur Signell <artur@vaadin.com> | 2012-11-23 11:38:16 +0000 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2012-11-23 11:38:16 +0000 |
| commit | 62a43b95f0d0247fed0550180c706692a4a41a84 (patch) | |
| tree | 5527b9546ed24d493fc0cd62ad19a539d6ca6e73 /WebContent/VAADIN/themes/reindeer/button/nativebutton.scss | |
| parent | 2c29f350a5f44eca269c67bc88b14888790359e7 (diff) | |
| parent | bd2caa54a548d7284e91cb7e87472deb2dcec42d (diff) | |
| download | vaadin-framework-62a43b95f0d0247fed0550180c706692a4a41a84.tar.gz vaadin-framework-62a43b95f0d0247fed0550180c706692a4a41a84.zip | |
Merge "Change sass compoent @mixin parameter from $name to $primaryStyleName, fixes #10294"
Diffstat (limited to 'WebContent/VAADIN/themes/reindeer/button/nativebutton.scss')
| -rw-r--r-- | WebContent/VAADIN/themes/reindeer/button/nativebutton.scss | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/WebContent/VAADIN/themes/reindeer/button/nativebutton.scss b/WebContent/VAADIN/themes/reindeer/button/nativebutton.scss index bd6ca35627..ca7a16e88e 100644 --- a/WebContent/VAADIN/themes/reindeer/button/nativebutton.scss +++ b/WebContent/VAADIN/themes/reindeer/button/nativebutton.scss @@ -1,9 +1,9 @@ /* Browser-specific corrections to the standard implementation */ @import "button-ie.scss"; -@mixin reindeer-nativebutton-link($name : v-nativebutton) { +@mixin reindeer-nativebutton-link($primaryStyleName : v-nativebutton) { -.#{$name}-link .#{$name}-caption { +.#{$primaryStyleName}-link .#{$primaryStyleName}-caption { line-height: inherit; font-weight: normal; color: #1b699f; @@ -11,15 +11,15 @@ text-shadow: none; } -.#{$name}-link:focus .#{$name}-caption { +.#{$primaryStyleName}-link:focus .#{$primaryStyleName}-caption { outline: 1px dotted #1b699f; } } -@mixin reindeer-nativebutton($name : v-nativebutton) { - @include reindeer-nativebutton-link($name); +@mixin reindeer-nativebutton($primaryStyleName : v-nativebutton) { + @include reindeer-nativebutton-link($primaryStyleName); /* Browser-specific corrections to the standard implementation */ - @include reindeer-button-ie($name); + @include reindeer-button-ie($primaryStyleName); }
\ No newline at end of file |