From ac7606430d1bb5e77cfa3df38333d03e85c69894 Mon Sep 17 00:00:00 2001 From: Jouni Koivuviita Date: Tue, 25 May 2010 08:32:11 +0000 Subject: [PATCH] Fixes #4571: Icon for Table Footer sample Additional style fixes as well for table footers. svn changeset:13344/svn branch:6.4 --- WebContent/VAADIN/themes/base/styles.css | 3 +- WebContent/VAADIN/themes/reindeer/styles.css | 30 +++++++++++----- .../VAADIN/themes/reindeer/table/table.css | 30 +++++++++++----- WebContent/VAADIN/themes/runo/styles.css | 34 ++++++++++++++++-- WebContent/VAADIN/themes/runo/table/table.css | 11 +++++- .../icons/sampleicons/75-TableFooter.gif | Bin 0 -> 1990 bytes 6 files changed, 86 insertions(+), 22 deletions(-) create mode 100644 WebContent/VAADIN/themes/sampler/icons/sampleicons/75-TableFooter.gif diff --git a/WebContent/VAADIN/themes/base/styles.css b/WebContent/VAADIN/themes/base/styles.css index a4ba40b756..ab170b65ca 100644 --- a/WebContent/VAADIN/themes/base/styles.css +++ b/WebContent/VAADIN/themes/base/styles.css @@ -493,7 +493,7 @@ div.v-app-loading { .v-datefield-button { cursor: pointer; } -.v-readonly .v-datefield-button { +.v-datefield .v-datefield-button-readonly { display: none; } .v-datefield-calendarpanel table { @@ -1851,6 +1851,7 @@ textarea.v-textarea-readonly:focus { text-align: left; /* Force default alignment */ overflow: hidden; padding: 1px 0; + outline: none; } .v-tree-node { background: transparent url(common/img/sprites.png) no-repeat 5px -37px; diff --git a/WebContent/VAADIN/themes/reindeer/styles.css b/WebContent/VAADIN/themes/reindeer/styles.css index 571e539eaa..7c65a825bc 100644 --- a/WebContent/VAADIN/themes/reindeer/styles.css +++ b/WebContent/VAADIN/themes/reindeer/styles.css @@ -4160,7 +4160,9 @@ td.v-datefield-calendarpanel-nextyear { /* Default & white style */ .v-table-header-wrap, -.white .v-table-header-wrap { +.white .v-table-header-wrap, +.v-table-footer-wrap, +.white .v-table-footer-wrap { border-color: #c2c3c4; background: transparent repeat-x; background-image: url(common/img/vertical-sprites.png); @@ -4171,24 +4173,34 @@ td.v-datefield-calendarpanel-nextyear { font-size: 10px; font-weight: bold; color: #222; - text-shadow: #fff 0 1px 0; + text-shadow: #f3f5f8 0 1px 0; line-height: normal; } .v-table-footer-wrap, -.white .v-table-footer-wrap{ +.white .v-table-footer-wrap { + text-transform: none; + font-size: 12px; + font-weight: normal; +} + +.v-table-footer td, +.white .v-table-footer td { border-color: #c2c3c4; - background: transparent repeat-x; - background-image: url(table/img/header-bg-light.png); - height: 20px; } -.v-table-header { - height: 20px; +.v-table-footer td:last-child { + border-right-color: transparent; } + +.v-table-footer-container { + padding-right: 7px; +} + +.v-table-header, .v-table-footer, .v-table-footer table { - height: 20px; + height: 20px; } .v-table-caption-container { diff --git a/WebContent/VAADIN/themes/reindeer/table/table.css b/WebContent/VAADIN/themes/reindeer/table/table.css index fc9db768df..3a43a0fb49 100644 --- a/WebContent/VAADIN/themes/reindeer/table/table.css +++ b/WebContent/VAADIN/themes/reindeer/table/table.css @@ -9,7 +9,9 @@ /* Default & white style */ .v-table-header-wrap, -.white .v-table-header-wrap { +.white .v-table-header-wrap, +.v-table-footer-wrap, +.white .v-table-footer-wrap { border-color: #c2c3c4; background: transparent repeat-x; background-image: url(img/header-bg-light.png); /** sprite-ref: verticals; sprite-alignment: repeat */ @@ -18,24 +20,34 @@ font-size: 10px; font-weight: bold; color: #222; - text-shadow: #fff 0 1px 0; + text-shadow: #f3f5f8 0 1px 0; line-height: normal; } .v-table-footer-wrap, -.white .v-table-footer-wrap{ +.white .v-table-footer-wrap { + text-transform: none; + font-size: 12px; + font-weight: normal; +} + +.v-table-footer td, +.white .v-table-footer td { border-color: #c2c3c4; - background: transparent repeat-x; - background-image: url(img/header-bg-light.png); - height: 20px; } -.v-table-header { - height: 20px; +.v-table-footer td:last-child { + border-right-color: transparent; +} + +.v-table-footer-container { + padding-right: 7px; } + +.v-table-header, .v-table-footer, .v-table-footer table { - height: 20px; + height: 20px; } .v-table-caption-container { diff --git a/WebContent/VAADIN/themes/runo/styles.css b/WebContent/VAADIN/themes/runo/styles.css index d8ccc2835d..afa5660cad 100644 --- a/WebContent/VAADIN/themes/runo/styles.css +++ b/WebContent/VAADIN/themes/runo/styles.css @@ -493,7 +493,7 @@ div.v-app-loading { .v-datefield-button { cursor: pointer; } -.v-readonly .v-datefield-button { +.v-datefield .v-datefield-button-readonly { display: none; } .v-datefield-calendarpanel table { @@ -1851,6 +1851,7 @@ textarea.v-textarea-readonly:focus { text-align: left; /* Force default alignment */ overflow: hidden; padding: 1px 0; + outline: none; } .v-tree-node { background: transparent url(../base/common/img/sprites.png) no-repeat 5px -37px; @@ -3279,6 +3280,12 @@ div.v-csslayout-box-shadow { border-top: 1px solid #b6bbbc; } +/* IE6 needs some help identifying when the input is readonly */ +.v-ie6 .v-filterselect.v-readonly, +.v-ie6 .v-filterselect .v-filterselect-input-readonly { + background: transparent; +} + /* Error styles (disabled by default) ---------------------------------- @@ -3578,11 +3585,20 @@ div.v-csslayout-box-shadow { height: 36px; border: 1px solid #b6bbbc; border-bottom: none; - background: #e7edf3 url(table/img/header-bg.png) repeat-x; + background: #e7e9ea url(table/img/header-bg.png) repeat-x; } .v-table-header { height: 36px; } +.v-table-footer-wrap { + border-color: #b6bbbc; + background: #e7e9ea url(table/img/header-bg.png) repeat-x; +} +.v-table-footer td { + border-right-color: #e8eaec; + padding-top: 3px; + padding-bottom: 3px; +} .v-table-resizer { height: 36px; width: 4px; @@ -4144,6 +4160,20 @@ textarea.v-textarea-small { height: 10px; padding: 1px; } +.v-tree{ + outline:none; +} +.v-tree-node-caption.v-tree-node-focused span{ + padding-left: 1px; + padding-top: 0px; + padding-bottom: 0px; +} +.v-tree-node-focused span{ + border: 1px dotted black; +} +.v-ie6 .v-tree-node-ie6compatnode.v-tree-node-focused{ + padding-left: 0px; +} /*************************************** * Drag'n'drop styles ***************************************/ diff --git a/WebContent/VAADIN/themes/runo/table/table.css b/WebContent/VAADIN/themes/runo/table/table.css index be0c1add41..499844e4d3 100644 --- a/WebContent/VAADIN/themes/runo/table/table.css +++ b/WebContent/VAADIN/themes/runo/table/table.css @@ -2,11 +2,20 @@ height: 36px; border: 1px solid #b6bbbc; border-bottom: none; - background: #e7edf3 url(img/header-bg.png) repeat-x; + background: #e7e9ea url(img/header-bg.png) repeat-x; } .v-table-header { height: 36px; } +.v-table-footer-wrap { + border-color: #b6bbbc; + background: #e7e9ea url(img/header-bg.png) repeat-x; +} +.v-table-footer td { + border-right-color: #e8eaec; + padding-top: 3px; + padding-bottom: 3px; +} .v-table-resizer { height: 36px; width: 4px; diff --git a/WebContent/VAADIN/themes/sampler/icons/sampleicons/75-TableFooter.gif b/WebContent/VAADIN/themes/sampler/icons/sampleicons/75-TableFooter.gif new file mode 100644 index 0000000000000000000000000000000000000000..0316afa58cc5e3f977ac720e3aba20fe7470b63c GIT binary patch literal 1990 zcmd^;=Tp-O0)~Gfp@+IOvCyP@dl-R5K&5R0$n6C1fQ10TIUxz|hzu&@$!^FlMMP=> zuCx$}l(>Y@TTBQgpp03i6Cjm@&=N$Ng}c3f%aj3tO`Uk za|<)`ivp2ED3Z)AEb)b+`9+>UD3-}LX6Kit=N4A@LN70`l~uvg^6DaQWqxUSVQHDS z!e3q$eEIU_>({Tx$HxZ;2b){lpFe*-Iyx#TC3bXn!QpU`NFb7Z;vziMk0~ma5#}(#qIC!&(6)StgJ|7a)Ce~7K`turV>e{(Q!^&@94r{unP+dySuv# z#;d}jVp=;L4oC1-`Jthq&nqhX1_mZyPc=2S6cv{gmk|5<2gnr4zz`!dlYl~@7_V62 z;o-Lu6I-ZMxm>=)TgG58gF~-|7>vfI=EA~4I07LQORB1C*dwDQCBzROK8PjK(XsK7 z(XoPpLZMJtT|<^g*K5dRzEE8L?Du!mvqJG2joyI_4Q*+qKF)hmSyeMIIJB{`k(Hgp znRrd7ci@tf-%ro3%Qw@~?#(SMDwWD442Cs4BL8pA?VS=Li9q;OAQEG+*n9Wx%hu)f z4Gn8+YstyUSS&U!K0XG8s;I15;H?agj847f#>U2d`t)g-J#un#0{lPC>Im{b-3x#5 zuTKCPCqM#=j`k({X13`%p*S=Flc1)lbzVb>_RIOk4V5Cn3BJ#_JcSc`+_j-Wn%`^u6dyKcv3X=EmB{iyxZ`W*zOWDTICv@X&oeq59iUDyxdcB)D}kH@ z!>;s{8hE1_W}xfZhXUQBM=narqb<{`R}XuULjT96*V-Y5c0SL5adkMWJVpaP6-m%E zHcGGbcY_#=Xxh?Vpns~*N3t|+AffCWw~%>m1kFR4nbH0f>1R^NBxLIS_y|vVP@tNF zy4Ag97F~FC@_tN_`#Q(E*bX+mSQ6sCUXRrbaFh@=2mK_ZsKjPT*^TH4TM# zk6rs6)7ZTB?A9NbnH4ExmzmC~vsh_W`kJGC)kAB(v<7dj2qyn#f|J$es(E54YOZow zo!X$vdOa}$x86_`oaYEs-j_Q9ZI7JfP4#6s`HR|WCsi=Cm&pP9Yccl1+EI-PW;>bN)le_0IrsYC8Hi@U*8QxNE+^ilC#DYpK$$>s_qb ztIGj`yPVRIS?a}R?FjI6W6Y>I5&iGK^)0446V67t7>?PMdi%1NMuUC|7J#>egDvr7 zKd??yit0$BtI!wx{TXW&C}h=2Q#&-xTB8SCL08q*NlT%z)b%PA!{-|{V5vFPqv&Ur`eUGd_uz~=!Q7SB{{-DaStfq|%Kq88KAO`27tk}BxuG}mO9jd}p zR+R38uxO~!1(}_JaK{Ymp8Vh`YaHLsK8JJ#MlB2j{?2lK7ip29t`i6_4fHKQ%+oq4 zf*`P;tIwFBSKu!fM^J(IjJ-M(lx;f`erITJCrQCJ4fz*y#MD3o4T-a2s;CvIozg%< zVMUo{0RV7{%QAwwKgow;Vy?D<>Wr23O>bV2X_|;=& zVfwUxdL6w8a|eL{um1q?xrc24 literal 0 HcmV?d00001 -- 2.39.5