From b1097e1f345a4c8fe2e166cd1da7a4760c90c146 Mon Sep 17 00:00:00 2001 From: Jouni Koivuviita Date: Thu, 14 May 2009 11:13:44 +0000 Subject: [PATCH] "poro" theme update: * slider theme added * table theme fixes * error indicator fixes in many components svn changeset:7800/svn branch:6.0 --- .../VAADIN/themes/base/slider/slider.css | 2 - WebContent/VAADIN/themes/base/styles.css | 2 - WebContent/VAADIN/themes/default/styles.css | 2 - .../VAADIN/themes/reindeer/button/button.css | 29 ++- .../VAADIN/themes/reindeer/common/common.css | 10 +- .../common/img/vertical-sprites-ie6.png | Bin 3457 -> 3721 bytes .../reindeer/common/img/vertical-sprites.png | Bin 8534 -> 8971 bytes .../VAADIN/themes/reindeer/panel/panel.css | 14 ++ .../reindeer/slider/img/knob-pressed.png | Bin 0 -> 420 bytes .../themes/reindeer/slider/img/knob.png | Bin 0 -> 379 bytes .../VAADIN/themes/reindeer/slider/slider.css | 41 ++++ WebContent/VAADIN/themes/reindeer/styles.css | 180 ++++++++++++++---- .../reindeer/table/img/scroll-indic-bg.png | Bin 0 -> 212 bytes .../VAADIN/themes/reindeer/table/table.css | 44 ++++- .../themes/reindeer/tabsheet/tabsheet.css | 6 +- 15 files changed, 259 insertions(+), 71 deletions(-) create mode 100644 WebContent/VAADIN/themes/reindeer/slider/img/knob-pressed.png create mode 100644 WebContent/VAADIN/themes/reindeer/slider/img/knob.png create mode 100644 WebContent/VAADIN/themes/reindeer/slider/slider.css create mode 100644 WebContent/VAADIN/themes/reindeer/table/img/scroll-indic-bg.png diff --git a/WebContent/VAADIN/themes/base/slider/slider.css b/WebContent/VAADIN/themes/base/slider/slider.css index 2288cfc47a..7df6a4d667 100644 --- a/WebContent/VAADIN/themes/base/slider/slider.css +++ b/WebContent/VAADIN/themes/base/slider/slider.css @@ -16,7 +16,6 @@ height: 12px; margin-top: -5px; font-size: 0; - cursor: pointer; } .v-slider-vertical { @@ -36,7 +35,6 @@ width: 12px; height: 12px; font-size: 0; - cursor: pointer; margin-left: -5px; } diff --git a/WebContent/VAADIN/themes/base/styles.css b/WebContent/VAADIN/themes/base/styles.css index 123f01f742..b52c8a51dc 100644 --- a/WebContent/VAADIN/themes/base/styles.css +++ b/WebContent/VAADIN/themes/base/styles.css @@ -980,7 +980,6 @@ height: 12px; margin-top: -5px; font-size: 0; - cursor: pointer; } .v-slider-vertical { @@ -1000,7 +999,6 @@ width: 12px; height: 12px; font-size: 0; - cursor: pointer; margin-left: -5px; } diff --git a/WebContent/VAADIN/themes/default/styles.css b/WebContent/VAADIN/themes/default/styles.css index 93b65382af..5f39650ea9 100644 --- a/WebContent/VAADIN/themes/default/styles.css +++ b/WebContent/VAADIN/themes/default/styles.css @@ -980,7 +980,6 @@ height: 12px; margin-top: -5px; font-size: 0; - cursor: pointer; } .v-slider-vertical { @@ -1000,7 +999,6 @@ width: 12px; height: 12px; font-size: 0; - cursor: pointer; margin-left: -5px; } diff --git a/WebContent/VAADIN/themes/reindeer/button/button.css b/WebContent/VAADIN/themes/reindeer/button/button.css index 4a9dd18832..119c7bf89b 100644 --- a/WebContent/VAADIN/themes/reindeer/button/button.css +++ b/WebContent/VAADIN/themes/reindeer/button/button.css @@ -102,20 +102,29 @@ div > .v-button .v-icon, /* Buttons with error indicator */ div > .v-button .v-errorindicator, .v-ie7 .v-button .v-errorindicator { - display: inline; position: absolute; - width: 5px; - height: 26px; - background: transparent url(../../default/icons/16/error.png) no-repeat 50%; - overflow: hidden; + display: inline-block; + width: 9px; + height: 16px; + background: transparent url(../common/icons/error.png) no-repeat 50%; + padding: 0; + margin: 0; } .v-ie6 .v-button .v-errorindicator { position: absolute; - width: 5px; - height: 18px; - background: transparent url(../../default/icons/16/error.gif) no-repeat 50%; - overflow: hidden; - margin-left: -10px; + display: inline; + width: 9px; + height: 16px; + background: transparent url(../common/icons/error-ie6.png) no-repeat 50%; +} +.v-ff .v-button, +.v-sa .v-button { + position: relative; +} +.v-ff .v-button .v-errorindicator, +.v-sa .v-button .v-errorindicator { + top: 2px; + left: 10px; } /* Link style buttons */ .v-button.v-button-link, diff --git a/WebContent/VAADIN/themes/reindeer/common/common.css b/WebContent/VAADIN/themes/reindeer/common/common.css index 9cbf4b29ea..50998dc325 100644 --- a/WebContent/VAADIN/themes/reindeer/common/common.css +++ b/WebContent/VAADIN/themes/reindeer/common/common.css @@ -50,16 +50,12 @@ font-family: Helvetica, Arial, "Lucida Grande", Geneva, Tahoma, Verdana, sans-serif; } .v-errorindicator { - width: 12px; + width: 13px; height: 16px; - background: transparent url(../../default/icons/16/error.png) no-repeat top right; + background: transparent url(../common/icons/error.png) no-repeat 50%; } .v-ie6 .v-errorindicator { - /* gif for transparency */ - background-image: url(../../default/icons/16/error.gif); -} -.v-ie7 .v-errorindicator { - margin-left: -3px; + background-image: url(../common/icons/error-ie6.png); } .v-tooltip { background-color: #fffcdd; 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 7391c3df06e04a60468eebaf6a88f86a6a1c4088..e5ae0125bb99d43761e4325c4a5714b2596208a5 100644 GIT binary patch delta 3602 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 delta 3336 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�WF`m)Otu5^~+J#9>=)bcfnQ~=OU}9 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 ZiYH?Qr3RJp;CqQPs>+&5h4;(@{{z1P&};wz diff --git a/WebContent/VAADIN/themes/reindeer/panel/panel.css b/WebContent/VAADIN/themes/reindeer/panel/panel.css index 6576c8233f..2a42e3d0db 100644 --- a/WebContent/VAADIN/themes/reindeer/panel/panel.css +++ b/WebContent/VAADIN/themes/reindeer/panel/panel.css @@ -32,4 +32,18 @@ .v-ff3 .v-panel-deco { border-top-color: rgba(0,0,0,.1); background: rgba(0,0,0,.08); +} +.v-panel-caption .v-errorindicator { + height: 16px; + width: 13px; + background: url(../common/icons/error.png) no-repeat 50%; + display: inline; + display: inline-block; + vertical-align: middle; +} +.v-ie6 .v-panel-caption .v-errorindicator { + background-image: url(../common/icons/error-ie6.png); +} +.v-ff2 .v-panel-caption .v-errorindicator { + display: -moz-inline-stack; } \ No newline at end of file diff --git a/WebContent/VAADIN/themes/reindeer/slider/img/knob-pressed.png b/WebContent/VAADIN/themes/reindeer/slider/img/knob-pressed.png new file mode 100644 index 0000000000000000000000000000000000000000..3ea2724e7724e5d8dcd514085716d21288094aa0 GIT binary patch literal 420 zcmV;V0bBlwP)y%p4f559ZO zchBQPNs@q$`uRnfTJ%!UE%=Tn&Um+XeKpVzq=lzv^+qn2Yv=QM$Ye4`HJwgjJRXDZ z`_0>%UI!f>pOg_ou5H_dQVM^Aa}J*83DvBEIb*F-X@xMxAc`U=6qXD$*EwBNA6l3T zVIxE!3?o=B7UAe%-#~Mn(={dBq*6+lOeR1Gfms}b5Ymj*JPbq7bp=A!);IQKlB^<( z;bSy{;cy7gFR$Rey_+3_z=wD?dq7TYR~-XxHoHiuW&J-!?HB}~LeYw`r|Q%i7^8MN zy#Q7!WkhT~hd7SZ*re(9?>gw$@SUntmQrZLw|^QwVobXCZr>RGCBOh+a-i@M376ym O00000fhdEP)4-}r=(!1FxH7=vAL&LIp#p~Eg{yM6rHY8@ORgvRbjDWTc4j5v;u7#G4Lgu-gI zhB~3Ak4_j~<#`U2(pnIGJruz(Nt1Ki-me9VB1dq+gb<@FO#&qqWv2Q6Gi3?OWh(SK zs_N- .v-button .v-icon, /* Buttons with error indicator */ div > .v-button .v-errorindicator, .v-ie7 .v-button .v-errorindicator { - display: inline; position: absolute; - width: 5px; - height: 26px; - background: transparent url(../default/icons/16/error.png) no-repeat 50%; - overflow: hidden; + display: inline-block; + width: 9px; + height: 16px; + background: transparent url(common/icons/error.png) no-repeat 50%; + padding: 0; + margin: 0; } .v-ie6 .v-button .v-errorindicator { position: absolute; - width: 5px; - height: 18px; - background: transparent url(../default/icons/16/error.gif) no-repeat 50%; - overflow: hidden; - margin-left: -10px; + display: inline; + width: 9px; + height: 16px; + background: transparent url(common/icons/error-ie6.png) no-repeat 50%; +} +.v-ff .v-button, +.v-sa .v-button { + position: relative; +} +.v-ff .v-button .v-errorindicator, +.v-sa .v-button .v-errorindicator { + top: 2px; + left: 10px; } /* Link style buttons */ .v-button.v-button-link, @@ -1899,16 +1906,12 @@ div > .v-button-small span, font-family: Helvetica, Arial, "Lucida Grande", Geneva, Tahoma, Verdana, sans-serif; } .v-errorindicator { - width: 12px; + width: 13px; height: 16px; - background: transparent url(../default/icons/16/error.png) no-repeat top right; + background: transparent url(common/icons/error.png) no-repeat 50%; } .v-ie6 .v-errorindicator { - /* gif for transparency */ - background-image: url(../default/icons/16/error.gif); -} -.v-ie7 .v-errorindicator { - margin-left: -3px; + background-image: url(common/icons/error-ie6.png); } .v-tooltip { background-color: #fffcdd; @@ -2352,6 +2355,20 @@ td.v-datefield-calendarpanel-nextyear { border-top-color: rgba(0,0,0,.1); background: rgba(0,0,0,.08); } +.v-panel-caption .v-errorindicator { + height: 16px; + width: 13px; + background: url(common/icons/error.png) no-repeat 50%; + display: inline; + display: inline-block; + vertical-align: middle; +} +.v-ie6 .v-panel-caption .v-errorindicator { + background-image: url(common/icons/error-ie6.png); +} +.v-ff2 .v-panel-caption .v-errorindicator { + display: -moz-inline-stack; +} /* ./WebContent/VAADIN/themes/reindeer/select/select.css */ .v-filterselect { @@ -2575,6 +2592,53 @@ td.v-datefield-calendarpanel-nextyear { } /* Filterselect with icon needs a similar fix than in buttons */ +/* ./WebContent/VAADIN/themes/reindeer/slider/slider.css */ +.v-slider { + border-top: 1px solid #9a9c9e; + border-bottom: 1px solid #bdbfc1; + margin: 4px 0; +} +.v-slider-base { + height: 1px; + background: #e0e2e2; + border-top: 1px solid #adb0b1; + border-left: 1px solid #a0a3a6; + border-right: 1px solid #a0a3a6; +} +.v-slider-handle { + background: transparent; + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: left -733px; + width: 10px; + height: 10px; + margin-top: -5px; +} +.v-slider-handle:active { + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: left -743px; +} +.v-slider-vertical { + width: 2px; + margin: 0 5px; + border: none; + border-left: 1px solid #9a9c9e; + border-right: 1px solid #bdbfc1; +} +.v-slider-vertical .v-slider-base { + width: 2px; + border-left: 1px solid #adb0b1; + border-right: none; + border-top: 1px solid #adb0b1; + border-bottom: 1px solid #adb0b1; +} +.v-slider-vertical .v-slider-handle { + width: 10px; + height: 10px; + margin-left: -5px; +} + /* ./WebContent/VAADIN/themes/reindeer/splitpanel/splitpanel.css */ .v-splitpanel-horizontal .v-splitpanel-hsplitter { width: 7px; @@ -2595,7 +2659,7 @@ td.v-datefield-calendarpanel-nextyear { background-repeat: repeat-x; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -733px; + background-position: left -753px; } .v-splitpanel-vertical .v-splitpanel-vsplitter div { height: 7px; @@ -2604,16 +2668,17 @@ td.v-datefield-calendarpanel-nextyear { background-position: 50%; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: center -740px; + background-position: center -760px; } /* ./WebContent/VAADIN/themes/reindeer/table/table.css */ .v-table-header-wrap { border-color: #2b3033; + border-top: none; background: transparent repeat-x; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -747px; + background-position: left -767px; height: 20px; text-transform: uppercase; font-size: 10px; @@ -2622,6 +2687,9 @@ td.v-datefield-calendarpanel-nextyear { text-shadow: #000 0 -1px 0; line-height: normal; } +.v-table-header { + height: 20px; +} .v-table-caption-container { heigth: 16px; padding-top: 4px; @@ -2645,17 +2713,17 @@ td.v-datefield-calendarpanel-nextyear { background: transparent no-repeat right 7px; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: right -767px; + background-position: right -787px; } .v-table-header-cell-desc .v-table-caption-container { background: transparent no-repeat right 7px; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: right -786px; + background-position: right -806px; } .v-table-body { border-color: #c2c3c4; - border-top-color: #2b3033; + background: #fff; } .v-table-cell-content { padding-top: 0; @@ -2668,7 +2736,6 @@ td.v-datefield-calendarpanel-nextyear { } .v-table-row, .v-table-row-odd { - background: #fff; height: 19px; } .v-table-row-odd { @@ -2678,7 +2745,7 @@ td.v-datefield-calendarpanel-nextyear { background: #4d749f repeat-x; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -805px; + background-position: left -825px; color: #fff; text-shadow: #3b5a7a 0 1px 0; } @@ -2692,25 +2759,27 @@ td.v-datefield-calendarpanel-nextyear { background: transparent no-repeat; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -825px; + background-position: left -845px; } .v-table-column-selector:active { background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -845px; + background-position: left -865px; } .v-table-focus-slot-left { border-left-color: #9ca1a5; + margin-left: 0; } .v-table-focus-slot-right { border-right-color: #9ca1a5; + margin-right: 0; } .v-table-header-drag { font-family: arial, helvetica, verdana, sans-serif; background: transparent repeat-x; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -865px; + background-position: left -885px; padding: 4px; text-transform: uppercase; font-size: 10px; @@ -2719,10 +2788,36 @@ td.v-datefield-calendarpanel-nextyear { text-shadow: #000 0 -1px 0; line-height: normal; } +.v-table-header-drag * { + vertical-align: middle; +} +.v-table-header-drag img { + height: 16px; + margin: -3px 3px 0 0; +} .v-table-scrollposition { - width: 160px; - background: #eee; - border: 1px solid #aaa; + width: auto; + background: transparent; + border: none; +} +.v-table-scrollposition span { + background: transparent repeat-x; + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: left -905px; + border: 1px solid #939494; + border-top: none; + border-bottom-color: #7d7e80; + border-radius-bottomleft: 4px; + border-radius-bottomright: 4px; + -moz-border-radius-bottomleft: 4px; + -moz-border-radius-bottomright: 4px; + -webkit-border-bottom-left-radius: 4px; + -webkit-border-bottom-right-radius: 4px; + height: 13px; + padding: 4px 30px; + text-shadow: #fff 0 1px 0; + width: 100px; } /* row in column selector */ .v-contextmenu .v-on, @@ -2731,7 +2826,7 @@ td.v-datefield-calendarpanel-nextyear { background: transparent no-repeat 0 4px; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -885px; + background-position: left -926px; padding-left: 12px; padding-right: 4px; } @@ -2742,7 +2837,12 @@ td.v-datefield-calendarpanel-nextyear { .v-contextmenu .gwt-MenuItem-selected .v-on { background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -899px; + background-position: left -940px; +} +/* Borderless style */ +.v-table-borderless .v-table-header-wrap, +.v-table-borderless .v-table-body { + border: none; } /* ./WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet.css */ @@ -2788,16 +2888,16 @@ td.v-datefield-calendarpanel-nextyear { } .v-tabsheet-tabs .v-errorindicator { display: inline-block; - width: 5px; + width: 13px; height: 16px; - background: transparent url(../default/icons/16/error.png) no-repeat -1px 50%; + background: transparent url(common/icons/error.png) no-repeat 50%; } .v-ff2 .v-tabsheet-tabs .v-icon, .v-ff2 .v-tabsheet-tabs .v-errorindicator { display: -moz-inline-stack; } .v-ie6 .v-tabsheet-tabs .v-errorindicator { - background-image: url(../default/icons/16/error.gif); + background-image: url(common/icons/error-ie6.png); } .v-ie .v-tabsheet-tabs .v-errorindicator { zoom: 1; @@ -2821,7 +2921,7 @@ td.v-datefield-calendarpanel-nextyear { background-repeat: repeat-x; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -914px; + background-position: left -955px; border-radius: 3px; -moz-border-radius: 3px; } @@ -2914,7 +3014,7 @@ input.v-textfield-prompt { background: #4d749f repeat-x; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -937px; + background-position: left -978px; color: #fff; padding: 1px 2px; -webkit-border-radius: 2px; diff --git a/WebContent/VAADIN/themes/reindeer/table/img/scroll-indic-bg.png b/WebContent/VAADIN/themes/reindeer/table/img/scroll-indic-bg.png new file mode 100644 index 0000000000000000000000000000000000000000..05caa85c92fdd4ac61ad6ecd88ad37bd6ad411fd GIT binary patch literal 212 zcmeAS@N?(olHy`uVBq!ia0vp^j6f{P!3-of^puzZDajJoh?3y^w370~qErUQl>DSr z1<%~X^wgl##FWaylc_d9MfL$cA+E3Ay#Mjz=i0Sv-@g0s>h;?%U%x+l@%r8SkKew1 zfBf{ti