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 --- .../VAADIN/themes/runo/datefield/datefield.scss | 78 +++++++++++----------- .../runo/inlinedatefield/inlinedatefield.scss | 4 +- 2 files changed, 41 insertions(+), 41 deletions(-) (limited to 'WebContent/VAADIN/themes/runo') diff --git a/WebContent/VAADIN/themes/runo/datefield/datefield.scss b/WebContent/VAADIN/themes/runo/datefield/datefield.scss index 82dad4a0ac..f007810750 100644 --- a/WebContent/VAADIN/themes/runo/datefield/datefield.scss +++ b/WebContent/VAADIN/themes/runo/datefield/datefield.scss @@ -1,10 +1,10 @@ -@mixin runo-datefield($name : v-datefield) { +@mixin runo-datefield($primaryStyleName : v-datefield) { -.#{$name} input.v-textfield, -.#{$name} input.v-textfield[type=text] { +.#{$primaryStyleName} input.v-textfield, +.#{$primaryStyleName} input.v-textfield[type=text] { height: 18px; } -.#{$name}-button { +.#{$primaryStyleName}-button { font-size:13px; width: 22px; height: 24px; @@ -14,7 +14,7 @@ background: transparent url(img/open-button.png) no-repeat right 0; vertical-align: top; } -.#{$name}-popup { +.#{$primaryStyleName}-popup { font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif; color: #464f52; font-size: 12px; @@ -25,39 +25,39 @@ -moz-border-radius: 4px; border-radius: 4px; } -.#{$name}-calendarpanel { +.#{$primaryStyleName}-calendarpanel { width: 230px; } -.#{$name}-popup .#{$name}-calendarpanel { +.#{$primaryStyleName}-popup .#{$primaryStyleName}-calendarpanel { width: 200px; } -.#{$name}-year .#{$name}-calendarpanel { +.#{$primaryStyleName}-year .#{$primaryStyleName}-calendarpanel { width: 100px; } -.#{$name}-calendarpanel td { +.#{$primaryStyleName}-calendarpanel td { text-align: right; } -.#{$name}-calendarpanel td span { +.#{$primaryStyleName}-calendarpanel td span { display: block; } -.#{$name}-calendarpanel-header { +.#{$primaryStyleName}-calendarpanel-header { height: 30px; font-size: 13px; } -td.#{$name}-calendarpanel-month { +td.#{$primaryStyleName}-calendarpanel-month { font-weight: bold; text-shadow: 0 1px 0 #fff; width: 150px; } -.#{$name}-calendarpanel-prevyear, -.#{$name}-calendarpanel-nextyear, -.#{$name}-calendarpanel-prevmonth, -.#{$name}-calendarpanel-nextmonth { +.#{$primaryStyleName}-calendarpanel-prevyear, +.#{$primaryStyleName}-calendarpanel-nextyear, +.#{$primaryStyleName}-calendarpanel-prevmonth, +.#{$primaryStyleName}-calendarpanel-nextmonth { width: 16px; } /* Year buttons */ -.#{$name}-calendarpanel .v-button-prevyear, -.#{$name}-calendarpanel .v-button-nextyear { +.#{$primaryStyleName}-calendarpanel .v-button-prevyear, +.#{$primaryStyleName}-calendarpanel .v-button-nextyear { display: block; width: 16px; height: 16px; @@ -67,16 +67,16 @@ td.#{$name}-calendarpanel-month { text-indent: -90000px; margin: 0 auto; } -.#{$name}-calendarpanel .v-button-nextyear { +.#{$primaryStyleName}-calendarpanel .v-button-nextyear { background: transparent url(img/nextyear.png) no-repeat; } -.#{$name}-calendarpanel .v-button-prevyear:hover, -.#{$name}-calendarpanel .v-button-nextyear:hover { +.#{$primaryStyleName}-calendarpanel .v-button-prevyear:hover, +.#{$primaryStyleName}-calendarpanel .v-button-nextyear:hover { background-position: left bottom; } /* Month buttons */ -.#{$name}-calendarpanel .v-button-prevmonth, -.#{$name}-calendarpanel .v-button-nextmonth { +.#{$primaryStyleName}-calendarpanel .v-button-prevmonth, +.#{$primaryStyleName}-calendarpanel .v-button-nextmonth { display: block; width: 11px; height: 16px; @@ -86,42 +86,42 @@ td.#{$name}-calendarpanel-month { text-indent: -90000px; margin: 0 auto; } -.#{$name}-calendarpanel .v-button-nextmonth { +.#{$primaryStyleName}-calendarpanel .v-button-nextmonth { background: transparent url(img/nextmonth.png) no-repeat; } -.#{$name}-calendarpanel .v-button-prevmonth:hover, -.#{$name}-calendarpanel .v-button-nextmonth:hover { +.#{$primaryStyleName}-calendarpanel .v-button-prevmonth:hover, +.#{$primaryStyleName}-calendarpanel .v-button-nextmonth:hover { background-position: left bottom; } -.#{$name}-calendarpanel strong { +.#{$primaryStyleName}-calendarpanel strong { color: #ee5311; display: block; width: 20px; font-size: 12px; } -.#{$name}-calendarpanel-day, -.#{$name}-calendarpanel-weeknumber, -.#{$name}-calendarpanel-day-today { +.#{$primaryStyleName}-calendarpanel-day, +.#{$primaryStyleName}-calendarpanel-weeknumber, +.#{$primaryStyleName}-calendarpanel-day-today { padding: 1px 3px; width: 14px; height: 16px; } -.#{$name}-calendarpanel-day-today { +.#{$primaryStyleName}-calendarpanel-day-today { border: 1px solid #429ce9; width: 12px; height: 14px; } -.#{$name}-calendarpanel-day-entry { +.#{$primaryStyleName}-calendarpanel-day-entry { color: #6a98b5; } -.#{$name}-calendarpanel-day-disabled { +.#{$primaryStyleName}-calendarpanel-day-disabled { font-weight: normal; color: #dddddd; } -.#{$name}-calendarpanel-day-entry.#{$name}-calendarpanel-day-disabled { +.#{$primaryStyleName}-calendarpanel-day-entry.#{$primaryStyleName}-calendarpanel-day-disabled { color: #afd6f8; } -.#{$name}-calendarpanel-day-selected { +.#{$primaryStyleName}-calendarpanel-day-selected { font-weight: bold; width: 14px; height: 16px; @@ -130,18 +130,18 @@ td.#{$name}-calendarpanel-month { background: transparent url(img/selected-bg.png) no-repeat 50% 50%; border: none; } -.#{$name}-time { +.#{$primaryStyleName}-time { font-size: 11px; } -.#{$name}-time .v-select { +.#{$primaryStyleName}-time .v-select { font-size: 10px; padding: 0; margin: 0; } -.#{$name}-rendererror .v-textfield { +.#{$primaryStyleName}-rendererror .v-textfield { background: #ff9999; } -.#{$name}-prompt .#{$name}-textfield { +.#{$primaryStyleName}-prompt .#{$primaryStyleName}-textfield { color: #999; font-style: normal; } diff --git a/WebContent/VAADIN/themes/runo/inlinedatefield/inlinedatefield.scss b/WebContent/VAADIN/themes/runo/inlinedatefield/inlinedatefield.scss index ada30fa40e..ff0d5f5bb1 100644 --- a/WebContent/VAADIN/themes/runo/inlinedatefield/inlinedatefield.scss +++ b/WebContent/VAADIN/themes/runo/inlinedatefield/inlinedatefield.scss @@ -1,8 +1,8 @@ -@mixin runo-inline-datefield($name : v-inline-datefield){ +@mixin runo-inline-datefield($primaryStyleName : v-inline-datefield){ @include runo-datefield(v-inline-datefield); - .#{$name} { + .#{$primaryStyleName} { line-height: 18px; /* Override inherited line-height: 0 needed for popup datefield */ } } \ No newline at end of file -- cgit v1.2.3