From 9d62235e1de6d68b546153db3d01cb8d76e28ad7 Mon Sep 17 00:00:00 2001 From: Jouni Koivuviita Date: Wed, 13 May 2009 13:20:35 +0000 Subject: [PATCH] "poro" theme update: table styles mostly done, some small glitches in IE svn changeset:7782/svn branch:6.0 --- WebContent/VAADIN/themes/base/styles.css | 4 +- WebContent/VAADIN/themes/base/table/table.css | 4 +- WebContent/VAADIN/themes/default/styles.css | 4 +- .../VAADIN/themes/reindeer/common/common.css | 2 +- .../reindeer/common/icons/bullet-ie6.png | Bin 0 -> 198 bytes .../common/icons/bullet-white-ie6.png | Bin 0 -> 126 bytes .../reindeer/common/icons/bullet-white.png | Bin 0 -> 154 bytes .../themes/reindeer/common/icons/bullet.png | Bin 0 -> 218 bytes .../reindeer/common/icons/error-ie6.png | Bin 0 -> 272 bytes .../themes/reindeer/common/icons/error.png | Bin 0 -> 258 bytes .../themes/reindeer/common/img/sel-bg.png | Bin 203 -> 915 bytes .../common/img/vertical-sprites-ie6.png | Bin 2957 -> 3457 bytes .../reindeer/common/img/vertical-sprites.png | Bin 7121 -> 8534 bytes WebContent/VAADIN/themes/reindeer/styles.css | 232 ++++++++++++++---- .../VAADIN/themes/reindeer/table/img/asc.png | Bin 0 -> 204 bytes .../reindeer/table/img/col-sel-pressed.png | Bin 0 -> 1028 bytes .../themes/reindeer/table/img/col-sel.png | Bin 0 -> 1060 bytes .../VAADIN/themes/reindeer/table/img/desc.png | Bin 0 -> 204 bytes .../themes/reindeer/table/img/header-bg.png | Bin 0 -> 208 bytes .../VAADIN/themes/reindeer/table/table.css | 118 +++++++++ .../themes/reindeer/textfield/textfield.css | 8 + 21 files changed, 322 insertions(+), 50 deletions(-) create mode 100644 WebContent/VAADIN/themes/reindeer/common/icons/bullet-ie6.png create mode 100644 WebContent/VAADIN/themes/reindeer/common/icons/bullet-white-ie6.png create mode 100644 WebContent/VAADIN/themes/reindeer/common/icons/bullet-white.png create mode 100644 WebContent/VAADIN/themes/reindeer/common/icons/bullet.png create mode 100644 WebContent/VAADIN/themes/reindeer/common/icons/error-ie6.png create mode 100644 WebContent/VAADIN/themes/reindeer/common/icons/error.png create mode 100644 WebContent/VAADIN/themes/reindeer/table/img/asc.png create mode 100644 WebContent/VAADIN/themes/reindeer/table/img/col-sel-pressed.png create mode 100644 WebContent/VAADIN/themes/reindeer/table/img/col-sel.png create mode 100644 WebContent/VAADIN/themes/reindeer/table/img/desc.png create mode 100644 WebContent/VAADIN/themes/reindeer/table/img/header-bg.png create mode 100644 WebContent/VAADIN/themes/reindeer/table/table.css diff --git a/WebContent/VAADIN/themes/base/styles.css b/WebContent/VAADIN/themes/base/styles.css index 039352b859..123f01f742 100644 --- a/WebContent/VAADIN/themes/base/styles.css +++ b/WebContent/VAADIN/themes/base/styles.css @@ -1200,10 +1200,10 @@ text-align: center; } /* row in column selector */ -.v-on div { +.v-on { } -.v-off div { +.v-off { color: #ddd; } diff --git a/WebContent/VAADIN/themes/base/table/table.css b/WebContent/VAADIN/themes/base/table/table.css index c6fccfa835..afb436e33f 100644 --- a/WebContent/VAADIN/themes/base/table/table.css +++ b/WebContent/VAADIN/themes/base/table/table.css @@ -137,9 +137,9 @@ text-align: center; } /* row in column selector */ -.v-on div { +.v-on { } -.v-off div { +.v-off { color: #ddd; } \ No newline at end of file diff --git a/WebContent/VAADIN/themes/default/styles.css b/WebContent/VAADIN/themes/default/styles.css index 9a335e8af8..93b65382af 100644 --- a/WebContent/VAADIN/themes/default/styles.css +++ b/WebContent/VAADIN/themes/default/styles.css @@ -1200,10 +1200,10 @@ text-align: center; } /* row in column selector */ -.v-on div { +.v-on { } -.v-off div { +.v-off { color: #ddd; } diff --git a/WebContent/VAADIN/themes/reindeer/common/common.css b/WebContent/VAADIN/themes/reindeer/common/common.css index 4cdf591bba..9cbf4b29ea 100644 --- a/WebContent/VAADIN/themes/reindeer/common/common.css +++ b/WebContent/VAADIN/themes/reindeer/common/common.css @@ -100,7 +100,7 @@ padding: 4px 0; } .v-contextmenu .gwt-MenuItem { - padding: 1px 8px; + padding: 1px 12px 1px 8px; height: 16px; user-select: none; -moz-user-select: none; diff --git a/WebContent/VAADIN/themes/reindeer/common/icons/bullet-ie6.png b/WebContent/VAADIN/themes/reindeer/common/icons/bullet-ie6.png new file mode 100644 index 0000000000000000000000000000000000000000..7ba2e118a6507e72e316320760628bb1ae0c22c1 GIT binary patch literal 198 zcmeAS@N?(olHy`uVBq!ia0vp^Y#_|R3?#1$$yWg>$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWw1G1_3@Hu5;$jn>T+!QffwYd}4f3>hIsbgF?d7GIOR*o3U)g zszpnd{`&PRB_k^~F(o)G($m}T^0sbOpk5tM7srr_TRaEb85tBfm^XCg1pNOWCgd@r tRiXU5-vvpQea##1F`NqByN`jHL2?44%ami2ErI$NJYD@<);T3K0RUSGMdkni literal 0 HcmV?d00001 diff --git a/WebContent/VAADIN/themes/reindeer/common/icons/bullet-white-ie6.png b/WebContent/VAADIN/themes/reindeer/common/icons/bullet-white-ie6.png new file mode 100644 index 0000000000000000000000000000000000000000..9661802744652f4ae963df1326ccf6d96ba29467 GIT binary patch literal 126 zcmeAS@N?(olHy`uVBq!ia0vp^Y#_|R3?#1$$yWg>$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWu=T0X`wF|Ns97GD8ntt^-nho-U3d6}OTS6vP-vCFnGH9xvXVc)B=-RNPAX_5Z)Uw7_Rc)B=-RNPA9;p|UKPDoh6{D_5(BZA?GuTK5HKUq(nJzV+V z$rG0Dy8r+7{(3!K|BQ}~&YF`xK4*CB>;Ex%H{4J#oVLIIzfsNaUsD++|NQ>m-}vFVdQ&MBb@0Q|6BDgXcg literal 0 HcmV?d00001 diff --git a/WebContent/VAADIN/themes/reindeer/common/icons/error-ie6.png b/WebContent/VAADIN/themes/reindeer/common/icons/error-ie6.png new file mode 100644 index 0000000000000000000000000000000000000000..dce79411571eec0a8b56919d14cb728fca32a18b GIT binary patch literal 272 zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>3?#4ne^UZdk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5XTmyVUTptEm-qsg<6zy_DnfXO!+5>;HyLL+Vy$s&X?!BqX z_PVF~?aZ!6;r9Q&e|s~z1|%O$WD@{Vk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5XmUy~2hE&{2+OzNg1JfCYIs8Wg9da0sh&NP73iz`;+Rx+Q zdd8uKq2vGlR~rBMnevyH|6%{Q@X;9`hpD0tIp-T>8;)o@bWKWB`fs<7{c`<66A_hW z5zoUF_Uq=fUYLGfNqZ8TW);`tzjY=2PWJoS*Sydaz9L?bou_4VNYweD(S$`|3U+*t zI8&z>ueksJyh7AH#^3@jmGd1Uey$ORR`RDXIy5jcxUxCKE_J^=59nS7Pgg&ebxsLQ E0AV^^M*si- literal 0 HcmV?d00001 diff --git a/WebContent/VAADIN/themes/reindeer/common/img/sel-bg.png b/WebContent/VAADIN/themes/reindeer/common/img/sel-bg.png index 0367146d90534a2a32c63217e5f9585474348e43..272db0e9f5ffa704bcff67833e93aea328faa94f 100644 GIT binary patch delta 813 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�WF`m)Otu5^~+J#9>=)bcfnQ~=OU}9 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 ZiYH?Qr3RJp;CqQPs>+&5h4;(@{{z1P&};wz literal 7121 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 diff --git a/WebContent/VAADIN/themes/reindeer/styles.css b/WebContent/VAADIN/themes/reindeer/styles.css index 56ff44b690..43361538c8 100644 --- a/WebContent/VAADIN/themes/reindeer/styles.css +++ b/WebContent/VAADIN/themes/reindeer/styles.css @@ -1200,10 +1200,10 @@ text-align: center; } /* row in column selector */ -.v-on div { +.v-on { } -.v-off div { +.v-off { color: #ddd; } @@ -1949,7 +1949,7 @@ div > .v-button-small span, padding: 4px 0; } .v-contextmenu .gwt-MenuItem { - padding: 1px 8px; + padding: 1px 12px 1px 8px; height: 16px; user-select: none; -moz-user-select: none; @@ -1994,7 +1994,7 @@ td.v-datefield-calendarpanel-month { background-repeat: repeat-x; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -19px; + background-position: left -20px; } span.v-datefield-calendarpanel-month { display: block; @@ -2035,7 +2035,7 @@ td.v-datefield-calendarpanel-nextyear { background-repeat: no-repeat; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -42px; + background-position: left -43px; overflow: hidden; padding: 0; text-indent: -9999px; @@ -2052,19 +2052,19 @@ td.v-datefield-calendarpanel-nextyear { background-position: left top; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -65px; + background-position: left -66px; } .v-datefield-calendarpanel-prevyear button:active, .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 -88px; + background-position: left -89px; } .v-datefield-calendarpanel-nextyear button:active, .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 -111px; + background-position: left -112px; } .v-datefield-calendarpanel-prevmonth, .v-datefield-calendarpanel-nextmonth { @@ -2072,7 +2072,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 -134px; + background-position: left -135px; } .v-datefield-calendarpanel-prevmonth button, .v-datefield-calendarpanel-nextmonth button { @@ -2084,7 +2084,7 @@ td.v-datefield-calendarpanel-nextyear { background-position: center top; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: center -157px; + background-position: center -158px; min-width: 24px; margin-top: 1px; } @@ -2099,21 +2099,21 @@ td.v-datefield-calendarpanel-nextyear { .v-datefield-calendarpanel-nextmonth button { background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: center -178px; + background-position: center -179px; } .v-datefield-calendarpanel-prevmonth button:active, .v-ie .v-datefield-calendarpanel-prevmonth button.v-pressed { background-position: center top; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: center -199px; + background-position: center -200px; } .v-datefield-calendarpanel-nextmonth button:active, .v-ie .v-datefield-calendarpanel-nextmonth button.v-pressed { background-position: center top; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: center -220px; + background-position: center -221px; } .v-datefield-calendarpanel-body, .v-datefield-calendarpanel-time { @@ -2133,7 +2133,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 -241px; + background-position: left -242px; font-size: 10px; line-height: normal; text-transform: uppercase; @@ -2152,14 +2152,14 @@ td.v-datefield-calendarpanel-nextyear { background-repeat: no-repeat; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -260px; + background-position: left -261px; } .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 -279px; + background-position: right -280px; } /* IE fails to position backgrounds inside table element */ .v-ie .v-datefield-calendarpanel-weekdays td { @@ -2245,13 +2245,13 @@ td.v-datefield-calendarpanel-nextyear { padding: 0; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -295px; + background-position: left -296px; 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 -318px; + background-position: left -319px; } /* ./WebContent/VAADIN/themes/reindeer/label/label.css */ @@ -2359,7 +2359,7 @@ td.v-datefield-calendarpanel-nextyear { background-repeat: no-repeat; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -341px; + background-position: left -342px; padding-left: 2px; } .v-app .v-filterselect-input, @@ -2368,7 +2368,7 @@ td.v-datefield-calendarpanel-nextyear { background: transparent repeat-x; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -366px; + background-position: left -367px; border: none; height: 21px; } @@ -2387,12 +2387,12 @@ td.v-datefield-calendarpanel-nextyear { .v-filterselect-focus { background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -390px; + background-position: left -391px; } .v-filterselect-focus .v-filterselect-input { background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -415px; + background-position: left -416px; } .v-filterselect-button { overflow: hidden; @@ -2400,39 +2400,39 @@ td.v-datefield-calendarpanel-nextyear { height: 24px; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -439px; + background-position: left -440px; cursor: default; } .v-filterselect-button:hover { background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -463px; + background-position: left -464px; } .v-filterselect-button:active { background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -487px; + background-position: left -488px; } .v-filterselect-focus .v-filterselect-button { background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -511px; + background-position: left -512px; } .v-filterselect-focus .v-filterselect-button:hover { background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -535px; + background-position: left -536px; } .v-filterselect-focus .v-filterselect-button:active { background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -559px; + background-position: left -560px; } .v-disabled .v-filterselect-button:hover, .v-readonly .v-filterselect-button:hover { background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -583px; + background-position: left -584px; } .v-filterselect-suggestpopup { background: #f8f8f9; @@ -2458,7 +2458,7 @@ td.v-datefield-calendarpanel-nextyear { background: transparent repeat-x; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -607px; + background-position: left -608px; color: #fff; text-shadow: #3b5a7a 0 1px 0; } @@ -2474,25 +2474,25 @@ 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 -626px; + background-position: left -628px; } .v-filterselect-prevpage:hover { background-repeat: repeat-x; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -637px; + background-position: left -639px; } .v-filterselect-nextpage:active { background-repeat: repeat-x; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -648px; + background-position: left -650px; } .v-filterselect-prevpage:active { background-repeat: repeat-x; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -659px; + background-position: left -661px; } .v-filterselect-nextpage-off span, .v-filterselect-prevpage-off span { @@ -2508,7 +2508,7 @@ td.v-datefield-calendarpanel-nextyear { background: transparent no-repeat center 3px; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: center -670px; + background-position: center -672px; user-select: none; -moz-user-select: none; -webkit-user-select: none; @@ -2516,17 +2516,17 @@ td.v-datefield-calendarpanel-nextyear { .v-filterselect-prevpage span { background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: center -681px; + background-position: center -683px; } .v-filterselect-nextpage:hover span { background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: center -692px; + background-position: center -694px; } .v-filterselect-prevpage:hover span { background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: center -703px; + background-position: center -705px; } .v-filterselect-status { text-shadow: #e9eaeb 0 1px 0; @@ -2539,7 +2539,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 -714px; + background-position: left -716px; -moz-border-radius-bottomleft: 3px; -moz-border-radius-bottomright: 3px; -webkit-border-bottom-left-radius: 3px; @@ -2595,7 +2595,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 -731px; + background-position: left -733px; } .v-splitpanel-vertical .v-splitpanel-vsplitter div { height: 7px; @@ -2604,7 +2604,145 @@ 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 -738px; + background-position: center -740px; +} + +/* ./WebContent/VAADIN/themes/reindeer/table/table.css */ +.v-table-header-wrap { + border-color: #2b3033; + 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; + height: 20px; + text-transform: uppercase; + font-size: 10px; + font-weight: bold; + color: #e7e9ea; + text-shadow: #000 0 -1px 0; + line-height: normal; +} +.v-table-caption-container { + heigth: 16px; + padding-top: 4px; + padding-right: 4px; +} +.v-table-caption-container .v-icon { + height: 16px; + margin: -4px 3px 0 0; + vertical-align: middle; +} +.v-ie .v-table-caption-container .v-icon { + margin-top: -3px; +} +.v-table-resizer { + height: 20px; + width: 2px; + background: transparent; + border-right: 1px solid #1c1f21; +} +.v-table-header-cell-asc .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 -767px; +} +.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; +} +.v-table-body { + border-color: #c2c3c4; + border-top-color: #2b3033; +} +.v-table-cell-content { + padding-top: 0; + border-right-color: #d3d4d5; + vertical-align: top; +} +.v-table-cell-wrapper { + padding-top: 3px; + height: 17px; +} +.v-table-row, +.v-table-row-odd { + background: #fff; + height: 19px; +} +.v-table-row-odd { + background: #eff0f1; +} +.v-table .v-selected { + 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; + color: #fff; + text-shadow: #3b5a7a 0 1px 0; +} +.v-table .v-selected .v-table-cell-content { + border-right-color: #466c90; +} +.v-table-column-selector { + width: 16px; + height: 20px; + margin-top: -20px; + 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; +} +.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; +} +.v-table-focus-slot-left { + border-left-color: #9ca1a5; +} +.v-table-focus-slot-right { + border-right-color: #9ca1a5; +} +.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; + padding: 4px; + text-transform: uppercase; + font-size: 10px; + font-weight: bold; + color: #e7e9ea; + text-shadow: #000 0 -1px 0; + line-height: normal; +} +.v-table-scrollposition { + width: 160px; + background: #eee; + border: 1px solid #aaa; +} +/* row in column selector */ +.v-contextmenu .v-on, +.v-contextmenu .v-off { + display: block; + 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; + padding-left: 12px; + padding-right: 4px; +} +.v-contextmenu .v-off { + background-image: none; + color: #666; +} +.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; } /* ./WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet.css */ @@ -2683,7 +2821,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 -745px; + background-position: left -914px; border-radius: 3px; -moz-border-radius: 3px; } @@ -2740,6 +2878,14 @@ input.v-textfield-prompt { .v-ff35 input.v-textfield-small { height: 16px; } +.v-table input.v-textfield { + margin-top: -3px; + height: 15px; + line-height: normal; +} +.v-ie .v-table input.v-textfield { + padding-top: 1px; +} /* ./WebContent/VAADIN/themes/reindeer/tree/tree.css */ .v-tree-node { @@ -2768,7 +2914,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 -768px; + background-position: left -937px; color: #fff; padding: 1px 2px; -webkit-border-radius: 2px; diff --git a/WebContent/VAADIN/themes/reindeer/table/img/asc.png b/WebContent/VAADIN/themes/reindeer/table/img/asc.png new file mode 100644 index 0000000000000000000000000000000000000000..cdcc3c2b51d2e9ae8619dff42a7e58fbb8de8e3b GIT binary patch literal 204 zcmeAS@N?(olHy`uVBq!ia0vp^96-#*!3-o%-qt?}q$EpRBT9nv(@M${i&7aJQ}UBi z6+Ckj(^G>|6H_V+Po~-c73l`}gt&hF`ZX*v#=yipGdoY$(4>FjWIHEUJtNbFVdQ&MBb@02Pc# AHvj+t literal 0 HcmV?d00001 diff --git a/WebContent/VAADIN/themes/reindeer/table/img/col-sel-pressed.png b/WebContent/VAADIN/themes/reindeer/table/img/col-sel-pressed.png new file mode 100644 index 0000000000000000000000000000000000000000..774248c447a1f0140b278efe34dc64478cc6bb25 GIT binary patch literal 1028 zcmV+f1pE7mP) zv=S8;(9zMRsHiS5Gaw@+$jQkeBPGhq%ON8sGBh_QDJ(NJHZU_aA0i|i9w8JK88kOI zJ3T%kB_}H`F(fA`Dl9H3D=aH7F)lGPAR;6!FEJ-5Dj*{!93LSX93L+*G9@S~EHN}9 zB`6ynAQ2N47a1EJAR-|oCK41E6BZaBA|)j#D>FDdGB-OiHaaFMEHgMfCMhdQN=i#h zOH52mO-)TsPEJoxPf$=$QBhG+Qc_b>Q&dz`RaI41R#sP6S6EnBSy@?HT3TCMTU=aR zU0q#XUS3~cUtnNhVPRonVq#-sV`OAxWo2b%W@cw+XJ}|>X=!O{YHDk1Yiw+6ZEbCC zZf7mzbECnVFfInwp!No1C1Sot>SYo}QndpP-Ll?si~=|s;aB2tE{Z7t*x!DuCA}IuduMNv9YnTva++Y zv$V9dwY9ajwzjvox45{txw*Nzy1Ki&yS%)-y}iA@zP`V|zreu2!NI}8!otJD!^FhI z#l^+O#>U6T$H>UY$;rve%F4^j%goHo&CSiu&d$%z&(P4&(b3V;($dq@)6~?|)z#J3 z*4Ee8*Vx$D+1c6J+S=RO+uYpT-QC^Z-rnEe-{9cj;o;%p;^O1ulq(=H}<; z=jiC@>FMd}>gwz3>+J08?d|RE?(XmJ@9^;O@$vEU^78ZZ^Yrxe_4W1k_V)Mp_xSku z`T6}YlU2UV>P y3a1~)vRtW^=UWc3K(F12aCiyu5#T2H3NQd>0X`z_{mPR70000A0#FyFETYEB_}a6HXtD)9v~tzG&egv zKN1rZB`7L4Iy^r@MKm`#MMz67Ff&6&NE;j<4i6AaPf{EmASNg(7a1EOBqu#TKr=Qt zA0ZX=!O{YHDk1Yiw+6ZEbCC zZf7mzbECnVFfInwp!No1C1Sot>SYo}QndpP-Ll?si~=|s;aB2tE{Z7t*x!DuCA}IuduMNv9YnTva++Y zv$V9dwY9ajwzjvox45{txw*Nzy1Ki&yS%)-y}iA@zP`V|zreu2!NI}8!otJD!^FhI z#l^+O#>U6T$H>UY$;rve%F4^j%goHo&CSiu&d$%z&(P4&(b3V;($dq@)6~?|)z#J3 z*4Ee8*Vx$D+1c6J+S=RO+uYpT-QC^Z-rnEe-{9cj;o;%p;^O1ulq(=H}<; z=jiC@>FMd}>gwz3>+J08?d|RE?(XmJ@9^;O@$vEU^78ZZ^Yrxe_4W1k_V)Mp_xSku z`T6|6H_V+Po~-c73l`}gt&hF`ZX*v#=yipGdoY$(4>FjWIHEUJtNb|6H_V+Po~-c71;#%gt%(x=&NaJ8(Y|D>l**VtscLBJ7#JH{SZnGU z7?@fZn3(Gtni!c|Yv~ypnpql|S*dC1sB7u!8JS+vKUxnoN6XX2F{I)a%Rx@21_1_! z4Vob?egFS&J^Sz)&-_JR+pa&oV%srI^Td7zW(NL!4Ex_VXLAE}F?hQAxvX