From 23d2a2df55cfb0830c7d72c131718430f5927e40 Mon Sep 17 00:00:00 2001 From: Jouni Koivuviita Date: Mon, 18 May 2009 10:32:15 +0000 Subject: [PATCH] Fixes #2943: reindeer theme button broken * added loads of new CSS to make things work even relatively well * made sprites 2000px wide svn changeset:7848/svn branch:6.0 --- .../VAADIN/themes/reindeer/button/button.css | 97 +++++++++++------- .../button/img/button-sprites-ie6.png | Bin 2842 -> 3968 bytes .../reindeer/button/img/button-sprites.png | Bin 9245 -> 15407 bytes .../button/img/primary-right-focus.png | Bin 786 -> 1048 bytes .../button/img/primary-right-pressed.png | Bin 628 -> 888 bytes .../reindeer/button/img/primary-right.png | Bin 833 -> 1187 bytes .../reindeer/button/img/right-focus.png | Bin 735 -> 1028 bytes .../reindeer/button/img/right-pressed.png | Bin 648 -> 1018 bytes .../themes/reindeer/button/img/right.png | Bin 623 -> 919 bytes .../reindeer/button/img/small-right-focus.png | Bin 656 -> 974 bytes .../button/img/small-right-pressed.png | Bin 483 -> 825 bytes .../reindeer/button/img/small-right.png | Bin 513 -> 894 bytes .../common/img/horizontal-sprites.png | Bin 215 -> 218 bytes WebContent/VAADIN/themes/reindeer/styles.css | 97 +++++++++++------- .../terminal/gwt/client/ui/VButton.java | 1 + 15 files changed, 117 insertions(+), 78 deletions(-) diff --git a/WebContent/VAADIN/themes/reindeer/button/button.css b/WebContent/VAADIN/themes/reindeer/button/button.css index 119c7bf89b..b73c32d767 100644 --- a/WebContent/VAADIN/themes/reindeer/button/button.css +++ b/WebContent/VAADIN/themes/reindeer/button/button.css @@ -11,8 +11,13 @@ div > .v-button, border: none; cursor: default; } -div > .v-button span, -.v-ie7 .v-button span { +/* Error indicator need this */ +.v-ff .v-button, +.v-sa .v-button { + position: relative; +} +div > .v-button .v-button-caption, +.v-ie7 .v-button .v-button-caption { display: inline-block; height: 22px; padding: 4px 15px 0 9px; @@ -26,7 +31,7 @@ div > .v-button span, line-height: 16px; float: none; } -.v-sa .v-button span { +.v-sa .v-button .v-button-caption { height: 21px; padding-top: 5px; } @@ -34,7 +39,7 @@ div > .v-button span, background-image: url(img/left-focus.png); /** sprite-ref: buttons */ outline: none; } -.v-button:focus span { +.v-button:focus .v-button-caption { background-image: url(img/right-focus.png); /** sprite-ref: buttons; sprite-alignment: right */ outline: none; } @@ -43,31 +48,30 @@ div > .v-button span, background-image: url(img/left-pressed.png); /** sprite-ref: buttons */ outline: none; } -.v-button:active span, -.v-ie7 .v-button.v-pressed span { +.v-button:active .v-button-caption, +.v-ie7 .v-button.v-pressed .v-button-caption { background-image: url(img/right-pressed.png); /** sprite-ref: buttons; sprite-alignment: right */ outline: none; } -.v-ie7 .v-button.v-pressed span { - position: relative; -} /* FF3 & FF2 */ .v-button::-moz-focus-inner { border: none; padding: 0; } -.v-ff2 .v-button span { +.v-ff2 .v-button .v-button-caption { display: -moz-inline-box; padding-top: 6px; height: 20px; } /* IE7 */ -.v-ie7 .v-button.v-pressed .v-icon { +.v-ie7 .v-button.v-pressed .v-button-caption { position: relative; +} +.v-ie7 .v-button.v-pressed .v-icon { z-index: 2; } /* Opera */ -.v-op .v-button:active span { +.v-op .v-button:active .v-button-caption { margin-top: -1px; margin-left: -1px; } @@ -89,26 +93,28 @@ div > .v-button .v-icon, .v-ff2 .v-button-link .v-icon { margin: 0; } -.v-button .v-icon + span, -.v-button .v-icon + .v-errorindicator + span { +.v-button .v-icon + .v-button-caption, +.v-button .v-icon + .v-errorindicator + .v-button-caption { margin-left: -19px; padding-left: 19px; } -.v-ie7 .v-button .v-icon + span, -.v-ie7 .v-button .v-icon + .v-errorindicator + span { - margin-left: -23px; - padding-left: 23px; -} /* Buttons with error indicator */ div > .v-button .v-errorindicator, .v-ie7 .v-button .v-errorindicator { position: absolute; - display: inline-block; + display: block; width: 9px; height: 16px; background: transparent url(../common/icons/error.png) no-repeat 50%; padding: 0; margin: 0; + z-index: 3; +} +.v-ie7 .v-button.v-pressed .v-errorindicator { + display: none; +} +.v-ie7 .v-button .v-icon + .v-errorindicator + .v-button-caption { + margin-left: 0; } .v-ie6 .v-button .v-errorindicator { position: absolute; @@ -117,15 +123,28 @@ div > .v-button .v-errorindicator, height: 16px; background: transparent url(../common/icons/error-ie6.png) no-repeat 50%; } -.v-ff .v-button, -.v-sa .v-button { - position: relative; -} .v-ff .v-button .v-errorindicator, .v-sa .v-button .v-errorindicator { top: 2px; left: 10px; } +/* Buttons with explicit size */ +.v-button[style*="width"] .v-button-caption { + display: block; +} +.v-button[style*="width"] .v-icon + .v-button-caption, +.v-button[style*="width"] .v-icon + .v-errorindicator + .v-button-caption { + margin-left: 0; +} +.v-button[style*="width"] .v-icon, +.v-ie7 .v-button .v-icon { + position: absolute; + top: 4px; +} +.v-ie7 .v-button > .v-button-caption { + display: block; + margin-left: 0; +} /* Link style buttons */ .v-button.v-button-link, .v-ie7 .v-button-link.v-pressed { @@ -134,8 +153,8 @@ div > .v-button .v-errorindicator, padding: 0; cursor: pointer; } -.v-button.v-button-link span, -.v-ie7 .v-button-link.v-pressed span { +.v-button.v-button-link .v-button-caption, +.v-ie7 .v-button-link.v-pressed .v-button-caption { background: transparent; height: auto; padding: 0; @@ -145,7 +164,7 @@ div > .v-button .v-errorindicator, font-size: 12px; text-shadow: none; } -.v-button.v-button-link .v-icon + span { +.v-button.v-button-link .v-icon + .v-button-caption { margin: 0; padding: 0; } @@ -159,22 +178,22 @@ div > .v-button-primary, .v-ie7 .v-button-primary { background-image: url(img/primary-left.png); /** sprite-ref: buttons */ } -div > .v-button-primary span, -.v-ie7 .v-button-primary span { +div > .v-button-primary .v-button-caption, +.v-ie7 .v-button-primary .v-button-caption { background-image: url(img/primary-right.png); /** sprite-ref: buttons; sprite-alignment: right */ } .v-button-primary:focus { background-image: url(img/primary-left-focus.png); /** sprite-ref: buttons */ } -.v-button-primary:focus span { +.v-button-primary:focus .v-button-caption { background-image: url(img/primary-right-focus.png); /** sprite-ref: buttons; sprite-alignment: right */ } .v-button-primary:active, .v-ie7 .v-button-primary.v-pressed { background-image: url(img/primary-left-pressed.png); /** sprite-ref: buttons */ } -.v-button-primary:active span, -.v-ie7 .v-button-primary.v-pressed span { +.v-button-primary:active .v-button-caption, +.v-ie7 .v-button-primary.v-pressed .v-button-caption { background-image: url(img/primary-right-pressed.png); /** sprite-ref: buttons; sprite-alignment: right */ } /* @@ -185,33 +204,33 @@ div > .v-button-small, background-image: url(img/small-left.png); /** sprite-ref: buttons */ height: 20px; } -div > .v-button-small span, -.v-ie7 .v-button-small span { +div > .v-button-small .v-button-caption, +.v-ie7 .v-button-small .v-button-caption { background-image: url(img/small-right.png); /** sprite-ref: buttons; sprite-alignment: right */ height: 19px; padding: 1px 11px 0 5px; font-weight: normal; } -.v-ff2 .v-button-small span { +.v-ff2 .v-button-small .v-button-caption { height: 17px; padding-top: 3px; } -.v-sa .v-button-small span { +.v-sa .v-button-small .v-button-caption { height: 18px; padding-top: 2px; } .v-button-small:focus { background-image: url(img/small-left-focus.png); /** sprite-ref: buttons */ } -.v-button-small:focus span { +.v-button-small:focus .v-button-caption { background-image: url(img/small-right-focus.png); /** sprite-ref: buttons; sprite-alignment: right */ } .v-button-small:active, .v-ie7 .v-button-small.v-pressed { background-image: url(img/small-left-pressed.png); /** sprite-ref: buttons */ } -.v-button-small:active span, -.v-ie7 .v-button-small.v-pressed span { +.v-button-small:active .v-button-caption, +.v-ie7 .v-button-small.v-pressed .v-button-caption { background-image: url(img/small-right-pressed.png); /** sprite-ref: buttons; sprite-alignment: right */ } diff --git a/WebContent/VAADIN/themes/reindeer/button/img/button-sprites-ie6.png b/WebContent/VAADIN/themes/reindeer/button/img/button-sprites-ie6.png index 6ba8bc2864ff61b2877393318b682747d5d741ae..29dedde2001afa7cd0fe7403886a9468ef873ae8 100644 GIT binary patch literal 3968 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 B-N^s| diff --git a/WebContent/VAADIN/themes/reindeer/button/img/button-sprites.png b/WebContent/VAADIN/themes/reindeer/button/img/button-sprites.png index c14b6864ae37b0fd98446b1eb7652c36914a9725..c048e47b62def80bc146cb060f499439f0b0ce88 100644 GIT binary patch literal 15407 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 literal 9245 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 diff --git a/WebContent/VAADIN/themes/reindeer/button/img/primary-right-focus.png b/WebContent/VAADIN/themes/reindeer/button/img/primary-right-focus.png index 5fef4143e6da73abca3eb0671744f5f60841eff3..7b7ae32d8470d9bed96e31850f676978c275df2e 100644 GIT binary patch literal 1048 zcmeAS@N?(olHy`uVBq!ia0y~yV7~xlOL4FP$@g!Ls{$#>64!{5;QX|b^2DN42FH~A zq*MjZ+{E~)xx2SJCRBvs!{@a4O|$iRIh(}TCQ4k& zRE>zx_TY&6$$#U=!AR%{q4NkW%jqmc?mPXLtxWi)~WLHnM(w?)dKSR{8dm z5^o++Q+V>Xu3*Rav&jMqBu!Coiw|vc&%T zocGa|5o{R40_}fMalPEv-ybR8e=qXqzvcJs`#wHcUGeno?W?V?w~JnYs(aBB_q9NI zvj2JAXZh#;7pb}ZJ-=$UdA`;HW{5c#Bp<7}*Uv}_(RI-iOt;&=r|9FSM=O6FIOx0y zs=`5iN>Eb#Im7+w65D^jHe4t6=t{PGe@x7s?`gJswVffxFqAm$uB^WL`slr%KP|SD zi=2Kvx#H`M&4OPKoi07)*#=egV#+s(FT28BwN&R>ZZKaI{(ikF+#Rkvr)cc#y%YEC z6^CdERQ;~yQ`SEEnZ{`QYRaZHP_YY^D>Id*pY{6^w)bimA5?JeC9!kG!HcH6M&DP8JiVUpX`=MhxwMwduyS5hFxh!GhOCgF_wM71-CEY z@)8Mi{<2(sD|n2|@tmAgYS5wfzI*@gY{8vBm!Io%V27BoK-ufu#G-`^d*d(a|C z|IwwbPdn0T7RNwIr7e4FP|{KMtngT0f>`{dW!cM88> zb9Fo4e!~fJVA~#Wt}2r(cgsKi^}nL8vj5_nvzTq(-rBl--m!WABdX`WlKOP#%Ut=I zM7_CoM)s9|e@xsuectW=M?cHQ{;hhF!e*&~g zL_t(|+U(uUOH@%9$MNUhIXb?UC_ycf2ora;3R<)-2$5R#5436HzE#oxVL`MhH*H(A za3iT?jVIhZ4D`=te>$%#f0hmb z0FD(FucA1X_H z_9qYm1OU(iy*q)#V(tC}f5I+00H6gSFT&7qFoA?b0RW(-2}H}`1Y%jj0syocAT}&v zF@XR8{(><^v~h<4V%Y-$0JIz+NA^I%0RRA+sn_db>*~k^LVy4OTA;O&nm$;ya!eoq zfacSO5065zDB5<)k9YvK81p)v_5S~^Np4z^%y)9eCnwVH*e{N~Rk0Z4emCa`9 z5C9-CK+2V>2e?q}KYb6=@Fu{2}(Ge6`8mKf5ORr+-6J z{+sulOPR6$bp7g3Pk-scnXYGNA1uBM=OX9aXRZ?fI5t31jR0wDgh{G#JluX19^+B* rRr(Kl5khjs*F<#x-Ru2>zXTWnaOYCOgJK{H00000NkvXXu0mjfxJ6la diff --git a/WebContent/VAADIN/themes/reindeer/button/img/primary-right-pressed.png b/WebContent/VAADIN/themes/reindeer/button/img/primary-right-pressed.png index 3c11bb3814791550342ed27c0227585b159337cc..dbcc59c906565c3f7e05901bda73e6494ca6f145 100644 GIT binary patch literal 888 zcmeAS@N?(olHy`uVBq!ia0y~yV7~xlOL4FP$@g!Ls{$#>64!{5;QX|b^2DN42FH~A zq*MjZ+{Ei#>Z(DMELoWpaD_JzB58%9UY zdOk7kY=8JR(`n0oe(CKNIK{83!j;9h&)oZ$IE(`r%h;etmKA=igiYuHrDXl7$%(7#8~D!u$4v86wxN zUE6oN>d%jdf2+UO=`CWif+~?*wMuJ`Wu0{1{avNjy4OW6K-|r6;#z_Q*Y*9eua>f%@)~>D9({4SW!u!@ODVK7XvZ!g){NeODKYiW*Ut6r921aV0Hsbm9_rt%xyEpuP{jQ+2^lRoVJDq<&fBP?o zI>N!M?Qr6a`}Qloef!pzcW=+e-5WQ4)X44cUb}Yf^FByG&T!5-o1ATzU3>G)uX%6h zM{lp2|I2t~l;(1`hSder&0a1m@jL#qWSL#?{Cly!ZJK{C|L$3D`9b3FqeqW2Qd6HE zo@;F{w`To%`^dPsf4QHw?ph~rsRVXmg5PGY+aI|e*zXs zL_t(|+U(swZ&Fbh$MNS}ZfI}Og_y>`LRV&p6Pu&2z$Omm9r$j#J31Phm`>0|Xss>| znyAsi-15h!X@vXVbLnlkX+nA~P9)z?@`THQ>0$WgIrjicM4kx%Yz}o#q)-}}?EItU=b!jL7e_(ZDD=k7ze`V1P06@_I z5w@@Z0EHyU&DkqkSxg`RfHfu%PGJE6)(Q}d2?PL8C_q9c5CA}N(Q*PIKmY*dg5^CB zwy*#I=3*ug0Kk6*2oneZpor!7K)8tx09bDVAwU2C=F>+QE{^f~{FDg*z}Rd)lRuZ2 z=^ob976JqSU?7S@nM}rVf70)}`spvWumAw}1V<#^d@k45S2B1%@ay&ZYrQY`mXC(2g;Y*#eV_}0EYyqA?hNO_5c6?07*qoM6N<$g5qQhg#Z8m diff --git a/WebContent/VAADIN/themes/reindeer/button/img/primary-right.png b/WebContent/VAADIN/themes/reindeer/button/img/primary-right.png index c304c9cfdfac5355ce5a41c3ff3aeb301eaea2c0..a600b84c34938206979604367f909c3d5b208d75 100644 GIT binary patch literal 1187 zcmeAS@N?(olHy`uVBq!ia0y~yV7~xlOL4FP$@g!Ls{$#>64!{5;QX|b^2DN42FH~A zq*MjZ+{EXGeMfk;&xd}2{6`n%7Ad_5brG|{ShC=FWr`TlXU-`G-^-)H{cX#FP^*g`g{v|u-oy1gLi|$J8HE*5& zkqtX`e7O4P(4plw?@P}XdI3?yprUw8A}O@>?%lf+wr=|H$UFGqx3$r4&F@$IZQgTo z88g%_l@m_LIfIy(B{qoYP=&Yg=};eY-~=$b78P@_CEw{B`qsS-_|?2})1 zyjU3S%)rTd_7zKhFFsN^&EAR?syg%Ky7qq-jdGt>O>$s|h$+~HMz(D-Z@ias8R|m? z)3d*xheoza>@vQf+XVAi)2U519*h24GsiN?LUcB;nEw3q-{#QXlPh3O&gxpkks3Qs z<$`wh0;t%81!;#WgU`UN%kC+ErB{) zC`2Ung~-v#$p}T~>H^#5&Yf#e_^|atUcPzo1?$RGPPqDuHcR)eIkjQuM!{7&+;jcZ z@5Jo8c*bV`{Pkv|HaUOnBg_b%UQ^L76t|G!wjhbuXX1L{SS zEyoVs_z`g;N%EGp^~2@z`|3ZOyPdCl)qdyn{CwLB4p6gHl8cL#*WKBl_KL zy}UL!>#x7Pv~J*yi~noNu6Wj7(VY3qZDVPE=QsDqhi~pGyYl`@CChtT>n-znZ^(xn z3O@IJ_qD)Wq3XWX^B%8yzT@UJ+uMo9&ROsumS5Z_RUPI2=DS?G^06fqFN*J4pDQ^& zZBhD~hdkL^qY{gXHdVa68ZK8?^73%+&Ye5gr>CW@lV!0v_TwpMUF5uD@8^FJ|EIC% zeP*2f(Ui^A(r14y|I^<1o8_GJ{|o{1@19zQQyuK%ubb`b@r&-7dVbo!h4**;Prt6e zu{MNhPrOm~h1b7x`!BQo6^g$5OZ i&y3WYXWyNyXOUp2msr3h9h|ZV6q=r{elF{r5}E)o1`tjF delta 808 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 diff --git a/WebContent/VAADIN/themes/reindeer/button/img/right-pressed.png b/WebContent/VAADIN/themes/reindeer/button/img/right-pressed.png index 0a99111e60ebd66851650d33654544b37bc535cb..2cbe6c010f1a23c1ecf3b0e0e4895efba4f65180 100644 GIT binary patch literal 1018 zcmeAS@N?(olHy`uVBq!ia0y~yV7~xlOL4FP$@g!Ls{$#>64!{5;QX|b^2DN42FH~A zq*MjZ+{E~)xqIGA#a)8o!>WzKA6_{Md}fK;TPeTPgSv|w~%;L&9 zQ>%9$m$Uy`ciwVdiM{2@x`|P5Ulh)|RG}6>{Q!GZ{q5}Bnv}o2!q=`{{F)iV!zJ@v z?fG`gxaU7?kI$Cbez?)b+In*ZGtjp{5HP8vw)SsXef|HV-@bjD{_~^1<+{fwPj)g{ zLF5^Zb{O&{CnhR>`TaNE+|11G^j-TSmoEpimO$mZE{j}Ty^5>4y88aRH*abJO=Y1H z0gHC6JACchwdFrQ2qRR7ge*!8= zL_t(|+U(uEZrV^7#_@A(w-PG@5@KRyWh&f3dl`sITtlxUdoKW09mB{{=)%yU9m+?m z3Xw#jpweJ$_qA&(*E)9W4pk)nKk3!^AWP10p1h8uXrYx{k1pxv8$Zqwtj>@)eHJ{JFbUK|Evi(6XmrDW!08l7M9LG_^;qc91FnFm~ zs}%tP04N+Hu4p!!&zx`p06VGBtJQ|Ged|o8Q%(l}kSY9~$9B8*CX>lcyx(PwhkUl{_#L^1?NGCZ{5(9?%s zwg?aaWdbBGNOVqksDc5K{Gr!N)Ft{Z^;zm#0_Ed*^Opbv0LdcXm)|K5VE_OC07*qo IM6N<$g20m&LI3~& diff --git a/WebContent/VAADIN/themes/reindeer/button/img/right.png b/WebContent/VAADIN/themes/reindeer/button/img/right.png index e70a7be739544ed364202a50e2c5e282c1fa2d93..af80f785e87689cee236275323507725f6418873 100644 GIT binary patch literal 919 zcmeAS@N?(olHy`uVBq!ia0y~yV7~xlOL4FP$@g!Ls{$#>64!{5;QX|b^2DN42FH~A zq*MjZ+{Eo{e?Dqr1 z{CTaaz8j-$?ycfctdS2}ef>@RtnF{ZuL9k}z|e3#bWg&5&wVHVsowg z`kwM7FHAlqy{wwQ?&N2QtDk>~Ejj;D;<4H>dqcZpGwf;?eyn(-#soHi!NKg^yLZQ$ z4?ehGxBvg`lP6F5Z!8f_4&iBc<}HD!VAxbrR#tZL_1C(Nm+?ny?5;boLnIWWOJmz_ z=7=r3oO$Z?lYAXs7alLWt7FTNIvOO=pR^31PX}i=5s9cJs>BZHn zxU8+M?;m+vHq-4gBh<+7yLsDtPG48M02Me9CS_GGXQS`4fEl8~A%#g6!fMDdRl8sc zR~Y_z<>a#W3sC&zg54P^l9^v+T?p`Jg=Br;8@T*gFm3 z!ViO)Yd>Coj&RepMV0fW^g$ieAQKw;^@@W$Uwh`Knk2a6bnf224+@-h>(;3i{=Ud! z1+^p6)Aw_Gd%H=coZ4j19XobN9QoA#>DRAYFQM`idcWNGCi1fL?epi)&Dq)6_aFb{ zYbn(`2j;GuJNE8f%hr7G@zbYI?*k2b|Lyzt`p&13H{XBPmtMa*`daDFq88q)-1nR3 zKpeP!aYU4O<;E%7-(J6Z```Ih-=kA^&Ns+^^ISK(YgHiggVXoytqk{7^=+D1F16nK z`qRvw;}Vm%e>iA8*Y8Ey?yJDm@d60;@7=pMe*5rW$p uTydGdZ{hiRapk}7e#*NB?ui%qFP^~gIm*zCkBuo66cV1UelF{r5}E)-1ba~c delta 597 zcmV-b0;>I&2k!(SiBL{Q4GJ0x0000DNk~Le0004y0000Q2nGNE0GZe*zIn zL_t(|+U(u2s@hN-$MJL0Sa2(Dx;VJF>QmgI58=?45TS42BAwdq1)YSu6zKfdByh$uy0_ z;b4+S_E4$WZ05<~@9t`~e`0n30B4!YR;J7qtLb#QZnxW?){r(pjun+!&S6KsKz9-ng3P-&#dt0c4>X( zlVUg&XP)W3?rOAOzUEHxzT&h)XPzDSS)|rB-R_5pOx&u8-loT1#Z2b2{1<GtdH%-p~8L*9$Ev0VK2`z0<<2xoz)a}b^)`e~1b(>3XqrS;biYrn7k z`&|6~pFe3Y*2VNx&eL81b}R$K1r5Vv1}B0eBK}z0e*gAWdVAiVFImSKVb;xBwr1+~ zXu~-(EhXdYik_WmZC$xs^a3Nqj*KOn;_4R39^ULfXWp(4AFo8R!n8@P{xjwG%j)IU zirbKsZ;>#2{cNpYpvXN?%z{8~s7N&X`MD145blDDZl%TQaO1a3+4kz0AKaxGi#P2Q zegRR*U~+3k-a8g6D6co<+Ud`WIQITaxN*`L;R?<3pEs0k7q|QK>3f|-N--B)vsa|L zzWwccZ@(UXyFcvE)SWrXU(D>@r$jz`3pMZp$5X-2pPu}@`%Xb;ecHpX{&lD2?627Sy@E0rFH4oKezrw{d+ri%f~A>U*2qgH^1ujBW3+H$J6ia*i&`l z_p;hsp?|lW-?}pC-8;*b$7)~Sso(#zbUr7@vWAnLrbUJQWpiV$&apU{z4}(^ug9xy z9lw_yZ~IotyZX#+Nmp0-hR4fId%l&GY)ih9|29JVQ({SbVBM=d^&;|H?sC0+(s`r) z!@laUbM|FfAMY?5zqkK&?veZK?qaW(msrG}uBy4~^!xusx%8Yn&zV40CTw~n@pD(} zE3411o;+6k|8K{6)4sxQPrhp}3hxaSy}@WP@AZcj9s53)i!9!{;7|LiO$GP3qmO=B poRuoEy{%AnpV{xz8b8-FFf+^)D4rqIbMq+3P)}Dsmvv4FO#t2mu-^ax delta 630 zcmV-+0*U?32ap9JiBL{Q4GJ0x0000DNk~Le0004y0000K2nGNE0Hf(^wvizxe*!W| zL_t(|+U(uUYZE~j$MI*fTQKcKg0}RcPy}D9M^7Sp5Cp-42XA`tKk)2Dus6k{pr?Z3 zMNq_(lp+XvsDiHqU(&R}7usM9nzzor%&xN`kwt>d_7?bl;9*0O%M1&@Ji}(jm9uy5 z3IHGrWy`UZ>s`~YRqs2ot;kkjf6KQOj^9?tEG<@TpADnz~-GuEKW|ze{^9&ojY8Z zo~z`K5+DG8p+jWMQF7wYRDSMZeue-601Pcz%9`3f?uv582@n84wh-w)p)5H!iXvtM z05G)V(cT0d2mm0Hes0i#001%uNJIw$0N6@^2ptFjAiI8U(18E|hU`4z?zSd=5GH#p zY61iRFcf2qv^IRX|KeMaf9%dnfB*nC?L3lYE6)#P?Po(4mvu+{&Qn)w&FlaG28Tzl z^Vsl0sW-J;dh}HvoOGVNG~Qdc{Jq8u0RRR{{xevqwaxQ#%e+~SJ4a^5i+gtFug>o~ z-B!mgFO--f0LUbL5~16x^vQ&Of4tlBY$Z!Q!6**Y$w@phrh?r&Otv+SADFDp?ke2g zf4%x3`7Ak5>K69`0A!+4A(Fo4{t1xuk+x=p$J?;AYHLwlEPn34`A2{O0Bnf>o9!oC QxBvhE07*qoM6N<$f=;a-MF0Q* diff --git a/WebContent/VAADIN/themes/reindeer/button/img/small-right-pressed.png b/WebContent/VAADIN/themes/reindeer/button/img/small-right-pressed.png index 18e6c6ace1604f8930213d3919b68e153138527c..90a22c8b8ba6d84e7d8f41e29c36ef08ead1fc70 100644 GIT binary patch literal 825 zcmeAS@N?(olHy`uVBq!ia0y~yV7~xli*T?3$*a$ng#szb64!{5;QX|b^2DN42FH~A zq*MjZ+{E@1PLn>~)xw}8>wu1!22kYaSH<`{&Fr6TN;*KVN zz>8*in!2jbn>$x?0W(BC!1MX@=WE}-eLFq#dvT80 zY_1m&afXm<|Ni~kefRF&xi_-5id5xS^OQ8DPYsc2W8g6-6C+PmkFk8>a~|8 z?=C$%WDR%Hmc@$~hux|{7(BJKsOXdSu^)C{<~f*y!x3m=i0Ag(yl=~XfBW&{$M09K zULEi4?KRh|jlO^Twsl0q>wf2n*ZGu-7XRwG)z4p3ANPCXpDn4$a@v!mm)ou`-mDo@ ze(y($>TxlU+vJ4R-vq0ed(IDhYq9kF%q_Nl>t5{ebH2Fsy3*@8k>@_P->Tf1*}>@*WS<0&d!(aJ+}Pc66MpI zu5%l`)Cm%(U*Ui6$cK$hzjjRC5$XTzlt{y7p`C?l?XEz({BLIK8-pV^z(wb#x}V|q z{al|@i!V#6VrZGuZbg{anysr?HG*{6cFVdQ&MBb@07~6ig8%>k delta 456 zcmV;(0XP1+2IB)EiBL{Q4GJ0x0000DNk~Le0004y0000K2nGNE0Hf(^wvizxe*uL_ zL_t(|+U(uEYQj($#__zzC~iU=Tm^5yxsw-A=!FElhTcZEP7a0A!NsAtIuy53p+ysH zp_3g_+W3{GZzO^gTB1Yh@c+R>4kt@I86J)YR4mInwEzHl5smqAmGoY$`O>V@@i9oA zXQ7#CUNvu;)#ihY$K#my2>|$we=#PWtA4-Vb6xjbr=B#SOePZw1OSl9bUO80t=5?i zAH?%K3IqU3C&fAr2c0|5Z+ zWiS}{dU<9C0szQtG#b5YZ`^ElAS?#};4e`WSwRr2hr{7ZrBb=8*Xx%$y|z1@PLJgQ zfZP<)*gM&tB_wAHOU-9G{{M$96s&T&9Mx*IMYGxbs8*|2j^o@X_au(v3*ILHGAr-gY+&S+j>?p(VAXej$sDa|c1Iz;VSZX=X z?P>FG;53x`aNy)>ao?)XC$4^Ba1rJ`*zA#XplOTja*wMMGPp~&$3FW#DZb45f7$Nc z?dSd(txb*mrm=X{C&tsK*66Q_y_x*cd&P+#-%IBxy>r~5ex8qkp+Y=h@8c)mOXd{X zE)TS|UMYEWcZ-j9=d z_RV~0xEB{^5@Z9e}<80fo%{!Y{($ z&NI@6*{QIZNfx4nK`*iq7&0K>aB0`iPjN2d2-8>I%}c*qpL_rQ{r__Ia-ML5rsU1r zGuz_5+J)$~VcRxu{%j{!ziRH>xjSL*R9QUT;eFogufLujJ$lqUvYfSQ^Uab{h%F2r z$4;K~eEs0Tf}Oi}|1PYo+-YcS{aZC1yY+5K*w7JFZQi+@@7ui4Z7uHO@X zSK;g7SH|a@4%Qx;aO>_;yPgj>{;!gM`d#u`Vb_lHktZJmoi6(PM{4h6{*|$jkMAto zcOv;&@{iin8R18Yt@XMp+Ktwfb3GLM`}-@WxkcKJ#G4Aw85x!sUtbw}^vcz;N3YBe z^-HKP{tv;)bvRdEXFftsdo%epat)JlMx2sfNvFFb2e`u=p z_}+BeFi9uR+HRj^;i@nB7?xP>pLyn=%EjHk>(wvJPX1K=FuI4|@Kxo!_ushcxeORm WJJlREtL}Ra3N%kwKbLh*2~7aPt9~f} delta 486 zcmV?@5Fi&p7%C-1qKow?BJEl=W8AOL{WI-Sm4v)Q!d(ota;QXl|;Un!-Q ziK1v>S=L#*-9A-85KtfhfYc@8IL@$Mub&uvf&~CbBk7B3wR$9rNr35o|$jcE00sz=LdBnvL7f28UTCdl8knLwxf+vNn} z`#z@w0N7|UnFNEuz;|8usaC5w#bWVNwgclva6ABz2_-RB$*tD-UkT&y7QW*5?$vc> zbY0g9g+f>^mp>bg#$c04|KoF~7YxYXATM07*qoM6N<$f~RxG>i_@% diff --git a/WebContent/VAADIN/themes/reindeer/common/img/horizontal-sprites.png b/WebContent/VAADIN/themes/reindeer/common/img/horizontal-sprites.png index 3f107c2c319c19d48dc2592a91fbc872fa663f8c..7980a5aa188df8bf69ab8399ea845792768fb4ac 100644 GIT binary patch delta 182 zcmV;n07?JX0onnOEPsxks^;kFv%SWQm!h4kwVbN7mZY$Hq)$ delta 179 zcmV;k08Ibd0oMVLEPsEFn~t8UovXEcidE&qpzH*wBO<4*4WvcqN&Wz z&y1I%=IH67sj#!X#+Ib8yv5A2va&)DF*X1I00DGTPE!Ct=GbNc002fwL_t(|+GAwn z{LRSpi}%kz1|ayy!T .v-button, border: none; cursor: default; } -div > .v-button span, -.v-ie7 .v-button span { +/* Error indicator need this */ +.v-ff .v-button, +.v-sa .v-button { + position: relative; +} +div > .v-button .v-button-caption, +.v-ie7 .v-button .v-button-caption { display: inline-block; height: 22px; padding: 4px 15px 0 9px; @@ -1597,7 +1602,7 @@ div > .v-button span, line-height: 16px; float: none; } -.v-sa .v-button span { +.v-sa .v-button .v-button-caption { height: 21px; padding-top: 5px; } @@ -1607,7 +1612,7 @@ div > .v-button span, background-position: left -52px; outline: none; } -.v-button:focus span { +.v-button:focus .v-button-caption { background-image: url(button/img/button-sprites.png); -background-image: url(button/img/button-sprites-ie6.png); background-position: right -78px; @@ -1620,33 +1625,32 @@ div > .v-button span, background-position: left -104px; outline: none; } -.v-button:active span, -.v-ie7 .v-button.v-pressed span { +.v-button:active .v-button-caption, +.v-ie7 .v-button.v-pressed .v-button-caption { background-image: url(button/img/button-sprites.png); -background-image: url(button/img/button-sprites-ie6.png); background-position: right -130px; outline: none; } -.v-ie7 .v-button.v-pressed span { - position: relative; -} /* FF3 & FF2 */ .v-button::-moz-focus-inner { border: none; padding: 0; } -.v-ff2 .v-button span { +.v-ff2 .v-button .v-button-caption { display: -moz-inline-box; padding-top: 6px; height: 20px; } /* IE7 */ -.v-ie7 .v-button.v-pressed .v-icon { +.v-ie7 .v-button.v-pressed .v-button-caption { position: relative; +} +.v-ie7 .v-button.v-pressed .v-icon { z-index: 2; } /* Opera */ -.v-op .v-button:active span { +.v-op .v-button:active .v-button-caption { margin-top: -1px; margin-left: -1px; } @@ -1668,26 +1672,28 @@ div > .v-button .v-icon, .v-ff2 .v-button-link .v-icon { margin: 0; } -.v-button .v-icon + span, -.v-button .v-icon + .v-errorindicator + span { +.v-button .v-icon + .v-button-caption, +.v-button .v-icon + .v-errorindicator + .v-button-caption { margin-left: -19px; padding-left: 19px; } -.v-ie7 .v-button .v-icon + span, -.v-ie7 .v-button .v-icon + .v-errorindicator + span { - margin-left: -23px; - padding-left: 23px; -} /* Buttons with error indicator */ div > .v-button .v-errorindicator, .v-ie7 .v-button .v-errorindicator { position: absolute; - display: inline-block; + display: block; width: 9px; height: 16px; background: transparent url(common/icons/error.png) no-repeat 50%; padding: 0; margin: 0; + z-index: 3; +} +.v-ie7 .v-button.v-pressed .v-errorindicator { + display: none; +} +.v-ie7 .v-button .v-icon + .v-errorindicator + .v-button-caption { + margin-left: 0; } .v-ie6 .v-button .v-errorindicator { position: absolute; @@ -1696,15 +1702,28 @@ div > .v-button .v-errorindicator, height: 16px; background: transparent url(common/icons/error-ie6.png) no-repeat 50%; } -.v-ff .v-button, -.v-sa .v-button { - position: relative; -} .v-ff .v-button .v-errorindicator, .v-sa .v-button .v-errorindicator { top: 2px; left: 10px; } +/* Buttons with explicit size */ +.v-button[style*="width"] .v-button-caption { + display: block; +} +.v-button[style*="width"] .v-icon + .v-button-caption, +.v-button[style*="width"] .v-icon + .v-errorindicator + .v-button-caption { + margin-left: 0; +} +.v-button[style*="width"] .v-icon, +.v-ie7 .v-button .v-icon { + position: absolute; + top: 4px; +} +.v-ie7 .v-button > .v-button-caption { + display: block; + margin-left: 0; +} /* Link style buttons */ .v-button.v-button-link, .v-ie7 .v-button-link.v-pressed { @@ -1713,8 +1732,8 @@ div > .v-button .v-errorindicator, padding: 0; cursor: pointer; } -.v-button.v-button-link span, -.v-ie7 .v-button-link.v-pressed span { +.v-button.v-button-link .v-button-caption, +.v-ie7 .v-button-link.v-pressed .v-button-caption { background: transparent; height: auto; padding: 0; @@ -1724,7 +1743,7 @@ div > .v-button .v-errorindicator, font-size: 12px; text-shadow: none; } -.v-button.v-button-link .v-icon + span { +.v-button.v-button-link .v-icon + .v-button-caption { margin: 0; padding: 0; } @@ -1740,8 +1759,8 @@ div > .v-button-primary, -background-image: url(button/img/button-sprites-ie6.png); background-position: left -156px; } -div > .v-button-primary span, -.v-ie7 .v-button-primary span { +div > .v-button-primary .v-button-caption, +.v-ie7 .v-button-primary .v-button-caption { background-image: url(button/img/button-sprites.png); -background-image: url(button/img/button-sprites-ie6.png); background-position: right -182px; @@ -1751,7 +1770,7 @@ div > .v-button-primary span, -background-image: url(button/img/button-sprites-ie6.png); background-position: left -208px; } -.v-button-primary:focus span { +.v-button-primary:focus .v-button-caption { background-image: url(button/img/button-sprites.png); -background-image: url(button/img/button-sprites-ie6.png); background-position: right -234px; @@ -1762,8 +1781,8 @@ div > .v-button-primary span, -background-image: url(button/img/button-sprites-ie6.png); background-position: left -260px; } -.v-button-primary:active span, -.v-ie7 .v-button-primary.v-pressed span { +.v-button-primary:active .v-button-caption, +.v-ie7 .v-button-primary.v-pressed .v-button-caption { background-image: url(button/img/button-sprites.png); -background-image: url(button/img/button-sprites-ie6.png); background-position: right -286px; @@ -1778,8 +1797,8 @@ div > .v-button-small, background-position: left -312px; height: 20px; } -div > .v-button-small span, -.v-ie7 .v-button-small span { +div > .v-button-small .v-button-caption, +.v-ie7 .v-button-small .v-button-caption { background-image: url(button/img/button-sprites.png); -background-image: url(button/img/button-sprites-ie6.png); background-position: right -332px; @@ -1787,11 +1806,11 @@ div > .v-button-small span, padding: 1px 11px 0 5px; font-weight: normal; } -.v-ff2 .v-button-small span { +.v-ff2 .v-button-small .v-button-caption { height: 17px; padding-top: 3px; } -.v-sa .v-button-small span { +.v-sa .v-button-small .v-button-caption { height: 18px; padding-top: 2px; } @@ -1800,7 +1819,7 @@ div > .v-button-small span, -background-image: url(button/img/button-sprites-ie6.png); background-position: left -352px; } -.v-button-small:focus span { +.v-button-small:focus .v-button-caption { background-image: url(button/img/button-sprites.png); -background-image: url(button/img/button-sprites-ie6.png); background-position: right -372px; @@ -1811,8 +1830,8 @@ div > .v-button-small span, -background-image: url(button/img/button-sprites-ie6.png); background-position: left -392px; } -.v-button-small:active span, -.v-ie7 .v-button-small.v-pressed span { +.v-button-small:active .v-button-caption, +.v-ie7 .v-button-small.v-pressed .v-button-caption { background-image: url(button/img/button-sprites.png); -background-image: url(button/img/button-sprites-ie6.png); background-position: right -412px; diff --git a/src/com/vaadin/terminal/gwt/client/ui/VButton.java b/src/com/vaadin/terminal/gwt/client/ui/VButton.java index 943bb117ad..27cb4dbc4a 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VButton.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VButton.java @@ -47,6 +47,7 @@ public class VButton extends Button implements Paintable { setStyleName(CLASSNAME); DOM.appendChild(getElement(), captionElement); + captionElement.setPropertyString("className", CLASSNAME + "-caption"); addClickListener(new ClickListener() { public void onClick(Widget sender) { -- 2.39.5