From 19e7c451c86e9d33fd2007405a1ec7fb8fcc176f Mon Sep 17 00:00:00 2001 From: Jouni Koivuviita Date: Wed, 13 May 2009 10:08:27 +0000 Subject: [PATCH] "poro" theme update: * context menu styles added * tree styles improved * fixed textfield styles for Opera svn changeset:7776/svn branch:6.0 --- .../VAADIN/themes/reindeer/common/common.css | 40 ++++- .../common/img/vertical-sprites-ie6.png | Bin 2936 -> 2957 bytes .../reindeer/common/img/vertical-sprites.png | Bin 6998 -> 7121 bytes .../themes/reindeer/datefield/datefield.css | 8 +- WebContent/VAADIN/themes/reindeer/styles.css | 157 +++++++++++------- .../themes/reindeer/textfield/textfield.css | 14 +- .../VAADIN/themes/reindeer/tree/tree.css | 13 +- .../VAADIN/themes/sampler/sampler/styles.css | 4 + 8 files changed, 160 insertions(+), 76 deletions(-) diff --git a/WebContent/VAADIN/themes/reindeer/common/common.css b/WebContent/VAADIN/themes/reindeer/common/common.css index bf07b03216..4cdf591bba 100644 --- a/WebContent/VAADIN/themes/reindeer/common/common.css +++ b/WebContent/VAADIN/themes/reindeer/common/common.css @@ -20,7 +20,8 @@ .v-popupview-popup button, .v-popupview-popup textarea, .v-filterselect-suggestpopup, -.v-datefield-popup { +.v-datefield-popup, +.v-contextmenu { font-family: Arial, Helvetica, Tahoma, Verdana, sans-serif; font-size: 12px; line-height: normal; @@ -44,7 +45,8 @@ .v-sa .v-popupview-popup button, .v-sa .v-popupview-popup textarea, .v-sa .v-filterselect-suggestpopup, -.v-sa .v-datefield-popup { +.v-sa .v-datefield-popup, +.v-sa .v-contextmenu { font-family: Helvetica, Arial, "Lucida Grande", Geneva, Tahoma, Verdana, sans-serif; } .v-errorindicator { @@ -86,4 +88,38 @@ font-size: 13px; font-weight: bold; margin: 1px 0 4px 0; +} +.v-contextmenu { + background: #f8f8f9; + border: none; + border-radius: 3px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + -o-border-radius: 3px; + overflow: hidden; + padding: 4px 0; +} +.v-contextmenu .gwt-MenuItem { + padding: 1px 8px; + height: 16px; + user-select: none; + -moz-user-select: none; + -webkit-user-select: none; + cursor: default; +} +.v-contextmenu .gwt-MenuItem .v-icon { + margin-right: 3px; +} +.v-contextmenu .gwt-MenuItem-selected { + background: transparent repeat-x; + background-image: url(../common/img/sel-bg.png); /** sprite-ref: verticals; sprite-alignment: repeat */ + color: #fff; + text-shadow: #3b5a7a 0 1px 0; +} +.v-ie .v-contextmenu .gwt-MenuItem-selected { + background-image: url(../common/img/sel-bg.png); +} +.v-contextmenu .gwt-MenuItem-selected div { + background: transparent; + cursor: default; } \ No newline at end of file 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 efe9929cfd82603eb073770aad9665de9245b577..e58600c239a8dc85c40b053c02b8f02cdb9e7917 100644 GIT binary patch delta 2755 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 diff --git a/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites.png b/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites.png index c638f387f58cc71da7139bac516c7975673ba16f..3cd62a79801143acad972618685e1c3f81d2ff9c 100644 GIT binary patch literal 7121 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 literal 6998 zcmZX32RIx~^RR>{;gCe)5F$Z}dV2I0g40C{!9}zvi7pAEULsCAqC|;Kh|cLPmk_=8 z&MBt{QG@^9FYo(%-sk)7p67OUW_EUGW@l$-FIY?CA><G$99nh)~5fKxS zlL9Dg!7r7Fh>2O{f!rg{vGpX1mwI~1&EZ{-4AjM>^aOQ<1@~MH42IS83_67r#bPY@ zVx-3O#nNxF!UO!*%St}n^0%iLkxx-P=P(}R*hG8nCW*YE9{G6+JAGCXbP-8O5y^Q! z@S7+${kyKCeSRvzWoK%qF7fyzuO62idz@U`?XoGgbS4q-Axt3>9vg`nyNcLa zM)$onBNcoI@|EyfN4(%)Awnpmn;kZeZZ}Sronl)#G$VRlhc9r&G4u01b*wbB0oQRZw9e*7C8jLYQCMHd=;-LU zUITu6FwekJK_Q^l6_4g996m0#Xz37EWB47enyv~yA5}yHloXuQk6Z8D)HG|734^ zYf4MF<~WRMEG#T2F=BMwIA6?Aj%lOY+Em3nx6DV=tu+r1u4uOP@`dBISa#a-!U7eg z+(L!y1DN!|%F$;#INj|ZvuxaT8FY^|l0_yxkVe8C!RQ%8#HW}c$DR(OQt@a+T>qPJ z7OCeOQdGj<@FD3TW$u&W?I{_y{o*lE*@s<46f1pSn&@5AIhHxsN2+w|g#~|L?ClB`4c__&c8C^V&-&%t}h>91g@BH|5fY2I`-Eu6wh8jnvMlY3flgQKhGNX`nWg~CwlZT+@}8nD!GdW$MvU9)&^mBhYyk6G!O;DA zh%PC@_sJU#Gbt&`up2U_#=5%wjU;K_5Xx+&2CYxf6eT9*(DUA{yf#l7zf+u}^YF+S zO+CAU3Wte{a16FfSvQs7KLVL#tG%I2ZA1N@IwuV2 z_LK!h{E0YC;SKfAFr+P%>;c&$vVN2>m6^cfX!7QBgXc!iP4>bdsafYnQx(F)>LQV1 z+BeDudiy*$B`Aa;%hX@k%os=mNuw7Zx$6+k4W%SmB_ce(i6I17g;IoAg=fSZM?yL}lMIgxn zo{Xx%Aj@4pvojJ9Pvq=qpF?|+BG+M1T1dvV*VGY7#XR1k*ji4*8s9bF4KRsPJ1j0} zk6tUOcl3h|6qz8|bDj1H>+x$oh)d<49>{q#!92vd7R`f7vM*#`$~rYAO4Bj}cBCS# zbhVDi|2U{H=aO})qPd}?V}aKGtq?CRhlvtP_-VnDn&$(S!&-)hp2jM#wKX)tWUNXZ z#>#Bp$jLQXdf5(Up(WhcBE~TeQEh6PV?~I7!_v`5p`3aSUlJ4*6_=-eO1;^0H39)^ z6;9LM-YyZAI`@v684css`2wGq7_|q72lt~+5<8RJT!i)|Uh69fSBId(+uPe#P$ZtW zSI5VvK0ZBX&^vE=;EV1yt~F}=d+?R8Z=QuG$NLg7SUnRH`^Ed-ZifSp3=G=)vo&j; zFLux!evi@=kHH4LNexEwXqBgGySYWQI1ktr*6nq!mETmbZ+GXscaPttAW~ozsq0L; zUoICwTHbBS^m{vw+A`(7S*VlZ{tpL=nlFr{qklw(Z8CG8h$fEQaz0J!wAvZpZMaZg zULNYG8<+6u)3c%K-+rU^{St(jd(l-*~tIM|Z0Ar6`zsP+OeO zWYr20iJe*fu{e7X8b1u$z>5?|x=TtzMn}f}t{n=(rppFP#8o>d$SRs5id#dlMqKYn zMKmH0ydUe-m{wYl3$!A_D<8G^UTaPeJ1vD`pDd|Ot;co}(cgXo#{n!N~a zJ3V;ld`=f|5l02WrSr=gJ1tv^1X~N9%qn^G z;y)48S+K@#vMB4J)J5XNG|woW0I_j+^wVA>+Nr^r@$91OQcaZ-FgUTli-N1t9*0}@ z*(lJuV-s@~goAL0!$p^uB1{pCJ&$!78_h=@E(!wlKCD9Tf^Uy+U&MF`R}D`Kk*hUM zx6dI_nwJN<^2nVH4yMCkC#ZJ(2jsiYl?Y-o!`rzY8$xJkac9I_>2YES5TqjUm!`WW z1+s2R)?8@_DC#_j9zh=wV*?1~P)^ZrY{%zL_md;H(W`-fZAxD)&#c94UFsxa{D^92 z$;#c79<^Ij*^n`O!eM(J5|WSTH96~{A>_(cdntw7belK>?8LRV85_|rjj<8cxNV$e(Lo&M|Hc*g>g}xdyHD{!>kla$y3M}1GM%pWDTL%PwDQb^E z_7)v5DD@zSrELu9AaM2>U#dH|8=INETgJ~tO%HD|#n53E)5g($6bQrGo5W*Mvv%A-0(%L9R>{gjqI8Bagu=lv zt&x<1Ih6iscZeFG|t+nCJI3j8Iy$|WPB!U9E_0hcUegg z8lRDu{AvAriXL?0iC>dcpw;6>Zv@*zQ^;l>R`7FAHJPa@z z%3hMEr4K6nKz3K2d@gNE?^h4?EfOc~mwJ-25sd=Efvk?_cZvQGk*E+vQOjMv;Nwb3 zjwbI3U@%}*!rDM@l3#hh*Biw11{Ir!Fs)eo6<`7hdDhONyYSpl2(!koUVv1zYiEhV zfo{bbzhVKh%Ask;fztRq!Y;-0Ou__siZc0y?#N|wW8xpj)3eXx#`h$qvx=@p2w!>j zGotd$_;R&fVE)^p3tG!+5rG?wKO~qX2d!=^%V+1ztJ@UqC>#KEmQt|nr{W8=nDZCA zNK|aLlkO7B7Fo$)NY2x#EH~W^j@EAqqpf7WpVAfJiXr`whv*$EX<>J(u3{e424?)x zTU1~_YEext_rKq24w7>~d1ZEJR1Yl)upL{ZxthEJtt?F=jcmk&a{?3)IeBY;A|%lV zT7Mf2dm^fHbT>(Q6UB+4{$6x9--q}M$`Q#CDO~nBGOP6?25ulLA(?!tdz9$8pzs#?}y3L%169-y7ET|-1*evV{hN{4sLa!hpU=B?W_6npS$6A59z4r z`tM9G*Hi%h+jt1LDe|B0Q*vbTS&n3*`(i!4_XrJCbhZ0`Z-r1QCHV{eT{rR8N# z>?dEZs7bub`0VCyG!S9W2?_B-{HJfb6tP>X0b9S0_8FqcN>b?SevRZ`pGf|1PrNBQ zv}GVvyx7m`70iCE<3hYpdjNthtK&q}%~=Z4FQle=ues|0_j!;>AiAp$MjFs0B+@^k zh7b(x{0Ff3|AGD-Uq+iavYSbo*j>GFS82$qiSoELYiPJ@{RqY(Va?x>^Xgq5gO$8p zdesB&kV}DWmA>aphn>hbwtQ9w?%5$m3L8!tZ`Y@sF4ADlW!b+?P1Ja7B5ik~Pd^}S zb5c{~Vq#*xm4$!wd4Ltt)7D1BFLGhgKB5X5pT%l)XC)>2KZJxJ##Zb3?KjA7w1(4X zxpO93TSKosrjjJDx5z*ky1*XY@HvV%sTD}qovq#4C%u|u*?sg4#y9)S(9)8F%6Nkk zo0bZ$>rnSTdZc>XCwrCs5e*xwoNh( zD#Yy-`CX;|tu=vvnfFUK?@kb+^Rm6|;yWJ8V24+? z%zisRp;WPp9X3tAf5JmR$cL$UZ!k6QabO!>!d$}@^z`+ud@#2dx%@2{+;G_Qv2zW5 zF#5rP0TRK2O|FxqUkt+qpIo-JyaBJOs;W+#>?{2qazg2Ciav#pKDV<=&qAXw?=Th2nvGFf zl?w96$V}UJT&tH#q3^J&sAFw5fleM$PqXw;TDgopElNpgoY>Vki2Z$81BnncwYc)W zcqHnQrn&_`6ZC10Ke;-v1+3E$2smd+n~Gn6* zja9y13UdXMAhLIlp)=73O8#ny9(m!?rwymd9%{kr%o|--1Ax@~Ce0QY8}z0u<@B1p zqLBOH_snIcjzy7X_(L1{gNvnZKiD&zU}3_pE2!5=zzRIvTbZYI54(%~Q|ZqRcix#E zaJxA%CiS4+-8dXHx5bq!fb$RJ461()LPGLDA$wtrF?W$tMH1bA79UuT=-KIDp8odzuQ<;{^M)wADG$@?d=NQd8?>XUord0ra_zvcyGWX^D7 z7+?x;N4gj85~-koa<+69LPS03kKO$KbQnaQ4oF|ET?3QSqz64F07hem)=GIn4Zs6a`0?8fb6KbNZ4-ZXK(t$ z_FwZY6_g90K3)|OWc<9c)8SIj{}miLyv7){tc;8@%7yk=KD%K7`GYFhB;eM%=_109E~{?e+UiHq3?%H zDytg{SajEWhxfulD__n&Jv|7HGSkv*+w6yhN_$%A4<*hKlfBEGudy+_qpkI*?Ac-4 zZsf|=yEV9bAKKSw^XwOPR`kV`S0J8w*ip;7skt*@sX)2g)2O`RXhtUk;ejdD&>tSK zpWI!D-I-F2m(metYtD_m0TFJ$kG*9?;=VV&iE1;fvr=o!No{%)gQsP`tRc#-mF@## zNQoEE|C3{WE1Er)J$68ps4*9;mDbzrv;J;IsWFPVY!AbT^5Z)>esOdsOK}yNHLw(Ki5*C$ zSK&@iju$?18T3TfD{$$5jR1_%^Ua}l^lhG#8(!vOl8T{=XmG5R6c_jEJDT)uc(GPK zsc{FQ_BSTER##W^`IvY`d2KzUrLCvyy{%kYvF~V%HI+?b+)L)s8cTC7Td$N{T3wd9 zj5;rxSXGj&(@A?ZYIvUc5tE5GnzB`~k0CBxxS-E;(X2X8zMs9!ouQMXmwlw}O~oL4 zqxW)OCVcE0(0wXgzu`qCd$n+-koLGn;{BW5pJiUe&$0vC&3e`Hl^Nr>cq!Ok^0l?L z7CY{0e4BP+>AC|9j;cf8&^Yv-9522O83}();j9ua$II|8o4ty?Dx)3{S&q;%A!IZx z(cpDPU*^&w&z;%L`!q|(G4Qk@P|m%%Hnk+d8|CSg!J8*&-SvPQx=G0! z?0!{eF!JK(c}iXiq7W0W%D%on+}131A+NB0j5qpM_2glWW&I4g619eF=2-7)Sy%^y z#t>v86O|d0hX>c4Rh(PHF5%EQVj2ph@>u-!+8dh2(=Sz?-B=@yTh2{O`}Wr4vKeEG zX>%aZv%A8iq_T2^vF1a2hr{=qr(ruUrGXx}iYOX3g0cnwDEn9#Wzwhn05d%&nTbdn zekj$-AzX=zk>dEhqradpnOt_;AYQ~w@>!gqx zTR}zHl&Wd60sE1+hzgaVyC|gJq{VIQ!#DZfxA+}!N_;A)nDAPhOd9`DXz(WxY1@bk7=^S|Qe6KCe=GBJhpe8TyU)#} z(By?(-BM;}h_{8I(2&#B?iZ$ud2j)=n@Pfp3C9}i2YXMaC$ZJlVXOF~A^4eq)9`1{ z{$bR|L;A4Yvt_M|kback=j&4f`|bV2wsA^pg|+%8^IzW34~dqa_#$nEcFi6;KRwPC zvu<``HVF0HTy?piK>x8$lXvvh1kxzHL!vgNYJDhOZL{*h6n=5#5?8J}m5S79%TPka zF&aMhU?CH8#HX6Tsgyaqwic;_jxjZq!FuvCw3>!US>I4$s;=C|`f3w4m^;{DJpU8s z+>ARM-c20oRbhF*Oa!j2Rx-A8Sb$EXi9ihKwEjPxy0AQ_e<@;SeagHH?QSNaICQZ| z%b+1ILkQ?Bp|wq024zeHfaq56O@9F;>|yT+`0GO8_hf&QKH~^@^XxqpUKQRifSB>F zp8ep~QP6?+(XK7m!%g--QoCMe&MMr`#y|eJ^-Fr%Nd<@PiQLFF|Ma5rnTkqq`HV%z zx1|Gr_?!=}tS^gx*2SxdLtA347I%uCevBQIIfg307U^+i@=alD zr?3aOorCCS<82lasCClEMp+oc1Xz>s4E7@XVT2H4{St-}D$+1UdW%yS)8I{=p>`Gf-uVzXQTox68A z!LIwBTz3pMTCvZ`YapCkr5o)cV@AOK&-&rcVN$FG-eA8CS9=Y09cM zaXHG)xDlWK>kNW9flvNz6yE!l>J!R(-y=CZoJv^*#Ljo$_!Zy2nB_trEf8GRU!y@B zG*sv-tD2=vCwvBP19S0sLX);xMo?xsp;nC$cjy>kx3v9%Oae~oRWPtXa&j54whl5A u%#b$x{Re^a8!4Vr#_?KR8ARkMja{*PPg&|u8}NS_k&2?mg93ST|NjFU!K)Gg diff --git a/WebContent/VAADIN/themes/reindeer/datefield/datefield.css b/WebContent/VAADIN/themes/reindeer/datefield/datefield.css index 8dbca66ec1..7eea822547 100644 --- a/WebContent/VAADIN/themes/reindeer/datefield/datefield.css +++ b/WebContent/VAADIN/themes/reindeer/datefield/datefield.css @@ -222,13 +222,15 @@ td.v-datefield-calendarpanel-nextyear { border-right: none; height: 18px; } -.v-ff .v-datefield-popupcalendar .v-datefield-textfield{ +.v-ff .v-datefield-popupcalendar .v-datefield-textfield, +.v-op .v-datefield-popupcalendar .v-datefield-textfield { + border-radius-topright: 0; + border-radius-bottomright: 0; -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 { +.v-ff35 .v-datefield-popupcalendar .v-datefield-textfield { border-width: 0 0 0 3px; } .v-datefield-popupcalendar .v-datefield-button { diff --git a/WebContent/VAADIN/themes/reindeer/styles.css b/WebContent/VAADIN/themes/reindeer/styles.css index 5aaee72a69..56ff44b690 100644 --- a/WebContent/VAADIN/themes/reindeer/styles.css +++ b/WebContent/VAADIN/themes/reindeer/styles.css @@ -1869,7 +1869,8 @@ div > .v-button-small span, .v-popupview-popup button, .v-popupview-popup textarea, .v-filterselect-suggestpopup, -.v-datefield-popup { +.v-datefield-popup, +.v-contextmenu { font-family: Arial, Helvetica, Tahoma, Verdana, sans-serif; font-size: 12px; line-height: normal; @@ -1893,7 +1894,8 @@ div > .v-button-small span, .v-sa .v-popupview-popup button, .v-sa .v-popupview-popup textarea, .v-sa .v-filterselect-suggestpopup, -.v-sa .v-datefield-popup { +.v-sa .v-datefield-popup, +.v-sa .v-contextmenu { font-family: Helvetica, Arial, "Lucida Grande", Geneva, Tahoma, Verdana, sans-serif; } .v-errorindicator { @@ -1936,6 +1938,42 @@ div > .v-button-small span, font-weight: bold; margin: 1px 0 4px 0; } +.v-contextmenu { + background: #f8f8f9; + border: none; + border-radius: 3px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + -o-border-radius: 3px; + overflow: hidden; + padding: 4px 0; +} +.v-contextmenu .gwt-MenuItem { + padding: 1px 8px; + height: 16px; + user-select: none; + -moz-user-select: none; + -webkit-user-select: none; + cursor: default; +} +.v-contextmenu .gwt-MenuItem .v-icon { + margin-right: 3px; +} +.v-contextmenu .gwt-MenuItem-selected { + background: transparent repeat-x; + background-image: url(common/img/vertical-sprites.png); + -background-image: url(common/img/vertical-sprites-ie6.png); + background-position: left -0px; + color: #fff; + text-shadow: #3b5a7a 0 1px 0; +} +.v-ie .v-contextmenu .gwt-MenuItem-selected { + background-image: url(common/img/sel-bg.png); +} +.v-contextmenu .gwt-MenuItem-selected div { + background: transparent; + cursor: default; +} /* ./WebContent/VAADIN/themes/reindeer/datefield/datefield.css */ .v-datefield-calendarpanel { @@ -1956,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 -0px; + background-position: left -19px; } span.v-datefield-calendarpanel-month { display: block; @@ -1997,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 -23px; + background-position: left -42px; overflow: hidden; padding: 0; text-indent: -9999px; @@ -2014,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 -46px; + background-position: left -65px; } .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 -69px; + background-position: left -88px; } .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 -92px; + background-position: left -111px; } .v-datefield-calendarpanel-prevmonth, .v-datefield-calendarpanel-nextmonth { @@ -2034,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 -115px; + background-position: left -134px; } .v-datefield-calendarpanel-prevmonth button, .v-datefield-calendarpanel-nextmonth button { @@ -2046,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 -138px; + background-position: center -157px; min-width: 24px; margin-top: 1px; } @@ -2061,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 -159px; + background-position: center -178px; } .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 -180px; + background-position: center -199px; } .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 -201px; + background-position: center -220px; } .v-datefield-calendarpanel-body, .v-datefield-calendarpanel-time { @@ -2095,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 -222px; + background-position: left -241px; font-size: 10px; line-height: normal; text-transform: uppercase; @@ -2114,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 -241px; + background-position: left -260px; } .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; + background-position: right -279px; } /* IE fails to position backgrounds inside table element */ .v-ie .v-datefield-calendarpanel-weekdays td { @@ -2188,13 +2226,15 @@ td.v-datefield-calendarpanel-nextyear { border-right: none; height: 18px; } -.v-ff .v-datefield-popupcalendar .v-datefield-textfield{ +.v-ff .v-datefield-popupcalendar .v-datefield-textfield, +.v-op .v-datefield-popupcalendar .v-datefield-textfield { + border-radius-topright: 0; + border-radius-bottomright: 0; -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 { +.v-ff35 .v-datefield-popupcalendar .v-datefield-textfield { border-width: 0 0 0 3px; } .v-datefield-popupcalendar .v-datefield-button { @@ -2205,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 -276px; + background-position: left -295px; 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; + background-position: left -318px; } /* ./WebContent/VAADIN/themes/reindeer/label/label.css */ @@ -2319,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 -322px; + background-position: left -341px; padding-left: 2px; } .v-app .v-filterselect-input, @@ -2328,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 -347px; + background-position: left -366px; border: none; height: 21px; } @@ -2347,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 -371px; + background-position: left -390px; } .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 -396px; + background-position: left -415px; } .v-filterselect-button { overflow: hidden; @@ -2360,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 -420px; + background-position: left -439px; 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 -444px; + background-position: left -463px; } .v-filterselect-button:active { background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -468px; + background-position: left -487px; } .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 -492px; + background-position: left -511px; } .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 -516px; + background-position: left -535px; } .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 -540px; + background-position: left -559px; } .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 -564px; + background-position: left -583px; } .v-filterselect-suggestpopup { background: #f8f8f9; @@ -2418,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 -588px; + background-position: left -607px; color: #fff; text-shadow: #3b5a7a 0 1px 0; } @@ -2434,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 -607px; + background-position: left -626px; } .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 -618px; + background-position: left -637px; } .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 -629px; + background-position: left -648px; } .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 -640px; + background-position: left -659px; } .v-filterselect-nextpage-off span, .v-filterselect-prevpage-off span { @@ -2468,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 -651px; + background-position: center -670px; user-select: none; -moz-user-select: none; -webkit-user-select: none; @@ -2476,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 -662px; + background-position: center -681px; } .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 -673px; + background-position: center -692px; } .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 -684px; + background-position: center -703px; } .v-filterselect-status { text-shadow: #e9eaeb 0 1px 0; @@ -2499,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 -695px; + background-position: left -714px; -moz-border-radius-bottomleft: 3px; -moz-border-radius-bottomright: 3px; -webkit-border-bottom-left-radius: 3px; @@ -2555,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 -712px; + background-position: left -731px; } .v-splitpanel-vertical .v-splitpanel-vsplitter div { height: 7px; @@ -2564,7 +2604,7 @@ 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 -719px; + background-position: center -738px; } /* ./WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet.css */ @@ -2643,7 +2683,8 @@ 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 -726px; + background-position: left -745px; + border-radius: 3px; -moz-border-radius: 3px; } /* Need more specific selector because of #2384 fixes in base/common/common.css */ @@ -2670,8 +2711,8 @@ input.v-textfield-prompt { } /* Capable browsers get fancier border images */ .v-sa input.v-textfield, -.v-ff35 input.v-textfield, -.v-op input.v-textfield { +.v-ff35 input.v-textfield { + border-radius: 0; -moz-border-radius: 0; border: none; background: transparent; @@ -2683,8 +2724,7 @@ input.v-textfield-prompt { -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, -.v-op input.v-textfield-focus { +.v-ff35 input.v-textfield-focus { -webkit-border-image: url(textfield/img/bg-border-image-focus.png) 0 3 0 3 stretch stretch; -moz-border-image: url(textfield/img/bg-border-image-focus.png) 0 3 0 3 stretch stretch; -o-border-image: url(textfield/img/bg-border-image-focus.png) 0 3 0 3 stretch stretch; @@ -2692,21 +2732,19 @@ input.v-textfield-prompt { /* Small style textfield */ .v-app input.v-textfield-small, .v-sa input.v-textfield-small, -.v-ff35 input.v-textfield-small, -.v-op input.v-textfield-small { +.v-ff35 input.v-textfield-small { font-size: 11px; height: 15px; } .v-sa input.v-textfield-small, -.v-ff35 input.v-textfield-small, -.v-op input.v-textfield-small { +.v-ff35 input.v-textfield-small { height: 16px; } /* ./WebContent/VAADIN/themes/reindeer/tree/tree.css */ .v-tree-node { - background: transparent url(tree/img/arrows.png) no-repeat 6px -12px; - line-height: 16px; + background: transparent url(tree/img/arrows.png) no-repeat 6px -10px; + margin-bottom: 2px; } .v-ie6 .v-tree-node { background-image: url(tree/img/arrows-ie6.png); @@ -2716,24 +2754,27 @@ input.v-textfield-prompt { background: transparent; } .v-tree-node-expanded { - background-position: -7px 3px; + background-position: -7px 5px; } .v-tree-node-caption { margin-left: 16px; + margin-bottom: 1px; } .v-tree-node span { - padding: 0 2px; + padding: 1px 2px; + display: inline-block; } .v-tree-node-selected span { background: #4d749f repeat-x; background-image: url(common/img/vertical-sprites.png); -background-image: url(common/img/vertical-sprites-ie6.png); - background-position: left -749px; + background-position: left -768px; color: #fff; - padding: 0 2px; + padding: 1px 2px; -webkit-border-radius: 2px; -moz-border-radius: 2px; text-shadow: #2b425a 0 1px 0; + display: inline-block; } .v-tree-node-children { padding-left: 16px; diff --git a/WebContent/VAADIN/themes/reindeer/textfield/textfield.css b/WebContent/VAADIN/themes/reindeer/textfield/textfield.css index 346fc726c8..08d27d54f1 100644 --- a/WebContent/VAADIN/themes/reindeer/textfield/textfield.css +++ b/WebContent/VAADIN/themes/reindeer/textfield/textfield.css @@ -7,6 +7,7 @@ background: #fff; background-repeat: repeat-x; background-image: url(img/bg.png); /** sprite-ref: verticals; sprite-alignment: repeat; sprite-margin-bottom: 22px */ + border-radius: 3px; -moz-border-radius: 3px; } /* Need more specific selector because of #2384 fixes in base/common/common.css */ @@ -33,8 +34,8 @@ input.v-textfield-prompt { } /* Capable browsers get fancier border images */ .v-sa input.v-textfield, -.v-ff35 input.v-textfield, -.v-op input.v-textfield { +.v-ff35 input.v-textfield { + border-radius: 0; -moz-border-radius: 0; border: none; background: transparent; @@ -46,8 +47,7 @@ input.v-textfield-prompt { -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, -.v-op input.v-textfield-focus { +.v-ff35 input.v-textfield-focus { -webkit-border-image: url(img/bg-border-image-focus.png) 0 3 0 3 stretch stretch; -moz-border-image: url(img/bg-border-image-focus.png) 0 3 0 3 stretch stretch; -o-border-image: url(img/bg-border-image-focus.png) 0 3 0 3 stretch stretch; @@ -55,13 +55,11 @@ input.v-textfield-prompt { /* Small style textfield */ .v-app input.v-textfield-small, .v-sa input.v-textfield-small, -.v-ff35 input.v-textfield-small, -.v-op input.v-textfield-small { +.v-ff35 input.v-textfield-small { font-size: 11px; height: 15px; } .v-sa input.v-textfield-small, -.v-ff35 input.v-textfield-small, -.v-op input.v-textfield-small { +.v-ff35 input.v-textfield-small { height: 16px; } \ No newline at end of file diff --git a/WebContent/VAADIN/themes/reindeer/tree/tree.css b/WebContent/VAADIN/themes/reindeer/tree/tree.css index 624b03be06..8e8e0e78ad 100644 --- a/WebContent/VAADIN/themes/reindeer/tree/tree.css +++ b/WebContent/VAADIN/themes/reindeer/tree/tree.css @@ -1,6 +1,6 @@ .v-tree-node { - background: transparent url(img/arrows.png) no-repeat 6px -12px; - line-height: 16px; + background: transparent url(img/arrows.png) no-repeat 6px -10px; + margin-bottom: 2px; } .v-ie6 .v-tree-node { background-image: url(img/arrows-ie6.png); @@ -10,22 +10,25 @@ background: transparent; } .v-tree-node-expanded { - background-position: -7px 3px; + background-position: -7px 5px; } .v-tree-node-caption { margin-left: 16px; + margin-bottom: 1px; } .v-tree-node span { - padding: 0 2px; + padding: 1px 2px; + display: inline-block; } .v-tree-node-selected span { background: #4d749f repeat-x; background-image: url(../common/img/sel-bg.png); /* sprite-ref: verticals; sprite-alignment: repeat */ color: #fff; - padding: 0 2px; + padding: 1px 2px; -webkit-border-radius: 2px; -moz-border-radius: 2px; text-shadow: #2b425a 0 1px 0; + display: inline-block; } .v-tree-node-children { padding-left: 16px; diff --git a/WebContent/VAADIN/themes/sampler/sampler/styles.css b/WebContent/VAADIN/themes/sampler/sampler/styles.css index 92955e445b..7fc142ac90 100644 --- a/WebContent/VAADIN/themes/sampler/sampler/styles.css +++ b/WebContent/VAADIN/themes/sampler/sampler/styles.css @@ -190,9 +190,13 @@ .v-sa .v-app-SamplerApplication .v-tree-menu { font-family: helvetica, arial, verdana, sans-serif; } +.v-app-SamplerApplication .v-tree-menu .v-tree-node span { + display: inline; +} .v-app-SamplerApplication .v-tree-menu .v-tree-node-selected span { background: #7d8490; padding: 1px; + text-shadow: none; } -- 2.39.5