From c871532b9b40e7b65622f09cfde90f2879af4e48 Mon Sep 17 00:00:00 2001 From: Jouni Koivuviita Date: Thu, 21 May 2009 11:22:06 +0000 Subject: [PATCH] reindeer theme updates: filterselect with icon fixed, table default style now lighter (previous style now with stylename "strong"). svn changeset:7934/svn branch:6.0 --- WebContent/VAADIN/themes/base/styles.css | 4 + WebContent/VAADIN/themes/base/table/table.css | 4 + .../common/img/vertical-sprites-ie6.png | Bin 4206 -> 4606 bytes .../reindeer/common/img/vertical-sprites.png | Bin 10474 -> 11624 bytes .../VAADIN/themes/reindeer/select/select.css | 8 ++ WebContent/VAADIN/themes/reindeer/styles.css | 111 +++++++++++++----- .../themes/reindeer/table/img/asc-light.png | Bin 0 -> 228 bytes .../table/img/col-sel-light-pressed.png | Bin 0 -> 537 bytes .../reindeer/table/img/col-sel-light.png | Bin 0 -> 523 bytes .../themes/reindeer/table/img/desc-light.png | Bin 0 -> 231 bytes .../reindeer/table/img/header-bg-light.png | Bin 0 -> 208 bytes .../reindeer/table/img/scroll-indic-bg.png | Bin 212 -> 216 bytes .../VAADIN/themes/reindeer/table/table.css | 67 ++++++++--- WebContent/VAADIN/themes/runo/styles.css | 4 + 14 files changed, 154 insertions(+), 44 deletions(-) create mode 100644 WebContent/VAADIN/themes/reindeer/table/img/asc-light.png create mode 100644 WebContent/VAADIN/themes/reindeer/table/img/col-sel-light-pressed.png create mode 100644 WebContent/VAADIN/themes/reindeer/table/img/col-sel-light.png create mode 100644 WebContent/VAADIN/themes/reindeer/table/img/desc-light.png create mode 100644 WebContent/VAADIN/themes/reindeer/table/img/header-bg-light.png diff --git a/WebContent/VAADIN/themes/base/styles.css b/WebContent/VAADIN/themes/base/styles.css index f684399593..6f8c895eb0 100644 --- a/WebContent/VAADIN/themes/base/styles.css +++ b/WebContent/VAADIN/themes/base/styles.css @@ -1146,6 +1146,10 @@ border: 0; margin: 0; padding: 0; + cursor: pointer; +} +.v-table-body-noselection .v-table-row, +.v-table-body-noselection .v-table-row-odd { cursor: default; } .v-table .v-selected { diff --git a/WebContent/VAADIN/themes/base/table/table.css b/WebContent/VAADIN/themes/base/table/table.css index 9f2ad755a7..5fc0a83da5 100644 --- a/WebContent/VAADIN/themes/base/table/table.css +++ b/WebContent/VAADIN/themes/base/table/table.css @@ -80,6 +80,10 @@ border: 0; margin: 0; padding: 0; + cursor: pointer; +} +.v-table-body-noselection .v-table-row, +.v-table-body-noselection .v-table-row-odd { cursor: default; } .v-table .v-selected { 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 6e249884f7e3f7ce1fc02c12275c3ef7326597e4..531dae0dd1b10e1259be34a5a533ce2aca385821 100644 GIT binary patch delta 4561 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 delta 4158 zcmV-E5W(;MBkmxO7Y=_20{{R3hUoAK0002wktHQKNJ>mhPf}1*RaRMBTVG*cVr6G( zYH)XZc6oYDb)b5Gflqm&Qhud(DGL_t(|+U;HWa}>uF?qj5#*+YOOAtZqm895RTr&h97$ao`GrX}FCW0Xtg28!>N@;uMLxQy-!6fQ`8O|B127(Qx8jxtl1Rxk) zKxrb_;gc{@9nRVBA^?GNHuRjm3kg<7bHZUF7=j_#*b)kb1ZzQtJMoV-;mYhn;R}_X zMW3rX%*;-o(h?*DTeF=ilO)3io+8*an^cJeQVoY#P|_r;t|fu^j;+}yf#Oc)Gup*+ zlUo_g>tQ{A_$IzJ*0kN(zr9_HZh*Ch_pN90uYy}knn~O6tAqqMgK$9~o+V`Vtfn+O zE=Vpdk*(m?Qd;IEsdBMUdlue0V3n?7$zxN|tuajAb2c)$N$TftVArcIfohDbQx6V| zSiT1bcB4UTNJ3e)8LebU&;3k;oqP{~o#@9ogD}~Db@gFpAIb~jit4&57=I(9o|H}+ z&dPf~11(%6trGhh5LnQxfc+G~WPdZ|Dp=1XG3_-Sunfyd%6uKLZyv;V2TjRbS)v*2 z{_W^aT1DvejGL{m!rRkwj-8*ARi6a+hTbZu+s^L&M$Vp*dj2eFOG{h9EwkQ4t!L9S z$3%F4cNPmw2W%x+46XDQMAFn6rp$;?a42&MY@vD`49uhJV21Ab7MMS?N#h1cR3`(H zQs)3;H_uL7gPjf|s>@rDRJDLL+onYB5D2hqwqQZ@)X03lqX_26z}@D(L_;yEbJzfn zqc+U79j@rT21Ru#AV0a4oukLPB{L6xy&T`F6BBmwF1s$%EpC;1gWrIJ}{D;HycPB5t))zN%^ z3pythqq+(mfX4Kqx)jSr6Q>l_86+l@FBey$yR#DYbb7|`--_;D8bN~txM_bC-bs%t zqZZY5b#^(3>Xw0`x>I!#-U*be7}dpnSYeWeH%L?$Mu({gv7}L5zi|)hHp|(nNJ16S#(DDL707Loft?8(*-Jm!*Kb_j)5)?8(uW=FuOf3kX)I!o(U;*-fsC$iZ zA`}}EtO*I$DD9k;60ESE`9*tHU@MVMwFHE7ELJUn5lT8jSuU<;1tOF})e;4jwpg`9 z;RuC7S^yHtA^NixBp4D($qB_Dre`lBlvGgyKv0n?N&tvZ?D2?DmKWe6lx|T1fYPRl z67&T?F+w>SghEf3c9^)44uT?!4KSz^XKv7onXej5>&=CW^XWf@Cz^BXKwu%B zt^8hHzW`WG0`8VVtE#)D#L~RerFH*<;KORIuB(GhcS$NHcWZO)x-uAlYs^&#>sz^0Y;|egy4AblaVzdF5cX=C$nK@h=x-3wy|lr;CLeaMcoG}xU=yh; zYHGWs(2J)cF^KLJeQjIo%F?`fvv)l-ua@z-UBu zw0lKgyGV6Nb)}^`LM{L%mfoL&17oxS2!^Q$1VgYf0Bhi!y<#wb8&aB($M%vnQqD#J zIhYvJkYH7`00cuY1VgZK1v8#Qf}H?m&PBjETbhFuz&z?1f*}}!4Fkp{&ez?2Ek6tfMCWsNU+@MfH%~46({s+_HQYgRQU-r?O$rx zFQyb9G7peubwTcbtih>9gSG(mtfqEQ#b7Y1Q+?CdCduCc%}J@s=pZmtr3$B074hi5 z;R!xx&UF7LZ4Iym8H~$Jtw|k?VY1T}w@#-9-O!mcI&aRW-sM+5E-jJYLi&59;~)-_ zrenf^3CZBVoEn@t*;MIVpn+hvRI9-p@PdYLiQ+M5c`zw|JW*vt&28tCz7xz;g&LUj zRj*hYz?&M&gYn=^Bi5|W>005LSb;CwZ7GAw1Wcr$vvlnPDWTqHf-r0TpW z`*>3-^Ja2?)Uk|sGx?pV@}}v=g`hIv&BP2GOO-ddNR&W`1j`Le!WDV5?q}!P@oVb5 zNgJf)b`QCCThY|3@n)zRHQ%v!I_vBzSLe-0&v-qn3AU^uZz6Aw2XBTwvmHXKaihes z)#FVgEJyFTn}A*1-MR*EvaIVesRnQM?M!HD@Miyi=4Vu$H)Db#lEPOvoV%vNc5Q?`0<&5D-P z=1tk*4tzgE>BBm*%lZWAv4cD zg#)91OZVZxh($hy10$zefMB&J8itb!Xl zdGnR>=Ad|!&i=Ng4A!5go%!k0e<%%eV4hZgl{W|GX%%_%fIO`lZyu1RRpZSA^0ZpK zna|TI^5y|~S|zGGAWy5to2DCUga~+3#J`5&p&D-GH^V$Fjaw&AtHqnS zJT3C(5#>#Mz6p~g!FpPyWE|GhzI>QiPpb`v^|ZtBCO+SM89OZyxQ4GNjS?81@1!ti z66fsI3P9kT4LxV?LW1FI_ruSbhjTW6Lei|@oS_Ba%CVF^<0wr88)vtTo)*Ez+yZQZ zZOB%HHZSZ|Ez5j!^W_340G2$k-vCjKz6TFFV3`N@y2FfKNS3HyW7cSa|7MNYzb;k_ zr1lFrM}K2$qsXef2$+9o`sDN-AI59cP0N@t9Vo96wSS?8p*iK+J5ep#sUJaq^z084 z5j*_|Voo$-CkkVm4hh()$W!`4Uc=!F+(G?9bLwlW#J>Apm8^s4ndjUkcO4H#X~p*e zJAGf^F;Edhe||EEiTHCEu%sks12rtsv-csRy5o>wd!-Ft$K#=Vc?E#w0yxZrh6%Y; z3P||s{t7kmv1xKzj|Not#fR2_S$AzKEKC9zxSD)as2!y#{m&;g#t|WBLk^ZL-;kiCIQQ-vVaH zGcXI7J4?tWlm&?B02~<`7#t3f1QxmISd&6BTYU4z$T-|NM|Ndld)k#w_U7FU5nL*Y$qBW0Voi2{Nh5DDWZ3Ya}O zast3j6o%)3eAeB;IeV#|g&#t~xX93J2r)6yS*OXCUe5%nNC7lVNq7oMYJ$-KLB@;k zNh)>cOiE(B6&6pvxUcs}k;gT#V!LkA=Djx2k}Ef82hF<|)-vdSfYAz(@owxj5^2Sr z9vIzE*@0|pT7a<+pQxJ4rJ$L_Gh@eKp8lI!4wTd93b0J z!<14;usM@qJ|fwjnNr<33q8g}%mM$_<^UOa?MA=>Kke(epnwCSf9^Ny-p`({KdX>r z{u?CP^0}=CmaQd!+1JxE$^-?n%|Oj42dbJ0Z8JoJGxX8t0Ia^j>;cXhf}u3WSO6=K zV351=7&B$<8R{9jAe=LtGX%p1()gOSXTAC7pJBkPhm^dan=oKu`k6Le5U@Dk3#4sq z-VfS55ZKBRV@oTjiP(-#OHS*$4r2jGb;z6JZBAEl4zOW=!-fspXj2^)fg{)fF*+83 z4?ky^4SmG|z#{PB=L~Y&N;-)GKrjSDFa*Qp0fM1w91$>1an44_oD4{?zhwXZTnh}c z)cVlQMSQBe9cF6&pO7k8&z_J|1gK|nlg#PQnT%V2wYMdugcxRk4U$j*;outaj}rMa zdIi#J90?bMV7PKT62lx50pv4#dn2l6;m1BPsBDu7?Vuuj4e_I6Po+Hf)+3^~A3!|J z=J9j<-0>!iG}$}HB;Ec|XiGC(0=0jjjQ-G;AgdsMd8tyVT#_)V@loCR(y4z01J-bE z@7;D9`U1!)*Zzo_Q+eGs6>!+O?17#Mz)Mqz&IbV4<@1ur^Os@3wvV6Z=Z|men^Wj% zjdw$T_Cp)Q)3)yh{_L*)P6|9i`>SObbI}fz`l=E5vo8Ss+1K9J5dJLp#=T!I3jhOS zfY?T9_ONNG36{}Sy$uj@|GI4cEb5O0S{_^uk7EM#X9kEr3(<`CLVp(dAfeqeFn<Dhp9A`{o8C>8)5@Pj81S?8}=!DffiN)%@6N2bv z^IkAy~m!PvyeJ-Omw>!mlIDHwFl5T$WHbV*F*Y=iKP-^F z_-*Jl@`sV~s^;cOq`CK=yk@_rV+I%TV;Agtic5)0`7qJ->C9zig$wIa^7v9$?NXN* zYT8b!H@bB4v!|~6@j>muh4gN>=*-Q23-`?_4ml#o?#r=}??%DP{4^r=#OY{Ka`IdK z79&Nby#M-Y+}7SL^V^LUlBJ^y3`*rgq121R$iTpBjNUeskZ&-d^>-qXqC-%}hKPs= zK*dPe9ncneHO(m(-Oi=YCKqk+rPeSM`l(bv1C;gm^gvne8%Hd~%4D4h%KLWJpcEEV z2!)n%GZ}%B`TjFdvJ1-s$P(`7psW*811+ze@`$CZl)U2sykzA=(BeL*%jm6|J<1A( zl$Zzzg$_Dxd4d-7Blo}@e!6uTx#$(X*U7|ES?BqwU|AE54|GGJE;A|?V5S?mzW3y! zZASwlLBB&||Kq&`5#IOY>FBZ*No7Fl)! z2_)%(*N#v+n)ZR`Q!p31QJ%jn$+to^T%6c}dV(HmtcC29DBlF-zCH#Bj5qkz5=#kn z<-=H5SRU{7@fE=xCM&?w089DYg;$G>v=Sep09z$LLM$}J2(U);`L0swB6=r}IDMZ-@G5URK~ z`~eJnzpb~|)S9UMUDQrJY@|T_z&Ebix)-_>qN~$1r-CXlkWo`sJ~2N%*a#`M*0E$> z&_lgaR#WS4`l6$09(dQm#KffQ*e1EB(9cHSv6hY0B08rHDLU;bYgqn@&PAFX?uYc+ zT|7T}yFHg_Qt#b9?zYx({dsLoPwnhp!I~_pbv&tK{^;#14t#I)##D8wki&@TX4NUw z>n!Zcon5KRy%$~YT1?#hY{$wxi?tg4&;JzqY{tpBuWfFHviLS!zCm2GPACm&QC51* zPbuyE;`5^*6QBF$P7_tH!0Z|$W#%O^)b*HZuGO$&oL~1Ih?m|6Ri_x>n~bBm{-t=;O(u<@(YQ$0?DtM zJCTW3SnB#L*qD=Jqp^%zTjG<9ft2FTUac)jY^e9PDln>irQ+nYZ9-1`>kzp-wCt^t zIxu8I{p{O-PrEW-=1}u=rsh=ptX0Tm>TgLpap&e;n&+WY#Py7UvZNs>iV*&L5^`=0 zA_RxQCcSEDV~|RPBk6nMaxS6E#KZl_TU|j;p^L=*X;L9=@8KMgvT`9ggjvTUd}nQW z%3)@-=@N48p_?`d*Vb)A*I&y<)A*QDlXLAqQlYzluD@IS;|qM5F!S3(D)>!^reVRc zek{DI#U}f>htGJ{yyZn`A8{t5mP=Cf4OQ83ngz!hD)=YYf+4&+)agQUFGEL&i-UWa z0$om_shYr#FzZ%PB&vZ*Y}2z zG#Edj%oHwTjI2;dD4`}DS0N9Bw=7NwJCF9D0^nHBD4b=>YSdJPscP+d9QC$C1rC9V zk`n)c@gL@y_?1%YUUkzl8_i;=^#dy_D}Tp3yv%HDc=HYwybVX@{_^sz&@-FKte6|O z$=m9@cAFDd!fXe#jxQZVY84hHDuyZz3=FF3KeDLAYbRE_ES;PlBg@Ll+&r~?Tf)h% zq3*Uo=Pvw`9A=w>KUaMI{Q&Xu5XpHpq?A61tVgi$#*G^xFiI1TT+V^P!SiF%aw$hk zhp8&fTeojpo}cXV|J*gn&CTUs`qtjlbFk!ca_sLhkW%DW8#|reExKJxLFQO`W8?WZCwGhll*>r2yD`0TJn-OT2G6L%ew-ddws;+n zP;nqOH`B4So)jyNThqrCOSyC5HKt=g+i{nP4u(!lEnXkae^bxWG2puSmd)>VPD>(D zv&%_Ze1nt{eP053y;>dSsMOpsIpk~T&Z$d#VN+Z z*$K0l5@qFWHzw_K7W6F3bg74r z4;@5?rY*3N^qMS67=xQGv0fg!>3d8nylPNvE+A(UI$++7z7}>TUD8xK+w^4dGuM9$ z9ifYyM}sd3^R!^$tYayo;o6-85t>D(hVcC}uJqa;^>*6*llGy%=bpGW)FFl%E|v~N zj8;y66*AQ9E!}*T*7=pV0)|pxd$OFYdTl30z6bPwK(sFezV+z&};YX zU77C-Oe*3>l_47;$W>V=W6cvwLtPrb&Q8T2W3H=+fvK4NwtSFYXnOmD_c* zJt3?t1;y`u+^!gOK`dk>G^5@(Fm z@jOeiJDIJYVM~A!&GAg+h_=em*z@H$zSSUD<=9FI8|ax)QdV&BELt8GX)_jZt~# zZP3O$qsTn!60}CMZ~r!%# zn%wayg`R}q#-BQTU{RwkD~DE%mR6nE|ZL0 zBfeJtvu_h0ge-0{5Zoa3Cdtrcn<-zoO1w87&G?o$d}uX9^W`&x8%&RXfB1df4cbQl z(f$V48U7&UpWgIyLy;LQX80>Cj;aKW;lqJpS;=@)mKe@J@JPLl7$*&{DSCpmb!hc} zR*Bv*l(T%u9cENKN@4&A;e0rn4P$TkaMHk^g?z!AvQMM29PIRpsc{*-9J&l`mNHW>F5WNe`FcGy9A5QfnQB6|JSul zgM4Gp(+#s+Lhh8xb4!NAr3#ymix->~+{w>@4Qo^DLg2;gw7UKyq5m61Fw%0VvUsWNjy!h60AJMC389)ivE}D!G<53>{e3`I&=3l6f{H0EV!{Qx;BGcL9iw#<> z@RKa<|5m8}9~Jqy5(M1q%7QO-mNiAku~32e(~8tk0qKroD`1th@Egis=t~!um7X;R zHZHutnLSeH`(YFB!ouf2U6o2OkW3S zfhMHXrM!vqZXBC=B)Nf`NOj;yzn=*^a+)Q$=zNN|;mW;Lc^#&&IAJT=my&%xdFp4Y z@5&a|+qf4Vw_2D|>XnNp)@^JD^@WyXLOH7wva)>`yqc zV$*lEvdHM9-;ejuYefgp70UTI-guhqh++8_@LF+V<@L_)?z!proN(yR{wRr6SZ2uF z6CrNGmX?;Z@U&l+hcF*jfr`MzAS;&ix)?gbtLB&_3ZJ$3XE3X zXkMlKbVpBZrq#ZU7={1D25`tM(b1w}`6|2YokVvD@`kAKbiA(wN|GD$wmbDQ#PHyI zLK|f?Hqpl-V4ODsq-nO0GkHOapD&OIei?IOoe@j`4K<8WH#M=G(;{}vzF(z9N7&XSKDPk%>0TxDCD zO^`V_+*mg|8yyl&sl*mrv%NUuN^T03{HqD6<@@>m2^t8Efoeofn2+7BoYp`+$a#)d zC!&?{_oYwiqaI0{4+4SOf54DvJ@-F6E$q}9gb(6p+DFW7%eeX!(4_Ry;ClDt=Xt*) zMlADtLOw6^KlZwdjk&Qp_x~E{Um%Wc498k3f%T7@QZ*z}>Y*xoXImrd^%!RUwBgkY z{P~N$pJxQrX~VLDtzv9~0QlcrpI{ZkKe9Keb)Uoilu&ic0kyqU4VP_|AuI1DkmIOE zao^;B@al@^a~kbT)5-NLDeCN&Mx@b~hk~C;R^CnXHJB;uWE0QbmGZTX9M?{}k0 zb>O_-mbrXjySd9-cjRF=ajuqBo`dm0<;}?*{qmSmnqD2YEvmm*s!Xb|@j{X5J$Jba zdA7XV{|zmZ^x*gtxt_5bnrzhA1KWDEJs%_Fwn}L?CM=|y%cSt0*6-9YAYeDoF2EoJ z&Jkz&^n?3aiigKn7?cOcotMUU10woG2^Fi{+m>*Geii*o5fyuKvQ{MOe&n#E{+8c< zAVX>AXg*q{$fUmG$C-7iUzUT_dSm5=9}#XVvfk&gBZ1%I#n$himS+CFU!+#+2~hmF zs~^r5lN?{{{Au6$iAOJ%nsE4fPG&6258d-tGGt?{Saz`|WzE;S|7Q@M=$`NDXFRU~ zy~>smReBL$9LV6yqc+X!2yP>HF32;RrJkZepZ%3nWWCl%HZ0s{t6fRS@x>B1=4G}< zI*g2+iOX(?ZN62;imi9P{>6>^_zC-!0cWL?l{5Z6f}N61jzR90s;T_*-!;%0zD*U4 z6LU{9U<;E5!ATJjOTPRri+y@{L|$DYOkYYO9PvdvJ>V<@`0F2J8pkc>tUr0jQx6Nf z_U!oFj8Rk{&2){H;N|0|aZ!pk=P|ghr?eQ;#j+1i6RUEXmj~Lng^|tH)^_2Ca{=1D zzoq%dpBNwppUUk(;HaRF%!C>Ot`WB!WfR!~~iy9IzB~ z^l`Gn;gf6#Aq&9;;l-CCm-e9{ZEWu3RYvFbN_J|8MYI%a?}J@cssyxi<;I=PSj?7uJ03jMt}9yO<#vc&i*I2Fl^TcW#!~xn0We6u?sw0gmtK8Kh}T7_3?(2SkSs## z?`rvIkl7crK9F=8QU-)kIG{bHY{6?`&k6I8rsP@uT;KX!y4 zvG=``;xk9QR!mo6&C_nYgU$`%N4(%MD2HP|xf9sc zYMIa9CoF&P(y)FqvO41)BDwy>LSY(-*2q-9qgJ@^hQr{=c~%!oT=k!V_3kGQ@GfJU ziHkL&EL6@X+l0pYpl(;OKIvz8 zNQJ>^MarEz{qk5I>ra&tu#ht&$Pf27?gnZZXZ3?>2K^`s-6(UgyXm5Uvq`Hv?r$u* zAyISMBpq?l@~J^ zv`0@>?tc-|Zj=g>DZF*QpC1!hh}yYqH7+stBPx9btyv91p&M$07gEHOCtW>V4mBdk zU8x#2=@lB!8|Yk=C>+N8>_-vRcq4n1rgg}b-*HT6>rLwAQ)7XT#pFqlcA9awW_Un6 zbqn^WB>}#ZxU^GODGOltL9~E#8bKh(V-R;_p6=K1&GHY`8_}=F2 z?P}XW)@*tD+XX~3(jTgsB}%@lT7Nt;`R%MUgnG^N+`!Dx%()$SFcNgqthX-I8Jv}p zqs{lrR&Jc7Jp2&tJ8Gl@~qHv)>@qQFXUJOd--?>wFokF-7IxRpmeJ zbd{ij-)U9fw`(%bfpx*zbTKnEgF3R@=VkZQo`ID1+O* zZbcL*AN%{ZuYPbu|Kp-~!wWa}s>RN2mi$3JQvja=HpUr1Y@&xf=Kryn*7Ps?7mi|v zy#@}kAKL^hJ|UJ=UIQLc*HMfP<9ptfS@M{9l|08Fv4)JSl$LE4K)l6=(nX1Pb#DR( zWZ)G}i9kx85XuVz60tUQV&SZy^N?kJI^6dpAi*B6{|vyKBG4eR+4Qk3015bCZ#2L? z!^TPU9nila3T_Mr7hC@3hT_BU8UMy!rYuWqc?%KASmFO4BiA1{>Q%=S&&x&`giAU;5N9!q7e1A}Z z8uLCJ8(2C|L;EP{GCa`b(x2baC$bs}K))zZu&n-!w-wHdmxf8tTGr-8$g&3!i= zZGV592i#~Oa}~k;9Kw_V-1fC~fXg#(gBn$^3vR30fY~|QN;@N`-$Ji>TJrHbOyB)n zD;Csz75bA4jf`ehMZicJ8JylISiXu*>P)M&NWLVek3IwY9GELBd^uz7g+%v>F`%(UUuVi&bu{G*(&Fcb5>zE#4Ex-(fzh>RmP$<)gy)^$Zx zvxYEX{f#ZR3l@8kHM`@y*N;7#@G}&gD>}MxEzRwb1PgXh1;X{8zg6_`RIu&9&d95Q zvv>uj9|8s6WHl!YOJt|%E9DGj_#a&3MoCDJvJ7o_Y)CRcH%)%3o8BrEUz~-xH?*<6 z**6rN->E#5&?+#p_ng!_()Y08`T*wqm@t9Ir!F~MdzpXdTCM1PQ=_>zD<$a8Ty|6w zlx3#IFI%>GegUg~o_Oi}|GIfqsR}s$$}xMf5R~=q6hV{>3p?PY7kY9?5zTnD(GdBR z)$a?l1v;we!w)L*X}z<+KTmeN2DA-|o#SF-*FX53HiUI<{_+X5*3U^j3LYsKFJ0;& z^jVm!-nFwEb04p9GYZD(MM9F8MR`qQ*1wcnc9M@*e3uK4sLa7nhAk&pUj)8T(&%+1 z7%R(dBY7)GK)3t5PUk67SLD?cb8s*Xtw3qXLN&#S3L=F5V_{>!(A7bGxLexBHET-f z+@<}%Qi)Z!p+T+tb1E9qSFz=5BkiTV^$dp|USj}ov4HCr&ujQB<3&d9U<%j#>hSR$ zGop@eqx({+s|(b=-_pB#;+W*9o8pJ1ZQhoj$6PH3qkwE?c z)%5a&k3o=2rNqTq+l-eW8J3oaHM|*_*(yCd3opre4em}QUZl6EB-dLVhm#Sub3|n5 zrBW!{oyY)Ypd{=|nM2{hFHcnBdE8X>i=8uN{U5z0Eif=D%!;6e3G1{m`OYp(?0SPlMj`pOzX@&+?`5l9 zHt}BxF??lWf-|YCOq-6#&dR(|nYu8xd|md-NN2u3&QLyjlEd6W)0WBg`8`%1}AHJmIh~*v07>~+iaqL zpJG)Oz0lpl6+DQb%Lq5nX--bX#8QjP{T4v80b>m;Cn3E!Fn8jv%Sh1i<0lGq0RIzf zQpW?ZZx=90=b%Z-rx7?`>(iycjF#FRng9jfQ*?-ZDY8DrA{WguUaS%deOBU^4Ya3S zyE^EO|1JsiZ;MgoZSds7kpp0pk|6*BP*UnI+>SPavh{I|!c~6mak#R=Cn_*UCqa#; z^$&K&<_Uq`ksxs)@-b7$$xk5Gm$x?0c^)#eX)}{s`Yy;4fMdnMw{H7%0@-DZCKkO)}aaTaXY zN3q0E^QTfk4zPi;UIW=!wB>L+NATE%+PxmQo(saGVE%?C=PH1C5&1>H3J5i>8iGH& zTt#3_LbY=*!D1Kg7XiB`=YoLm>Qb@^_zkwr8P9G$iC=opKa|Zv`p_ija|s zo7EINRm9qri?x|c%>y&ue`bZ)X3DeE!5L(d1W>@ptB*Z;a_i&xQCMo6k1uU!vRG8O zc6QJ6KedT-$x^$4+o}%eyN%hOPmkb@bD=S2A3fW_ ztv)aGS(p|%Y+0y~#NdC0WlH%A)%_8$eR15q;nAU1ImJ5q>-8sNzh4mNIH_Xv+^xMQ zBtmJGL_+~QRXHDxFY}WMG#g{MimH1Oog9M8s&-a?Q^B3rTM!~2v$_r2hTV&7VG#RQ zi031JoR5!tFOAftkN@06609M+7ann!rP2BnOOYl`(9d)w_GK8Tgd_#H)T$n>3o5B- zAS`opu}7@{B@)H!2z`KhEoL%N6=pn8m23R+F!}YX#x>|?X$$xtZqrSyYWa6J%i5M!~ z=fcLm*H+JPu<&v?Y9~L*|2ZR2KeJyRU$fRvmkP#FTjyy0rayRSPic4Zr8%)d4+Z|P zj_gTs)?}GpPVH`}xyhm<$r-X-C@x?-IROaV~7LAQBg1bYg(vQxY& z*Z|R-tN@c-7^Aw>JooWJl8lwW#TH2jglF7Cpll`%LGV;$C}SJl`6ZzXDw3 z;ELN=Qqlwwi$H2)a|g2#!+ZQuma~&MJ;lF(R7L-s2Xan_H;$j)>WaJs zngR902?+Z^kw16W@xZxnbvS4OiH2Kt|0@`L`0b9taFChEknfo>Lt9gtdE z!Unn!8W6GA4qLwipu;ZMXKdfSi73)T;9kN7&zA7OUheW@@-uK zil+pOF4R>DqnHG9G0UI=iU~W#uHY!1JAd)luVLL>K0=y)S#US*E-n9#?PVn5>N7cw$Bf==1LFVbKMa#(25b>JR%RWF&cW8VSV>j&Ki`mPvvmU**}uNR);(LgMP8-!0H zHG;$i%Q;z^z)y#RId(blx!$F*8}kB<-b-U(CgA1PV-O;I{>%}_@5e2;SIL|)|6m5-g zh{q4tqnd}*xFqJqoQ~zbTeEz4stQF!8L<4Fot7xF{GC6)0{oWWtQ3)FwJjIVGgaVc z!1$OFlgaY`q+%{7uMX}m^2X}nLY$;gmA5ls;#|7QVg}-!3n_=vuYc?%d+jb{z70z0 z?K|nKcq>GJ`>w66Bfhcm^vm@u>+Te`b5puMzUJp4D1|okH+h5uy&_7W#2F{U@yUiJoVKG*tdvtnA~&=^r)4-W5bMzv zkb|s~y%%OQ&A1R|FwMAG74M;F-x24b=zFh2GQ+&1LsBjTpLg^__+PxcoEV&s?@qqo zd?Cf1CQWd!kNOpruL^%=1>2+UoXs2z0 zj;rW(G1HC7N)6|DUc}^PRp)BmN@Py0teiP z>DcSv^Ap3-#CKC79&*qYy>7PBpHL=t*Z~eWBtHK0J-!4DI3bm9& z;S2qf1AHp;S%^-AptbxEiZ6OWsB6{Ur~LL(SLvGKd}|cbDl7rLv+Q6?nMmojS~Y?~ zCc}S%QJIrVyc48o9czxsmjtzmBBtZv22T$SQ&M@=l7u}Lx5K=+vtc}NFUAk>6ib?{ zIF_$$=PsO8n(g`v2_3=IyM zo&Jc=(U6>16^DpUSf_l)#pce1)?KqXHN|blh*;Y+{CA#-@9zmFd;Q~j1T4*ajOyS6 z>i8B|D<#B*pPPdtw*WfAmky1WLroFbxwdESEFetfM^Nhz;s=p^Is#Y&Qe!7Y(D|)0 z6Bh5e&qs}mQm>Sej(jS`Eh%YK*f=ZyU+YWu9$OuDUa^cy`HulD#;CLmuGvyjgY|)R z!Y~jn3-SgEMHID2ja<)<`yU)cY`_YGPMpb2p4#|&x!6wBWm4PI4^hxu$S7YoI>b9x TW&|&&uP8lHmn(d17WjVvWU=)@ literal 10474 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 Q9GAdPO<7B+L;->PFUa|hk^lez diff --git a/WebContent/VAADIN/themes/reindeer/select/select.css b/WebContent/VAADIN/themes/reindeer/select/select.css index 57503e8114..a7f8b6503b 100644 --- a/WebContent/VAADIN/themes/reindeer/select/select.css +++ b/WebContent/VAADIN/themes/reindeer/select/select.css @@ -176,3 +176,11 @@ background: transparent url(img/status-bg.png) repeat-x; } /* Filterselect with icon needs a similar fix than in buttons */ +.v-filterselect .v-icon { + width: 16px; + position: relative; +} +.v-filterselect .v-icon + .v-filterselect-input { + margin-left: -16px; + padding-left: 18px; +} \ No newline at end of file diff --git a/WebContent/VAADIN/themes/reindeer/styles.css b/WebContent/VAADIN/themes/reindeer/styles.css index 3ef2816d14..19d60487de 100644 --- a/WebContent/VAADIN/themes/reindeer/styles.css +++ b/WebContent/VAADIN/themes/reindeer/styles.css @@ -1146,6 +1146,10 @@ border: 0; margin: 0; padding: 0; + cursor: pointer; +} +.v-table-body-noselection .v-table-row, +.v-table-body-noselection .v-table-row-odd { cursor: default; } .v-table .v-selected { @@ -2676,6 +2680,14 @@ td.v-datefield-calendarpanel-nextyear { background: transparent url(select/img/status-bg.png) repeat-x; } /* Filterselect with icon needs a similar fix than in buttons */ +.v-filterselect .v-icon { + width: 16px; + position: relative; +} +.v-filterselect .v-icon + .v-filterselect-input { + margin-left: -16px; + padding-left: 18px; +} /* ./WebContent/VAADIN/themes/reindeer/slider/slider.css */ .v-slider { @@ -2758,8 +2770,7 @@ td.v-datefield-calendarpanel-nextyear { /* ./WebContent/VAADIN/themes/reindeer/table/table.css */ .v-table-header-wrap { - border-color: #2b3033; - border-top: none; + border-color: #c2c3c4; background: transparent repeat-x; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); @@ -2768,8 +2779,8 @@ td.v-datefield-calendarpanel-nextyear { text-transform: uppercase; font-size: 10px; font-weight: bold; - color: #e7e9ea; - text-shadow: #000 0 -1px 0; + color: #222; + text-shadow: #fff 0 1px 0; line-height: normal; } .v-table-header { @@ -2792,7 +2803,7 @@ td.v-datefield-calendarpanel-nextyear { height: 20px; width: 2px; background: transparent; - border-right: 1px solid #1c1f21; + border-right: 1px solid #c2c3c4; } .v-table-header-cell-asc .v-table-caption-container { background: transparent no-repeat right 7px; @@ -2804,7 +2815,7 @@ 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 -844px; + background-position: right -845px; } .v-table-body { border-color: #c2c3c4; @@ -2830,7 +2841,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 -863px; + background-position: left -865px; color: #fff; text-shadow: #3b5a7a 0 1px 0; } @@ -2844,19 +2855,19 @@ 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 -883px; + background-position: left -885px; } .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 -903px; + background-position: left -905px; } .v-table-focus-slot-left { - border-left-color: #9ca1a5; + border-left-color: #222; margin-left: 0; } .v-table-focus-slot-right { - border-right-color: #9ca1a5; + border-right-color: #222; margin-right: 0; } .v-table-header-drag { @@ -2864,13 +2875,13 @@ 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 -923px; + background-position: left -925px; padding: 4px; text-transform: uppercase; font-size: 10px; font-weight: bold; - color: #e7e9ea; - text-shadow: #000 0 -1px 0; + color: #222; + text-shadow: #fff 0 1px 0; line-height: normal; } .v-table-header-drag * { @@ -2889,10 +2900,9 @@ 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 -943px; + background-position: left -945px; border: 1px solid #939494; - border-top: none; - border-bottom-color: #7d7e80; + border: none; border-radius-bottomleft: 4px; border-radius-bottomright: 4px; -moz-border-radius-bottomleft: 4px; @@ -2903,6 +2913,9 @@ td.v-datefield-calendarpanel-nextyear { padding: 4px 30px; text-shadow: #fff 0 1px 0; width: 100px; + position: relative; + top: 1px; + -webkit-box-shadow: rgba(0,0,0,.5) 0 1px 2px; } /* row in column selector */ .v-contextmenu .v-on, @@ -2911,7 +2924,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 -964px; + background-position: left -967px; padding-left: 12px; padding-right: 4px; } @@ -2922,13 +2935,57 @@ 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 -978px; + background-position: left -981px; } /* Borderless style */ .v-table-borderless .v-table-header-wrap, .v-table-borderless .v-table-body { border: none; } +/* Strong style */ +.v-table-strong .v-table-header-wrap { + border-color: #2b3033; + border-top-color: #2b3033; + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: left -996px; + color: #e7e9ea; + text-shadow: #000 0 -1px 0; +} +.v-table-strong .v-table-resizer { + border-right-color: #1c1f21; +} +.v-table-strong .v-table-header-cell-asc .v-table-caption-container { + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: right -1016px; +} +.v-table-strong ..v-table-header-cell-desc .v-table-caption-container { + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: right -1035px; +} +.v-table-strong .v-table-column-selector { + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: left -1054px; +} +.v-table-strong .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 -1074px; +} +.v-table-strong .v-table-header-drag { + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: left -1094px; + color: #e7e9ea; + text-shadow: #000 0 -1px 0; +} +.v-table-strong .v-table-focus-slot-left, +.v-table-strong .v-table-focus-slot-right { + border-color: #9ca1a5; +} /* ./WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet.css */ .v-tabsheet-spacertd div { @@ -3006,7 +3063,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 -993px; + background-position: left -1114px; border-radius: 3px; -moz-border-radius: 3px; } @@ -3099,7 +3156,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 -1016px; + background-position: left -1137px; color: #fff; padding: 1px 2px; -webkit-border-radius: 2px; @@ -3138,7 +3195,7 @@ input.v-textfield-prompt { background: transparent repeat-x; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -1036px; + background-position: left -1157px; } .v-window-header { font-weight: bold; @@ -3154,13 +3211,13 @@ input.v-textfield-prompt { background: transparent; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -1073px; + background-position: left -1194px; } .v-window-footer { background-repeat: repeat-x; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -1088px; + background-position: left -1209px; } .v-ie6 .v-window-footer { zoom: 1; @@ -3173,17 +3230,17 @@ input.v-textfield-prompt { background: transparent; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -1103px; + background-position: left -1224px; } .v-window-closebox:hover { background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -1119px; + background-position: left -1240px; } .v-window-closebox:active { background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -1135px; + background-position: left -1256px; } .v-window-contents { background: #fff; diff --git a/WebContent/VAADIN/themes/reindeer/table/img/asc-light.png b/WebContent/VAADIN/themes/reindeer/table/img/asc-light.png new file mode 100644 index 0000000000000000000000000000000000000000..44ed76001aa5e338b38ca638abcc452b821f80f7 GIT binary patch literal 228 zcmeAS@N?(olHy`uVBq!ia0vp^96-#@!3-ps+W+JLDajJoh?3y^w370~qErUQl>DSr z1<%~X^wgl##FWaylc_d9MfL$cA+ERX+zUu<+jHooSK9O&x9&FdEsCvO*E4NJXz{X$ z(%Gvv?tS#+nQv-OO!exs7p~sCefRd=`*-d=NNwA4_x{8G|NlE?_vZtRvi5Xw45_#! zbHrWffC3N0#--&O9{>5jHgQq2!RCAUE8Lzh(o#}wQDUmTW@SESOHtg*2e*q&&sWqx c7EWLYe8seUi@=#PKw}s@UHx3vIVCg!0BG@I?*IS* literal 0 HcmV?d00001 diff --git a/WebContent/VAADIN/themes/reindeer/table/img/col-sel-light-pressed.png b/WebContent/VAADIN/themes/reindeer/table/img/col-sel-light-pressed.png new file mode 100644 index 0000000000000000000000000000000000000000..02afc74e14e1da07ded43b740b4751d4fec4ab47 GIT binary patch literal 537 zcmV+!0_OdRP)X+Mby>R(bCe>)YQ_`)7IGA;Ns)o z;p523$=BK2Y;SYI!^BuzU|nHk#KpzH!NSH3tgWxX!^N|-wZFi^u(Gt-+uhdK*|fE`&(YMs z!NbMI$GEtN;^XD$>g&|k+2P~mjz0E000026Nkl<6&iefWZw<)?j-0s;lF6DMQ z1?xguS!zEv)Vfvm{8vOOxY7tQhhtW2ENmtllv@!Z2#$cqV(|nVLIj!KgiuOdUX#h| zqST50*sg&IB@!Vv38iF56820q`l%m2U!~zEIOtT!vfLipovJPl12fuYPhYrjaO2>~ bc?&QA`rt<$@_0+L00000NkvXXu0mjf-TF1X literal 0 HcmV?d00001 diff --git a/WebContent/VAADIN/themes/reindeer/table/img/col-sel-light.png b/WebContent/VAADIN/themes/reindeer/table/img/col-sel-light.png new file mode 100644 index 0000000000000000000000000000000000000000..7b15cb56054d47aef43752d2f92f5d3de34eee44 GIT binary patch literal 523 zcmV+m0`&cfP)-q_mQuduRpd3@X4++1K})z;U|&d<`* z)U~#_$;r#W!o=?G@6XTB#KgwU&CbEX#K6JBu&}bMt*`6r?6g%nqu-e+& z)z;YA+uh#Z;oaZi*xTLQ-r&E$!oR`9zrn-S*xBdj=;-L`v$VG0;NiNuyxZO1!NbMA zz`?Mxw9nDh%gfE$+}_aB)xyKYvb446=;_(n+oq_g%*@T^=I5}nwA9qq(b3Y*&d=oJ z<>BGt)!5qM;^fuW+2Z5n=<4g#*V*CY<&EVD-T(jqrAb6VRCwB4#?=ynKmbPJ-(3YP zKeKV(4{EM;j}V{YvD-b0j}Qz}1xl&a?XcM#ZY!mjjr}GS@rt6CsDn~7deBIL zfTR`G`7(0U@ccKBR?e#8ri)LR|f73yciz=1^_yTM!F06L%09{ N002ovPDHLkV1m6cI70vc literal 0 HcmV?d00001 diff --git a/WebContent/VAADIN/themes/reindeer/table/img/desc-light.png b/WebContent/VAADIN/themes/reindeer/table/img/desc-light.png new file mode 100644 index 0000000000000000000000000000000000000000..84d15a062822e4ee02fd4e48b5a48cb03ed23ae3 GIT binary patch literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^96-#@!3-ps+W+JLDajJoh?3y^w370~qErUQl>DSr z1<%~X^wgl##FWaylc_d9MNR=eA+FC}yt;Mg-t-m6j9k*Hr|;i%@Oo_3s(TL}-M)K2 zwszgkJNH71m%aV?ZO_3|&tATM_wmcc+b?e1zI*fbUBB%422QCrfSQ+lIs-J#+SA1` zq~aFOk>iXE3LGpOHkS)d`5Qjfrb%=jC-;Zz6${SUxXlw?x8zz-p};~3PnI)(=bYmS fy?gr?6Ay#064UniIxEfrjbZR~^>bP0l+XkKUruGr literal 0 HcmV?d00001 diff --git a/WebContent/VAADIN/themes/reindeer/table/img/header-bg-light.png b/WebContent/VAADIN/themes/reindeer/table/img/header-bg-light.png new file mode 100644 index 0000000000000000000000000000000000000000..0b913e2ef119323b874e817b73147a2c04a4af3d GIT binary patch literal 208 zcmeAS@N?(olHy`uVBq!ia0vp^j6f{H!3-p;FD#!7q$EpRBT9nv(@M${i&7aJQ}UBi z6+Ckj(^G>|6H_V+Po~-c71;#%gt*?ibMN}i+gGmNeE9h3joWwcJ$Urs(c`N(Zr#3n z|KX!2*KXXt0aS7S;nnLm?>~He2Ppmc>CM}BU%Yw^ly6M8GY6WZ<>}%WQgMsrASY9U z00YAY%@CKq|Npn1HJT$AIepKz^Szp@njT$}+0VetATWzzzvF|eGl9AoJYD@<);T3K F0RU8uVbTBq literal 0 HcmV?d00001 diff --git a/WebContent/VAADIN/themes/reindeer/table/img/scroll-indic-bg.png b/WebContent/VAADIN/themes/reindeer/table/img/scroll-indic-bg.png index 05caa85c92fdd4ac61ad6ecd88ad37bd6ad411fd..060eadee5fd7c9d309f0460a09db506cdf2f5ba7 100644 GIT binary patch delta 165 zcmV;W09yal0oVbM7YY^#0{{R3HW&t&ks&C5LQqUpMfmvn_xSke>h0?5?d|UH>+J93 zFe_I_3!ZV@$&QHGbsV<>u;o`eV}o z001mWL_t(|+62LY0YD%C0I(?{g+l+o+NMYjEUMk_(KV;lCJJuZ@VUHGfB^szeE{eX T-^uw%00000NkvXXu0mjfQN3V? delta 161 zcmV;S0AByt0n`DI7YY>!0{{R3u#9vzks&C5KTu3mMeFSE`1tv)t*!0u@apUB^!4}V z=FeO&;qvqK@9^^R^7G{8>GbsV<>u;>l$7`Q_~`2G|C}K#0000h zNklq(epi|5lsVrV5tJVQRWtvLpHwr^k?g0R{jO768+bk~4-3 P00000NkvXXu0mjf0%}>j diff --git a/WebContent/VAADIN/themes/reindeer/table/table.css b/WebContent/VAADIN/themes/reindeer/table/table.css index e6cffa7138..56eef8b8a6 100644 --- a/WebContent/VAADIN/themes/reindeer/table/table.css +++ b/WebContent/VAADIN/themes/reindeer/table/table.css @@ -1,14 +1,13 @@ .v-table-header-wrap { - border-color: #2b3033; - border-top: none; + border-color: #c2c3c4; background: transparent repeat-x; - background-image: url(img/header-bg.png); /** sprite-ref: verticals; sprite-alignment: repeat */ + background-image: url(img/header-bg-light.png); /** sprite-ref: verticals; sprite-alignment: repeat */ height: 20px; text-transform: uppercase; font-size: 10px; font-weight: bold; - color: #e7e9ea; - text-shadow: #000 0 -1px 0; + color: #222; + text-shadow: #fff 0 1px 0; line-height: normal; } .v-table-header { @@ -31,15 +30,15 @@ height: 20px; width: 2px; background: transparent; - border-right: 1px solid #1c1f21; + border-right: 1px solid #c2c3c4; } .v-table-header-cell-asc .v-table-caption-container { background: transparent no-repeat right 7px; - background-image: url(img/asc.png); /** sprite-ref: verticals; sprite-alignment: right; sprite-margin-top: 7px; sprite-margin-bottom: 6px; sprite-margin-right: 6px; */ + background-image: url(img/asc-light.png); /** sprite-ref: verticals; sprite-alignment: right; sprite-margin-top: 7px; sprite-margin-bottom: 6px; sprite-margin-right: 6px; */ } .v-table-header-cell-desc .v-table-caption-container { background: transparent no-repeat right 7px; - background-image: url(img/desc.png); /** sprite-ref: verticals; sprite-alignment: right; sprite-margin-top: 7px; sprite-margin-bottom: 6px; sprite-margin-right: 6px; */ + background-image: url(img/desc-light.png); /** sprite-ref: verticals; sprite-alignment: right; sprite-margin-top: 7px; sprite-margin-bottom: 6px; sprite-margin-right: 6px; */ } .v-table-body { border-color: #c2c3c4; @@ -75,29 +74,29 @@ height: 20px; margin-top: -20px; background: transparent no-repeat; - background-image: url(img/col-sel.png); /** sprite-ref: verticals */ + background-image: url(img/col-sel-light.png); /** sprite-ref: verticals */ } .v-table-column-selector:active { - background-image: url(img/col-sel-pressed.png); /** sprite-ref: verticals */ + background-image: url(img/col-sel-light-pressed.png); /** sprite-ref: verticals */ } .v-table-focus-slot-left { - border-left-color: #9ca1a5; + border-left-color: #222; margin-left: 0; } .v-table-focus-slot-right { - border-right-color: #9ca1a5; + border-right-color: #222; margin-right: 0; } .v-table-header-drag { font-family: arial, helvetica, verdana, sans-serif; background: transparent repeat-x; - background-image: url(img/header-bg.png); /** sprite-ref: verticals; sprite-alignment: repeat */ + background-image: url(img/header-bg-light.png); /** sprite-ref: verticals; sprite-alignment: repeat */ padding: 4px; text-transform: uppercase; font-size: 10px; font-weight: bold; - color: #e7e9ea; - text-shadow: #000 0 -1px 0; + color: #222; + text-shadow: #fff 0 1px 0; line-height: normal; } .v-table-header-drag * { @@ -116,8 +115,7 @@ background: transparent repeat-x; background-image: url(img/scroll-indic-bg.png); /** sprite-ref: verticals; sprite-alignment: repeat */ border: 1px solid #939494; - border-top: none; - border-bottom-color: #7d7e80; + border: none; border-radius-bottomleft: 4px; border-radius-bottomright: 4px; -moz-border-radius-bottomleft: 4px; @@ -128,6 +126,9 @@ padding: 4px 30px; text-shadow: #fff 0 1px 0; width: 100px; + position: relative; + top: 1px; + -webkit-box-shadow: rgba(0,0,0,.5) 0 1px 2px; } /* row in column selector */ .v-contextmenu .v-on, @@ -149,4 +150,36 @@ .v-table-borderless .v-table-header-wrap, .v-table-borderless .v-table-body { border: none; +} +/* Strong style */ +.v-table-strong .v-table-header-wrap { + border-color: #2b3033; + border-top-color: #2b3033; + background-image: url(img/header-bg.png); /** sprite-ref: verticals; sprite-alignment: repeat */ + color: #e7e9ea; + text-shadow: #000 0 -1px 0; +} +.v-table-strong .v-table-resizer { + border-right-color: #1c1f21; +} +.v-table-strong .v-table-header-cell-asc .v-table-caption-container { + background-image: url(img/asc.png); /** sprite-ref: verticals; sprite-alignment: right; sprite-margin-top: 7px; sprite-margin-bottom: 6px; sprite-margin-right: 6px; */ +} +.v-table-strong ..v-table-header-cell-desc .v-table-caption-container { + background-image: url(img/desc.png); /** sprite-ref: verticals; sprite-alignment: right; sprite-margin-top: 7px; sprite-margin-bottom: 6px; sprite-margin-right: 6px; */ +} +.v-table-strong .v-table-column-selector { + background-image: url(img/col-sel.png); /** sprite-ref: verticals */ +} +.v-table-strong .v-table-column-selector:active { + background-image: url(img/col-sel-pressed.png); /** sprite-ref: verticals */ +} +.v-table-strong .v-table-header-drag { + background-image: url(img/header-bg.png); /** sprite-ref: verticals; sprite-alignment: repeat */ + color: #e7e9ea; + text-shadow: #000 0 -1px 0; +} +.v-table-strong .v-table-focus-slot-left, +.v-table-strong .v-table-focus-slot-right { + border-color: #9ca1a5; } \ No newline at end of file diff --git a/WebContent/VAADIN/themes/runo/styles.css b/WebContent/VAADIN/themes/runo/styles.css index 86148397ec..de8355f01e 100644 --- a/WebContent/VAADIN/themes/runo/styles.css +++ b/WebContent/VAADIN/themes/runo/styles.css @@ -1146,6 +1146,10 @@ border: 0; margin: 0; padding: 0; + cursor: pointer; +} +.v-table-body-noselection .v-table-row, +.v-table-body-noselection .v-table-row-odd { cursor: default; } .v-table .v-selected { -- 2.39.5