From 4f1f91dabd47818c3fef2649e00eb8a90246fc6b Mon Sep 17 00:00:00 2001 From: Jouni Koivuviita Date: Wed, 13 May 2009 07:13:48 +0000 Subject: [PATCH] "poro" theme update: * datefield styles finished * many other fixes for other components svn changeset:7770/svn branch:6.0 --- .../themes/base/datefield/datefield.css | 1 - WebContent/VAADIN/themes/base/styles.css | 1 - WebContent/VAADIN/themes/default/styles.css | 1 - .../a-sprite-definitions.css | 10 +- .../VAADIN/themes/reindeer/common/common.css | 6 +- .../common/img/vertical-sprites-ie6.png | Bin 2462 -> 2908 bytes .../reindeer/common/img/vertical-sprites.png | Bin 5926 -> 6842 bytes .../themes/reindeer/datefield/datefield.css | 173 ++++++- .../datefield/img/popup-btn-pressed.png | Bin 0 -> 638 bytes .../reindeer/datefield/img/popup-btn.png | Bin 0 -> 611 bytes .../reindeer/datefield/img/weekday-bg.png | Bin 0 -> 173 bytes .../reindeer/datefield/img/weekday-first.png | Bin 0 -> 202 bytes .../reindeer/datefield/img/weekday-last.png | Bin 0 -> 193 bytes WebContent/VAADIN/themes/reindeer/styles.css | 429 ++++++++++++++---- .../themes/reindeer/textfield/textfield.css | 17 +- 15 files changed, 515 insertions(+), 123 deletions(-) create mode 100644 WebContent/VAADIN/themes/reindeer/datefield/img/popup-btn-pressed.png create mode 100644 WebContent/VAADIN/themes/reindeer/datefield/img/popup-btn.png create mode 100644 WebContent/VAADIN/themes/reindeer/datefield/img/weekday-bg.png create mode 100644 WebContent/VAADIN/themes/reindeer/datefield/img/weekday-first.png create mode 100644 WebContent/VAADIN/themes/reindeer/datefield/img/weekday-last.png diff --git a/WebContent/VAADIN/themes/base/datefield/datefield.css b/WebContent/VAADIN/themes/base/datefield/datefield.css index e18a19c706..05038aa783 100644 --- a/WebContent/VAADIN/themes/base/datefield/datefield.css +++ b/WebContent/VAADIN/themes/base/datefield/datefield.css @@ -11,7 +11,6 @@ width: 100%; } .v-datefield-calendarpanel td { - width: 14.2%; padding: 0; margin: 0; } diff --git a/WebContent/VAADIN/themes/base/styles.css b/WebContent/VAADIN/themes/base/styles.css index 283c6b6dc1..00ddc05edb 100644 --- a/WebContent/VAADIN/themes/base/styles.css +++ b/WebContent/VAADIN/themes/base/styles.css @@ -376,7 +376,6 @@ width: 100%; } .v-datefield-calendarpanel td { - width: 14.2%; padding: 0; margin: 0; } diff --git a/WebContent/VAADIN/themes/default/styles.css b/WebContent/VAADIN/themes/default/styles.css index ae96ce10a1..1942d1bcbd 100644 --- a/WebContent/VAADIN/themes/default/styles.css +++ b/WebContent/VAADIN/themes/default/styles.css @@ -376,7 +376,6 @@ width: 100%; } .v-datefield-calendarpanel td { - width: 14.2%; padding: 0; margin: 0; } diff --git a/WebContent/VAADIN/themes/reindeer/a-sprite-definitions/a-sprite-definitions.css b/WebContent/VAADIN/themes/reindeer/a-sprite-definitions/a-sprite-definitions.css index a54d8d83fd..fe459e92d7 100644 --- a/WebContent/VAADIN/themes/reindeer/a-sprite-definitions/a-sprite-definitions.css +++ b/WebContent/VAADIN/themes/reindeer/a-sprite-definitions/a-sprite-definitions.css @@ -1,5 +1,11 @@ +/*------------ + * General vertical and horizontal sprites + * -----------*/ /** sprite: verticals; sprite-image: url(../common/img/vertical-sprites.png); sprite-layout: vertical */ - /** sprite: horizontals; sprite-image: url(../common/img/horizontal-sprites.png); sprite-layout: horizontal */ -/** sprite: buttons; sprite-image: url(../button/img/button-sprites.png); sprite-layout: vertical */ \ No newline at end of file +/*------------ + * Buttons + * -----------*/ +/** sprite: buttons; sprite-image: url(../button/img/button-sprites.png); sprite-layout: vertical */ +/** sprite: buttons-black; sprite-image: url(../button/img/button-black-sprites.png); sprite-layout: vertical */ \ No newline at end of file diff --git a/WebContent/VAADIN/themes/reindeer/common/common.css b/WebContent/VAADIN/themes/reindeer/common/common.css index afd109c862..bf07b03216 100644 --- a/WebContent/VAADIN/themes/reindeer/common/common.css +++ b/WebContent/VAADIN/themes/reindeer/common/common.css @@ -19,7 +19,8 @@ .v-popupview-popup select, .v-popupview-popup button, .v-popupview-popup textarea, -.v-filterselect-suggestpopup { +.v-filterselect-suggestpopup, +.v-datefield-popup { font-family: Arial, Helvetica, Tahoma, Verdana, sans-serif; font-size: 12px; line-height: normal; @@ -42,7 +43,8 @@ .v-sa .v-popupview-popup select, .v-sa .v-popupview-popup button, .v-sa .v-popupview-popup textarea, -.v-sa .v-filterselect-suggestpopup { +.v-sa .v-filterselect-suggestpopup, +.v-sa .v-datefield-popup { font-family: Helvetica, Arial, "Lucida Grande", Geneva, Tahoma, Verdana, sans-serif; } .v-errorindicator { diff --git a/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites-ie6.png b/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites-ie6.png index 07fe1bdde0b1cf52d82ca07efa44e6397b3d2502..21a2d1fe220aaf8b2bf6cc4f9b424090b9262496 100644 GIT binary patch delta 2824 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 literal 5926 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 diff --git a/WebContent/VAADIN/themes/reindeer/datefield/datefield.css b/WebContent/VAADIN/themes/reindeer/datefield/datefield.css index 0473ea8711..8dbca66ec1 100644 --- a/WebContent/VAADIN/themes/reindeer/datefield/datefield.css +++ b/WebContent/VAADIN/themes/reindeer/datefield/datefield.css @@ -2,12 +2,15 @@ border-collapse: collapse; margin: 0; padding: 0; + height: auto !important; } .v-datefield-year .v-datefield-calendarpanel-prevmonth, -.v-datefield-year .v-datefield-calendarpanel-nextmonth, -.v-datefield-year .v-datefield-calendarpanel-weekdays { +.v-datefield-year .v-datefield-calendarpanel-nextmonth { display: none; } +.v-datefield-calendarpanel td { + vertical-align: top; +} td.v-datefield-calendarpanel-month { height: 23px; background-repeat: repeat-x; @@ -16,12 +19,13 @@ td.v-datefield-calendarpanel-month { span.v-datefield-calendarpanel-month { display: block; text-align: center; - height: 18px; + height: 16px; padding: 3px 10px 0 10px; border-left: 1px solid #efefef; border-right: 1px solid #d8d8d8; text-shadow: #fff 0 1px 0; overflow: hidden; + margin-top: 1px; } .v-datefield-year .v-datefield-calendarpanel-month { width: 35px; @@ -29,19 +33,17 @@ span.v-datefield-calendarpanel-month { .v-datefield-month .v-datefield-calendarpanel-month, .v-datefield-day .v-datefield-calendarpanel-month, .v-datefield-full .v-datefield-calendarpanel-month { - width: 94px; -} -.v-datefield-year .v-datefield-calendarpanel td, -.v-datefield-month .v-datefield-calendarpanel td, -.v-datefield-day .v-datefield-calendarpanel td { - width: auto; + width: 124px; } .v-datefield-year .v-datefield-calendarpanel { width: 100px; } -.v-datefield-calendarpanel-prevyear { +td.v-datefield-calendarpanel-prevyear { text-align: right; } +td.v-datefield-calendarpanel-nextyear { + text-align: left; +} .v-datefield-calendarpanel-prevyear button, .v-datefield-calendarpanel-nextyear button, .v-datefield-calendarpanel-prevmonth button, @@ -57,10 +59,10 @@ span.v-datefield-calendarpanel-month { text-indent: -9999px; outline: none; } -.v-ie6 .v-datefield-calendarpanel-prevyear button, -.v-ie6 .v-datefield-calendarpanel-nextyear button, -.v-ie6 .v-datefield-calendarpanel-prevmonth button, -.v-ie6 .v-datefield-calendarpanel-nextmonth button { +.v-ie .v-datefield-calendarpanel-prevyear button, +.v-ie .v-datefield-calendarpanel-nextyear button, +.v-ie .v-datefield-calendarpanel-prevmonth button, +.v-ie .v-datefield-calendarpanel-nextmonth button { text-indent: 0; font-size: 1px; } @@ -69,15 +71,16 @@ span.v-datefield-calendarpanel-month { background-image: url(img/year-next.png); /** sprite-ref: verticals */ } .v-datefield-calendarpanel-prevyear button:active, -.v-ie6 .v-datefield-calendarpanel-prevyear button.v-pressed { - background-image: url(img/year-prev-pressed.png); /** sprite-ref: verticals; sprite-alignment: right */ +.v-ie .v-datefield-calendarpanel-prevyear button.v-pressed { + background-image: url(img/year-prev-pressed.png); /** sprite-ref: verticals */ } .v-datefield-calendarpanel-nextyear button:active, -.v-ie6 .v-datefield-calendarpanel-nextyear button.v-pressed { +.v-ie .v-datefield-calendarpanel-nextyear button.v-pressed { background-image: url(img/year-next-pressed.png); /** sprite-ref: verticals */ } .v-datefield-calendarpanel-prevmonth, .v-datefield-calendarpanel-nextmonth { + width: 24px; background-repeat: repeat-x; background-image: url(img/header-bg.png); /** sprite-ref: verticals; sprite-alignment: repeat */ } @@ -91,22 +94,152 @@ span.v-datefield-calendarpanel-month { background-position: center top; background-image: url(img/month-prev.png); /** sprite-ref: verticals; sprite-alignment: center */ min-width: 24px; + margin-top: 1px; +} +.v-ie .v-datefield-calendarpanel-prevmonth button, +.v-ie .v-datefield-calendarpanel-nextmonth button { + border: none; } .v-ie6 .v-datefield-calendarpanel-prevmonth button, .v-ie6 .v-datefield-calendarpanel-nextmonth button { width: 24px; - border: none; } .v-datefield-calendarpanel-nextmonth button { background-image: url(img/month-next.png); /** sprite-ref: verticals; sprite-alignment: center */ } .v-datefield-calendarpanel-prevmonth button:active, -.v-ie6 .v-datefield-calendarpanel-prevmonth button.v-pressed { +.v-ie .v-datefield-calendarpanel-prevmonth button.v-pressed { background-position: center top; background-image: url(img/month-prev-pressed.png); /** sprite-ref: verticals; sprite-alignment: center */ } .v-datefield-calendarpanel-nextmonth button:active, -.v-ie6 .v-datefield-calendarpanel-nextmonth button.v-pressed { +.v-ie .v-datefield-calendarpanel-nextmonth button.v-pressed { background-position: center top; background-image: url(img/month-next-pressed.png); /** sprite-ref: verticals; sprite-alignment: center */ +} +.v-datefield-calendarpanel-body, +.v-datefield-calendarpanel-time { + text-align: center; + vertical-align: top; +} +.v-datefield-calendarpanel-body table { + border-collapse: collapse; + margin: 0; + padding: 0; + width: 220px; + margin: 0 auto; +} +.v-datefield-calendarpanel-weekdays td { + width: 14.2%; + overflow: hidden; + background-repeat: repeat-x; + background-image: url(img/weekday-bg.png); /** sprite-ref: verticals; sprite-alignment: repeat; sprite-margin-bottom: 3px */ + font-size: 10px; + line-height: normal; + text-transform: uppercase; + color: #eaeff1; + text-shadow: #3b4651 0 -1px 0; + vertical-align: top; +} +.v-datefield-calendarpanel-weekdays strong { + display: block; + text-align: right; + padding-right: 5px; + height: 15px; + border-top: 1px solid #596775; +} +.v-datefield-calendarpanel .v-first { + background-repeat: no-repeat; + background-image: url(img/weekday-first.png); /** sprite-ref: verticals; sprite-margin-bottom: 3px */ +} +.v-datefield-calendarpanel .v-last { + background-repeat: no-repeat; + background-position: right top; + background-image: url(img/weekday-last.png); /** sprite-ref: verticals; sprite-alignment: right */ +} +/* IE fails to position backgrounds inside table element */ +.v-ie .v-datefield-calendarpanel-weekdays td { + background: url(img/weekday-bg.png) repeat-x; + background-position: left top; +} +.v-ie .v-datefield-calendarpanel .v-first { + background: url(img/weekday-first.png) no-repeat; +} +.v-ie .v-datefield-calendarpanel .v-last { + background: url(img/weekday-last.png) no-repeat right top; +} +.v-datefield-calendarpanel-body td { + text-align: right; + height: 19px; +} +.v-datefield-calendarpanel-day, +.v-datefield-calendarpanel-day-today { + padding: 2px 5px 2px 0; + display: block; + margin: 1px 0 0 6px; +} +.v-datefield-calendarpanel-day-today { + color: #4095d1; + border: none; +} +.v-datefield-calendarpanel-day-selected { + background: #507ba3; + color: #fff; + text-shadow: #3b5b79 0 1px 0; + border-radius: 2px; + -webkit-border-radius: 2px; + -moz-border-radius: 2px; +} +.v-datefield-calendarpanel-time select { + padding: 0; + font-size: 11px; +} +.v-datefield-popup { + background: #f8f8f9; + padding: 8px 4px; + border-radius: 3px; + -webkit-border-radius: 3px; + -moz-border-radisu: 3px; +} +.v-sa .v-datefield-popup, +.v-ff3 .v-datefield-popup, +.v-op .v-datefield-popup { + background: rgba(255,255,255,.95); +} +.v-datefield-year .v-datefield-textfield { + width: 4em; +} +.v-datefield-month .v-datefield-textfield { + width: 5em; +} +.v-datefield-day .v-datefield-textfield { + width: 5.5em; +} +.v-datefield-full .v-datefield-textfield { + width: 12em; +} +.v-datefield-popupcalendar .v-datefield-textfield { + border-right: none; + height: 18px; +} +.v-ff .v-datefield-popupcalendar .v-datefield-textfield{ + -moz-border-radius-topright: 0; + -moz-border-radius-bottomright: 0; +} +.v-sa .v-datefield-popupcalendar .v-datefield-textfield, +.v-ff35 .v-datefield-popupcalendar .v-datefield-textfield, +.v-op .v-datefield-popupcalendar .v-datefield-textfield { + border-width: 0 0 0 3px; +} +.v-datefield-popupcalendar .v-datefield-button { + width: 24px; + height: 23px; + background: transparent; + border: none; + padding: 0; + background-image: url(img/popup-btn.png); /** sprite-ref: verticals */ + cursor: default; +} +.v-datefield-popupcalendar .v-datefield-button:active { + background-image: url(img/popup-btn-pressed.png); /** sprite-ref: verticals */ } \ No newline at end of file diff --git a/WebContent/VAADIN/themes/reindeer/datefield/img/popup-btn-pressed.png b/WebContent/VAADIN/themes/reindeer/datefield/img/popup-btn-pressed.png new file mode 100644 index 0000000000000000000000000000000000000000..26f237ba0bb820fc520849e674335af7255b8164 GIT binary patch literal 638 zcmV-^0)hRBP)wW;E|=5c{+X&=goV1y%*+2nK^-x7+vY^*T)*+zHGg^Z5+c*47vA^z9Eg*n4c5^Z9&a**;eB z4XsME6=*&`xLmG<0{woUtv(P4K&R6ot3C+rQlJ>qwixFB5YZ3`9G+6c)wfaqEX>_}gqYrD6`HQi;}f6>jnQ$*G`hJPT^$tyYV|3)Uia z<9GQo@hr;aGU&Q~jJ;?KWD%BPp$XaePZoZ=18UWDF4J2?)nEmwL?V&(dcE^!@{$^t$nVH=(mEW4#DMeY4rJg&}y}yP$*nyGMRaNb%0U48U5@q2DsgB2#3QE z2n4qA@hqKA&y95fZ6doJLZJ|G4Ig(*5)I-cc@7STb9AOZ-eGTh)8xY_NU}AIB9Brf z*;!-EwCi%u(ptX39cfvuwBlT(eNHV2XkG0Wz_i~1RU5qk(E8=XapqL{oMk4I}8 zjfRlT7C^rb*=+WejbQ)q=&Rk@5VARRyIpEZY?3Fw^b@v+?2$)JqG&YwtHcO&N{ZMV zip3(8=?Ys#Tl)tZMeRZKdOh07WZtnkkS3+?3K6jfQ7Vm#Y6+5_D|+= zITh!;QuSkmO|l-Iux&(AE|;NFsnBC`toH#`4E}Rk-~t!&qcr)U_krl7Mlxx$(VZNL xL~dk#ha0f{^Q%IuapVi~7J2{ISH-6Q0{|OndTzHM?>PVf002ovPDHLkV1ly$3>g3b literal 0 HcmV?d00001 diff --git a/WebContent/VAADIN/themes/reindeer/datefield/img/weekday-bg.png b/WebContent/VAADIN/themes/reindeer/datefield/img/weekday-bg.png new file mode 100644 index 0000000000000000000000000000000000000000..19fd2b42888318034a167337d2b0f3c505108ad4 GIT binary patch literal 173 zcmeAS@N?(olHy`uVBq!ia0vp^j6f{F!3-oHI6iF!Qj#UE5hcO-X(i=}MX3yqDfvmM z3ZA)%>8U}fi7AzZCsS>JiWCEULR^d6XBV~2uIO1%)wi&?eNJiT+{)gCB^`6iy5^O4 z&o6A9HEG?SSwO`~o-U3d6}OTS(h`yrk{+-)@v()mm9dGjv9Y8U}fi7AzZCsS>JigG+%978H@C9QcC{bPQjNCV^P{}&fH@bz50Ai>L{(~xPx z;TC)>BcbP-+G5S-GY1k9BzSu+<`~WL<=Ad)*T=?eV({gTe~DWM4f08U}fi7AzZCsS>JijqBD978H@C9QcC{bPQjNCV^P{}&fH@bz50Ai>L{(~xPx z;TC)>BcbP-+G5S-GY1k9BzSu+<`~WLb-OKjq^W;#BO~koe}8YAOGyZPcz1lezNxaU qK^()!S@re*U!Bd+-p3}8z_3 .v-button, padding: 0 0 0 6px; background-color: transparent; background-repeat: no-repeat; - background-image: url(button/img/left.png); /** sprite-ref: buttons */ + background-image: url(button/img/button-sprites.png); + -background-image: url(button/img/button-sprites-ie6.png); + background-position: left -0px; border: none; cursor: default; } @@ -1580,7 +1583,9 @@ div > .v-button span, background-color: transparent; background-repeat: no-repeat; background-position: right top; - background-image: url(button/img/right.png); /** sprite-ref: buttons; sprite-alignment: right */ + background-image: url(button/img/button-sprites.png); + -background-image: url(button/img/button-sprites-ie6.png); + background-position: right -26px; text-shadow: #fff 0 1px 0; font-weight: bold; font-size: 11px; @@ -1592,21 +1597,29 @@ div > .v-button span, padding-top: 5px; } .v-button:focus { - background-image: url(button/img/left-focus.png); /** sprite-ref: buttons */ + background-image: url(button/img/button-sprites.png); + -background-image: url(button/img/button-sprites-ie6.png); + background-position: left -52px; outline: none; } .v-button:focus span { - background-image: url(button/img/right-focus.png); /** sprite-ref: buttons; sprite-alignment: right */ + background-image: url(button/img/button-sprites.png); + -background-image: url(button/img/button-sprites-ie6.png); + background-position: right -78px; outline: none; } .v-button:active, .v-ie7 .v-button.v-pressed { - background-image: url(button/img/left-pressed.png); /** sprite-ref: buttons */ + background-image: url(button/img/button-sprites.png); + -background-image: url(button/img/button-sprites-ie6.png); + background-position: left -104px; outline: none; } .v-button:active span, .v-ie7 .v-button.v-pressed span { - background-image: url(button/img/right-pressed.png); /** sprite-ref: buttons; sprite-alignment: right */ + background-image: url(button/img/button-sprites.png); + -background-image: url(button/img/button-sprites-ie6.png); + background-position: right -130px; outline: none; } .v-ie7 .v-button.v-pressed span { @@ -1707,37 +1720,53 @@ div > .v-button .v-errorindicator, */ div > .v-button-primary, .v-ie7 .v-button-primary { - background-image: url(button/img/primary-left.png); /** sprite-ref: buttons */ + background-image: url(button/img/button-sprites.png); + -background-image: url(button/img/button-sprites-ie6.png); + background-position: left -156px; } div > .v-button-primary span, .v-ie7 .v-button-primary span { - background-image: url(button/img/primary-right.png); /** sprite-ref: buttons; sprite-alignment: right */ + background-image: url(button/img/button-sprites.png); + -background-image: url(button/img/button-sprites-ie6.png); + background-position: right -182px; } .v-button-primary:focus { - background-image: url(button/img/primary-left-focus.png); /** sprite-ref: buttons */ + background-image: url(button/img/button-sprites.png); + -background-image: url(button/img/button-sprites-ie6.png); + background-position: left -208px; } .v-button-primary:focus span { - background-image: url(button/img/primary-right-focus.png); /** sprite-ref: buttons; sprite-alignment: right */ + background-image: url(button/img/button-sprites.png); + -background-image: url(button/img/button-sprites-ie6.png); + background-position: right -234px; } .v-button-primary:active, .v-ie7 .v-button-primary.v-pressed { - background-image: url(button/img/primary-left-pressed.png); /** sprite-ref: buttons */ + background-image: url(button/img/button-sprites.png); + -background-image: url(button/img/button-sprites-ie6.png); + background-position: left -260px; } .v-button-primary:active span, .v-ie7 .v-button-primary.v-pressed span { - background-image: url(button/img/primary-right-pressed.png); /** sprite-ref: buttons; sprite-alignment: right */ + background-image: url(button/img/button-sprites.png); + -background-image: url(button/img/button-sprites-ie6.png); + background-position: right -286px; } /* * Small-style -------------------------- */ div > .v-button-small, .v-ie7 .v-button-small { - background-image: url(button/img/small-left.png); /** sprite-ref: buttons */ + background-image: url(button/img/button-sprites.png); + -background-image: url(button/img/button-sprites-ie6.png); + background-position: left -312px; height: 20px; } div > .v-button-small span, .v-ie7 .v-button-small span { - background-image: url(button/img/small-right.png); /** sprite-ref: buttons; sprite-alignment: right */ + background-image: url(button/img/button-sprites.png); + -background-image: url(button/img/button-sprites-ie6.png); + background-position: right -332px; height: 19px; padding: 1px 11px 0 5px; font-weight: normal; @@ -1751,18 +1780,26 @@ div > .v-button-small span, padding-top: 2px; } .v-button-small:focus { - background-image: url(button/img/small-left-focus.png); /** sprite-ref: buttons */ + background-image: url(button/img/button-sprites.png); + -background-image: url(button/img/button-sprites-ie6.png); + background-position: left -352px; } .v-button-small:focus span { - background-image: url(button/img/small-right-focus.png); /** sprite-ref: buttons; sprite-alignment: right */ + background-image: url(button/img/button-sprites.png); + -background-image: url(button/img/button-sprites-ie6.png); + background-position: right -372px; } .v-button-small:active, .v-ie7 .v-button-small.v-pressed { - background-image: url(button/img/small-left-pressed.png); /** sprite-ref: buttons */ + background-image: url(button/img/button-sprites.png); + -background-image: url(button/img/button-sprites-ie6.png); + background-position: left -392px; } .v-button-small:active span, .v-ie7 .v-button-small.v-pressed span { - background-image: url(button/img/small-right-pressed.png); /** sprite-ref: buttons; sprite-alignment: right */ + background-image: url(button/img/button-sprites.png); + -background-image: url(button/img/button-sprites-ie6.png); + background-position: right -412px; } /** @@ -1821,7 +1858,8 @@ div > .v-button-small span, .v-popupview-popup select, .v-popupview-popup button, .v-popupview-popup textarea, -.v-filterselect-suggestpopup { +.v-filterselect-suggestpopup, +.v-datefield-popup { font-family: Arial, Helvetica, Tahoma, Verdana, sans-serif; font-size: 12px; line-height: normal; @@ -1844,7 +1882,8 @@ div > .v-button-small span, .v-sa .v-popupview-popup select, .v-sa .v-popupview-popup button, .v-sa .v-popupview-popup textarea, -.v-sa .v-filterselect-suggestpopup { +.v-sa .v-filterselect-suggestpopup, +.v-sa .v-datefield-popup { font-family: Helvetica, Arial, "Lucida Grande", Geneva, Tahoma, Verdana, sans-serif; } .v-errorindicator { @@ -1893,26 +1932,32 @@ div > .v-button-small span, border-collapse: collapse; margin: 0; padding: 0; + height: auto !important; } .v-datefield-year .v-datefield-calendarpanel-prevmonth, -.v-datefield-year .v-datefield-calendarpanel-nextmonth, -.v-datefield-year .v-datefield-calendarpanel-weekdays { +.v-datefield-year .v-datefield-calendarpanel-nextmonth { display: none; } +.v-datefield-calendarpanel td { + vertical-align: top; +} td.v-datefield-calendarpanel-month { height: 23px; background-repeat: repeat-x; - background-image: url(datefield/img/header-bg.png); /** sprite-ref: verticals; sprite-alignment: repeat */ + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: left -0px; } span.v-datefield-calendarpanel-month { display: block; text-align: center; - height: 18px; + height: 16px; padding: 3px 10px 0 10px; border-left: 1px solid #efefef; border-right: 1px solid #d8d8d8; text-shadow: #fff 0 1px 0; overflow: hidden; + margin-top: 1px; } .v-datefield-year .v-datefield-calendarpanel-month { width: 35px; @@ -1920,19 +1965,17 @@ span.v-datefield-calendarpanel-month { .v-datefield-month .v-datefield-calendarpanel-month, .v-datefield-day .v-datefield-calendarpanel-month, .v-datefield-full .v-datefield-calendarpanel-month { - width: 94px; -} -.v-datefield-year .v-datefield-calendarpanel td, -.v-datefield-month .v-datefield-calendarpanel td, -.v-datefield-day .v-datefield-calendarpanel td { - width: auto; + width: 124px; } .v-datefield-year .v-datefield-calendarpanel { width: 100px; } -.v-datefield-calendarpanel-prevyear { +td.v-datefield-calendarpanel-prevyear { text-align: right; } +td.v-datefield-calendarpanel-nextyear { + text-align: left; +} .v-datefield-calendarpanel-prevyear button, .v-datefield-calendarpanel-nextyear button, .v-datefield-calendarpanel-prevmonth button, @@ -1942,35 +1985,46 @@ span.v-datefield-calendarpanel-month { border: none; background: transparent; background-repeat: no-repeat; - background-image: url(datefield/img/year-prev.png); /** sprite-ref: verticals */ + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: left -23px; overflow: hidden; padding: 0; text-indent: -9999px; outline: none; } -.v-ie6 .v-datefield-calendarpanel-prevyear button, -.v-ie6 .v-datefield-calendarpanel-nextyear button, -.v-ie6 .v-datefield-calendarpanel-prevmonth button, -.v-ie6 .v-datefield-calendarpanel-nextmonth button { +.v-ie .v-datefield-calendarpanel-prevyear button, +.v-ie .v-datefield-calendarpanel-nextyear button, +.v-ie .v-datefield-calendarpanel-prevmonth button, +.v-ie .v-datefield-calendarpanel-nextmonth button { text-indent: 0; font-size: 1px; } .v-datefield-calendarpanel-nextyear button { background-position: left top; - background-image: url(datefield/img/year-next.png); /** sprite-ref: verticals */ + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: left -46px; } .v-datefield-calendarpanel-prevyear button:active, -.v-ie6 .v-datefield-calendarpanel-prevyear button.v-pressed { - background-image: url(datefield/img/year-prev-pressed.png); /** sprite-ref: verticals; sprite-alignment: right */ +.v-ie .v-datefield-calendarpanel-prevyear button.v-pressed { + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: left -69px; } .v-datefield-calendarpanel-nextyear button:active, -.v-ie6 .v-datefield-calendarpanel-nextyear button.v-pressed { - background-image: url(datefield/img/year-next-pressed.png); /** sprite-ref: verticals */ +.v-ie .v-datefield-calendarpanel-nextyear button.v-pressed { + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: left -92px; } .v-datefield-calendarpanel-prevmonth, .v-datefield-calendarpanel-nextmonth { + width: 24px; background-repeat: repeat-x; - background-image: url(datefield/img/header-bg.png); /** sprite-ref: verticals; sprite-alignment: repeat */ + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: left -115px; } .v-datefield-calendarpanel-prevmonth button, .v-datefield-calendarpanel-nextmonth button { @@ -1980,26 +2034,174 @@ span.v-datefield-calendarpanel-month { border-right: 1px solid #d8d8d8; background: transparent; background-position: center top; - background-image: url(datefield/img/month-prev.png); /** sprite-ref: verticals; sprite-alignment: center */ + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: center -138px; min-width: 24px; + margin-top: 1px; +} +.v-ie .v-datefield-calendarpanel-prevmonth button, +.v-ie .v-datefield-calendarpanel-nextmonth button { + border: none; } .v-ie6 .v-datefield-calendarpanel-prevmonth button, .v-ie6 .v-datefield-calendarpanel-nextmonth button { width: 24px; - border: none; } .v-datefield-calendarpanel-nextmonth button { - background-image: url(datefield/img/month-next.png); /** sprite-ref: verticals; sprite-alignment: center */ + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: center -159px; } .v-datefield-calendarpanel-prevmonth button:active, -.v-ie6 .v-datefield-calendarpanel-prevmonth button.v-pressed { +.v-ie .v-datefield-calendarpanel-prevmonth button.v-pressed { background-position: center top; - background-image: url(datefield/img/month-prev-pressed.png); /** sprite-ref: verticals; sprite-alignment: center */ + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: center -180px; } .v-datefield-calendarpanel-nextmonth button:active, -.v-ie6 .v-datefield-calendarpanel-nextmonth button.v-pressed { +.v-ie .v-datefield-calendarpanel-nextmonth button.v-pressed { background-position: center top; - background-image: url(datefield/img/month-next-pressed.png); /** sprite-ref: verticals; sprite-alignment: center */ + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: center -201px; +} +.v-datefield-calendarpanel-body, +.v-datefield-calendarpanel-time { + text-align: center; + vertical-align: top; +} +.v-datefield-calendarpanel-body table { + border-collapse: collapse; + margin: 0; + padding: 0; + width: 220px; + margin: 0 auto; +} +.v-datefield-calendarpanel-weekdays td { + width: 14.2%; + overflow: hidden; + background-repeat: repeat-x; + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: left -222px; + font-size: 10px; + line-height: normal; + text-transform: uppercase; + color: #eaeff1; + text-shadow: #3b4651 0 -1px 0; + vertical-align: top; +} +.v-datefield-calendarpanel-weekdays strong { + display: block; + text-align: right; + padding-right: 5px; + height: 15px; + border-top: 1px solid #596775; +} +.v-datefield-calendarpanel .v-first { + background-repeat: no-repeat; + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: left -241px; +} +.v-datefield-calendarpanel .v-last { + background-repeat: no-repeat; + background-position: right top; + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: right -260px; +} +/* IE fails to position backgrounds inside table element */ +.v-ie .v-datefield-calendarpanel-weekdays td { + background: url(datefield/img/weekday-bg.png) repeat-x; + background-position: left top; +} +.v-ie .v-datefield-calendarpanel .v-first { + background: url(datefield/img/weekday-first.png) no-repeat; +} +.v-ie .v-datefield-calendarpanel .v-last { + background: url(datefield/img/weekday-last.png) no-repeat right top; +} +.v-datefield-calendarpanel-body td { + text-align: right; + height: 19px; +} +.v-datefield-calendarpanel-day, +.v-datefield-calendarpanel-day-today { + padding: 2px 5px 2px 0; + display: block; + margin: 1px 0 0 6px; +} +.v-datefield-calendarpanel-day-today { + color: #4095d1; + border: none; +} +.v-datefield-calendarpanel-day-selected { + background: #507ba3; + color: #fff; + text-shadow: #3b5b79 0 1px 0; + border-radius: 2px; + -webkit-border-radius: 2px; + -moz-border-radius: 2px; +} +.v-datefield-calendarpanel-time select { + padding: 0; + font-size: 11px; +} +.v-datefield-popup { + background: #f8f8f9; + padding: 8px 4px; + border-radius: 3px; + -webkit-border-radius: 3px; + -moz-border-radisu: 3px; +} +.v-sa .v-datefield-popup, +.v-ff3 .v-datefield-popup, +.v-op .v-datefield-popup { + background: rgba(255,255,255,.95); +} +.v-datefield-year .v-datefield-textfield { + width: 4em; +} +.v-datefield-month .v-datefield-textfield { + width: 5em; +} +.v-datefield-day .v-datefield-textfield { + width: 5.5em; +} +.v-datefield-full .v-datefield-textfield { + width: 12em; +} +.v-datefield-popupcalendar .v-datefield-textfield { + border-right: none; + height: 18px; +} +.v-ff .v-datefield-popupcalendar .v-datefield-textfield{ + -moz-border-radius-topright: 0; + -moz-border-radius-bottomright: 0; +} +.v-sa .v-datefield-popupcalendar .v-datefield-textfield, +.v-ff35 .v-datefield-popupcalendar .v-datefield-textfield, +.v-op .v-datefield-popupcalendar .v-datefield-textfield { + border-width: 0 0 0 3px; +} +.v-datefield-popupcalendar .v-datefield-button { + width: 24px; + height: 23px; + background: transparent; + border: none; + padding: 0; + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: left -276px; + cursor: default; +} +.v-datefield-popupcalendar .v-datefield-button:active { + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: left -299px; } /* ./WebContent/VAADIN/themes/reindeer/label/label.css */ @@ -2105,7 +2307,9 @@ span.v-datefield-calendarpanel-month { .v-filterselect { height: 24px; background-repeat: no-repeat; - background-image: url(select/img/left.png); /** sprite-ref: verticals; sprite-margin-bottom: 1px */ + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: left -322px; padding-left: 2px; } .v-app .v-filterselect-input, @@ -2113,7 +2317,9 @@ span.v-datefield-calendarpanel-month { .v-popupview-popup .v-filterselect-input { background: transparent; background-repeat: repeat-x; - background-image: url(select/img/center.png); /** sprite-ref: verticals; sprite-alignment: repeat */ + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: left -347px; border: none; height: 21px; } @@ -2130,36 +2336,54 @@ span.v-datefield-calendarpanel-month { outline: none; } .v-filterselect-focus { - background-image: url(select/img/left-focus.png); /** sprite-ref: verticals; sprite-margin-bottom: 1px */ + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: left -371px; } .v-filterselect-focus .v-filterselect-input { - background-image: url(select/img/center-focus.png); /** sprite-ref: verticals; sprite-alignment: repeat */ + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: left -396px; } .v-filterselect-button { overflow: hidden; width: 25px; height: 24px; - background-image: url(select/img/right.png); /** sprite-ref: verticals */ + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: left -420px; cursor: default; } .v-filterselect-button:hover { - background-image: url(select/img/right-hover.png); /** sprite-ref: verticals */ + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: left -444px; } .v-filterselect-button:active { - background-image: url(select/img/right-pressed.png); /** sprite-ref: verticals */ + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: left -468px; } .v-filterselect-focus .v-filterselect-button { - background-image: url(select/img/right-focus.png); /** sprite-ref: verticals */ + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: left -492px; } .v-filterselect-focus .v-filterselect-button:hover { - background-image: url(select/img/right-focus-hover.png); /** sprite-ref: verticals */ + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: left -516px; } .v-filterselect-focus .v-filterselect-button:active { - background-image: url(select/img/right-focus-pressed.png); /** sprite-ref: verticals */ + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: left -540px; } .v-disabled .v-filterselect-button:hover, .v-readonly .v-filterselect-button:hover { - background-image: url(select/img/right.png); /** sprite-ref: verticals */ + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: left -564px; } .v-filterselect-suggestpopup { background: #f8f8f9; @@ -2183,7 +2407,9 @@ span.v-datefield-calendarpanel-month { .v-filterselect-suggestmenu .gwt-MenuItem-selected { background: transparent; background-repeat: repeat-x; - background-image: url(select/img/sel-bg.png); /** sprite-ref: verticals; sprite-alignment: repeat */ + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: left -588px; color: #fff; text-shadow: #3b5a7a 0 1px 0; } @@ -2197,19 +2423,27 @@ span.v-datefield-calendarpanel-month { } .v-filterselect-nextpage:hover { background-repeat: repeat-x; - background-image: url(select/img/page-down-hover.png); /** sprite-ref: verticals; sprite-alignment: repeat */ + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: left -606px; } .v-filterselect-prevpage:hover { background-repeat: repeat-x; - background-image: url(select/img/page-up-hover.png); /** sprite-ref: verticals; sprite-alignment: repeat */ + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: left -617px; } .v-filterselect-nextpage:active { background-repeat: repeat-x; - background-image: url(select/img/page-down-pressed.png); /** sprite-ref: verticals; sprite-alignment: repeat */ + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: left -628px; } .v-filterselect-prevpage:active { background-repeat: repeat-x; - background-image: url(select/img/page-up-pressed.png); /** sprite-ref: verticals; sprite-alignment: repeat */ + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: left -639px; } .v-filterselect-nextpage-off span, .v-filterselect-prevpage-off span { @@ -2224,19 +2458,27 @@ span.v-datefield-calendarpanel-month { text-indent: -99999px; background-position: center 3px; background-repeat: no-repeat; - background-image: url(select/img/arrow-down.png); /** sprite-ref: verticals; sprite-margin-top: 3px; sprite-margin-bottom: 3px; sprite-alignment: center */ + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: center -650px; user-select: none; -moz-user-select: none; -webkit-user-select: none; } .v-filterselect-prevpage span { - background-image: url(select/img/arrow-up.png); /** sprite-ref: verticals; sprite-margin-top: 3px; sprite-margin-bottom: 3px; sprite-alignment: center */ + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: center -661px; } .v-filterselect-nextpage:hover span { - background-image: url(select/img/arrow-down-hover.png); /** sprite-ref: verticals; sprite-margin-top: 3px; sprite-margin-bottom: 3px; sprite-alignment: center */ + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: center -672px; } .v-filterselect-prevpage:hover span { - background-image: url(select/img/arrow-up-hover.png); /** sprite-ref: verticals; sprite-margin-top: 3px; sprite-margin-bottom: 3px; sprite-alignment: center */ + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: center -683px; } .v-filterselect-status { text-shadow: #e9eaeb 0 1px 0; @@ -2247,7 +2489,9 @@ span.v-datefield-calendarpanel-month { height: 11px; overflow: hidden; background-repeat: repeat-x; - background-image: url(select/img/status-bg.png); /** sprite-ref: verticals; sprite-alignment: repeat */ + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: left -694px; -moz-border-radius-bottomleft: 2px; -moz-border-radius-bottomright: 2px; -webkit-border-bottom-left-radius: 2px; @@ -2287,26 +2531,32 @@ span.v-datefield-calendarpanel-month { .v-splitpanel-horizontal .v-splitpanel-hsplitter { width: 7px; background-repeat: repeat-y; - background-image: url(splitpanel/img/hor-bg.png); /** sprite-ref: horizontals; sprite-alignment: repeat */ + background-image: url(common/img/horizontal-sprites.png); + background-position: -0px top; } .v-splitpanel-horizontal .v-splitpanel-hsplitter div { width: 7px; background: transparent; background-repeat: no-repeat; background-position: 50%; - background-image: url(splitpanel/img/hor-handle.png); /** sprite-ref: horizontals; sprite-alignment: center */ + background-image: url(common/img/horizontal-sprites.png); + background-position: -7px center; } .v-splitpanel-vertical .v-splitpanel-vsplitter { height: 7px; background-repeat: repeat-x; - background-image: url(splitpanel/img/ver-bg.png); /** sprite-ref: verticals; sprite-alignment: repeat */ + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: left -711px; } .v-splitpanel-vertical .v-splitpanel-vsplitter div { height: 7px; background: transparent; background-repeat: no-repeat; background-position: 50%; - background-image: url(splitpanel/img/ver-handle.png); /** sprite-ref: verticals; sprite-alignment: center */ + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: center -718px; } /* ./WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet.css */ @@ -2383,14 +2633,24 @@ span.v-datefield-calendarpanel-month { border-bottom-color: #d2d3d4; background: #fff; background-repeat: repeat-x; - background-image: url(textfield/img/bg.png); /** sprite-ref: verticals; sprite-alignment: repeat */ + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: left -725px; -moz-border-radius: 3px; } /* Need more specific selector because of #2384 fixes in base/common/common.css */ .v-app input.v-textfield { padding: 3px 3px 0 3px; } -.v-textfield-focus { +/* Textfield on blue background */ +.blue .v-textfield { + border-color: #92a2aa; + border-top-color: #7c8a90; + border-bottom-color: #a1b3bc; +} +.v-app .v-textfield-focus, +.v-window .v-textfield-focus, +.v-popupview-popup .v-textfield-focus { border-color: #5b97d0; border-top-color: #4f83b4; border-bottom-color: #5ca0df; @@ -2400,12 +2660,6 @@ input.v-textfield-prompt { font-style: normal; color: #999; } -/* Textfield on blue background */ -.blue .v-textfield { - border-color: #92a2aa; - border-top-color: #7c8a90; - border-bottom-color: #a1b3bc; -} /* Capable browsers get fancier border images */ .v-sa input.v-textfield, .v-ff35 input.v-textfield, @@ -2419,7 +2673,6 @@ input.v-textfield-prompt { -webkit-border-image: url(textfield/img/bg-border-image.png) 0 3 0 3 stretch stretch; -moz-border-image: url(textfield/img/bg-border-image.png) 0 3 0 3 stretch stretch; -o-border-image: url(textfield/img/bg-border-image.png) 0 3 0 3 stretch stretch; - } .v-sa input.v-textfield-focus, .v-ff35 input.v-textfield-focus, diff --git a/WebContent/VAADIN/themes/reindeer/textfield/textfield.css b/WebContent/VAADIN/themes/reindeer/textfield/textfield.css index c04ca29398..a15cc368da 100644 --- a/WebContent/VAADIN/themes/reindeer/textfield/textfield.css +++ b/WebContent/VAADIN/themes/reindeer/textfield/textfield.css @@ -13,7 +13,15 @@ .v-app input.v-textfield { padding: 3px 3px 0 3px; } -.v-textfield-focus { +/* Textfield on blue background */ +.blue .v-textfield { + border-color: #92a2aa; + border-top-color: #7c8a90; + border-bottom-color: #a1b3bc; +} +.v-app .v-textfield-focus, +.v-window .v-textfield-focus, +.v-popupview-popup .v-textfield-focus { border-color: #5b97d0; border-top-color: #4f83b4; border-bottom-color: #5ca0df; @@ -23,12 +31,6 @@ input.v-textfield-prompt { font-style: normal; color: #999; } -/* Textfield on blue background */ -.blue .v-textfield { - border-color: #92a2aa; - border-top-color: #7c8a90; - border-bottom-color: #a1b3bc; -} /* Capable browsers get fancier border images */ .v-sa input.v-textfield, .v-ff35 input.v-textfield, @@ -42,7 +44,6 @@ input.v-textfield-prompt { -webkit-border-image: url(img/bg-border-image.png) 0 3 0 3 stretch stretch; -moz-border-image: url(img/bg-border-image.png) 0 3 0 3 stretch stretch; -o-border-image: url(img/bg-border-image.png) 0 3 0 3 stretch stretch; - } .v-sa input.v-textfield-focus, .v-ff35 input.v-textfield-focus, -- 2.39.5