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/reindeer/panel | |
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/reindeer/panel')
-rw-r--r-- | WebContent/VAADIN/themes/reindeer/panel/panel.scss | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/WebContent/VAADIN/themes/reindeer/panel/panel.scss b/WebContent/VAADIN/themes/reindeer/panel/panel.scss index e692ba90a9..8de6ea7f62 100644 --- a/WebContent/VAADIN/themes/reindeer/panel/panel.scss +++ b/WebContent/VAADIN/themes/reindeer/panel/panel.scss @@ -1,58 +1,58 @@ -@mixin reindeer-panel($name : v-panel) { +@mixin reindeer-panel($primaryStyleName : v-panel) { -.blue .#{$name}-caption, -.blue .#{$name}-nocaption, -.blue .#{$name}-content { +.blue .#{$primaryStyleName}-caption, +.blue .#{$primaryStyleName}-nocaption, +.blue .#{$primaryStyleName}-content { border-color: #a8bcc5; } -.#{$name}-caption, -.#{$name}-nocaption, -.white .#{$name}-caption, -.white .#{$name}-nocaption { +.#{$primaryStyleName}-caption, +.#{$primaryStyleName}-nocaption, +.white .#{$primaryStyleName}-caption, +.white .#{$primaryStyleName}-nocaption { border-bottom: 1px solid #e5e5e5; line-height: 16px; /* accommodate minimum icon size */ } -.v-webkit .#{$name}-caption, -.v-webkit .#{$name}-nocaption, -.v-gecko .#{$name}-caption, -.v-gecko .#{$name}-nocaption, -.v-ie9 .#{$name}-caption, -.v-ie9 .#{$name}-nocaption { +.v-webkit .#{$primaryStyleName}-caption, +.v-webkit .#{$primaryStyleName}-nocaption, +.v-gecko .#{$primaryStyleName}-caption, +.v-gecko .#{$primaryStyleName}-nocaption, +.v-ie9 .#{$primaryStyleName}-caption, +.v-ie9 .#{$primaryStyleName}-nocaption { border-bottom-color: rgba(0,0,0,.08); } -.#{$name}-caption { +.#{$primaryStyleName}-caption { padding-bottom: 2px; } -.#{$name}-content, -.white .#{$name}-content { +.#{$primaryStyleName}-content, +.white .#{$primaryStyleName}-content { background: #fff; border: 1px solid #dcdcdc; border-bottom: none; border-top: none; } -.v-webkit .#{$name}-content, -.v-gecko .#{$name}-content, -.v-ie9 .#{$name}-content { +.v-webkit .#{$primaryStyleName}-content, +.v-gecko .#{$primaryStyleName}-content, +.v-ie9 .#{$primaryStyleName}-content { border-top-color: rgba(0,0,0,.07); } -.blue .#{$name}-deco { +.blue .#{$primaryStyleName}-deco { border-color: #92a3ac; background: #adc2cd; } -.#{$name}-deco, -.white .#{$name}-deco { +.#{$primaryStyleName}-deco, +.white .#{$primaryStyleName}-deco { height: 1px; border-top: 1px solid #bebebe; background: #e2e2e2; overflow: hidden; } -.v-webkit .#{$name}-deco, -.v-gecko .#{$name}-deco, -.v-ie9 .#{$name}-deco { +.v-webkit .#{$primaryStyleName}-deco, +.v-gecko .#{$primaryStyleName}-deco, +.v-ie9 .#{$primaryStyleName}-deco { border-top-color: rgba(0,0,0,.1); background: rgba(0,0,0,.08); } -.#{$name}-caption .v-errorindicator { +.#{$primaryStyleName}-caption .v-errorindicator { height: 16px; width: 13px; background: url(../common/icons/error.png) no-repeat 50%; @@ -62,15 +62,15 @@ } /* Light style */ -.#{$name}-light .#{$name}-caption-light, -.#{$name}-light .#{$name}-nocaption-light { +.#{$primaryStyleName}-light .#{$primaryStyleName}-caption-light, +.#{$primaryStyleName}-light .#{$primaryStyleName}-nocaption-light { border: none; } -.#{$name}-light .#{$name}-content-light { +.#{$primaryStyleName}-light .#{$primaryStyleName}-content-light { border: none; background: transparent; } -.#{$name}-light .#{$name}-deco-light { +.#{$primaryStyleName}-light .#{$primaryStyleName}-deco-light { height: 0; border: none; } |