From e14e35cc2cce369bee90445618354cf97af89ac5 Mon Sep 17 00:00:00 2001 From: Jouni Koivuviita Date: Tue, 1 Dec 2009 09:26:09 +0000 Subject: [PATCH] Sampler updates. svn changeset:10117/svn branch:6.2 --- .../sampler/feature-controls-border.png | Bin 0 -> 126 bytes .../themes/sampler/sampler/info-bubble-bg.png | Bin 165 -> 908 bytes .../sampler/sampler/info-bubble-bottom.png | Bin 1187 -> 1382 bytes .../sampler/sampler/info-bubble-top.png | Bin 2913 -> 2901 bytes .../sampler/sampler/new-caption-badge.png | Bin 0 -> 426 bytes .../VAADIN/themes/sampler/sampler/styles.css | 104 ++++++++++-------- 6 files changed, 59 insertions(+), 45 deletions(-) create mode 100644 WebContent/VAADIN/themes/sampler/sampler/feature-controls-border.png create mode 100644 WebContent/VAADIN/themes/sampler/sampler/new-caption-badge.png diff --git a/WebContent/VAADIN/themes/sampler/sampler/feature-controls-border.png b/WebContent/VAADIN/themes/sampler/sampler/feature-controls-border.png new file mode 100644 index 0000000000000000000000000000000000000000..bc2e99ab6539438895d8c4dc3cc00a806506cfae GIT binary patch literal 126 zcmeAS@N?(olHy`uVBq!ia0vp^j6lr9!3-qV#k+|DDajJoh?3y^w370~qErUQl>DSr z1<%~X^wgl##FWaylc_d9MQi~+A+84w9sd3Mx4Ous-#`&QPZ!6Kid#tu2?;D51`G_W V3{34!_v?T%44$rjF6*2UngE;zBLe^c literal 0 HcmV?d00001 diff --git a/WebContent/VAADIN/themes/sampler/sampler/info-bubble-bg.png b/WebContent/VAADIN/themes/sampler/sampler/info-bubble-bg.png index ef8a116e38ab838c1c98cfc0220226f468e4a423..eb47d3bc9988c5924cbe6aeb40b9f30d40665449 100644 GIT binary patch delta 857 zcmV-f1E&0?0gMMBiBL{Q4GJ0x0000DNk~Le0003$000012m=5B0H1$Z@R1=W0s{b% zN*{j-2?+`c3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C z85tTH8XFrM92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{ zDl021EG#T7EiEoCE-x=HFfcGNF)=bSGBbZOGc+_bH8nLhHa0gmH#j&rIXO8xIyyT$ zJ3Kr*Jv}`>K0ZG`KR`f0K|w)6LPA4BLqtSGMMXtMMn*?RM@UFWNl8gcN=i#hOH52m zO-)TsPEJoxPf$=$QBhG+Qc_b>Q&dz`RaI41R#sP6S6EnBSy@?HT3TCMTU=aRU0r`& zUS3{bUteHgU}0flVq#)rV`F4wWMyS#W@ct*XJ=?=XlZF_YHDh0Yin$5Y;A3AZfQa&mHWb8~cbbai!gc6N4mcXxPrczJnwdU|?$dwYC*e0_a=etv#`e}900 zfPsO5f`WpBgM);GgoTBLhK7cRhlhWNh=_@aiHeGfi;IhljEs$qjgF3vkB^U#kdTp) zk&=>Cc=sHmx_sj8}~tE;Q5tgNlAt*)-FudlDLu&}YQv9f=%va_?Z zw6wIfwY9dkwzs#pxVX5vxw*Q!y1To(yu7@dCU$jHda$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4 z*4Nk9*x1lq(=H}<; z=jiC@>FMd}>gwz3>+J08?d|RE?(XmJ@9^;O@$vEU^78ZZ^Yrxe_4W1k_V)Mp_xSku z`T6ERN@z`$4tWHWLw14((FyvGw2)tMNiCwj@-9PvHL z1Qb;8ba4!+xRsQ^&J>m=re@~G))(mDec-@}V@D31;Sxw-kk8__pEqIVVW3(DPgg&e IbxsLQ03pyErT_o{ diff --git a/WebContent/VAADIN/themes/sampler/sampler/info-bubble-bottom.png b/WebContent/VAADIN/themes/sampler/sampler/info-bubble-bottom.png index f15888ec0e3024b00ee4f6c8d6b323094d6c4fb2..93475676a39f10f2e2fea60c53947c6ad7513ab5 100644 GIT binary patch delta 682 zcmV;b0#*H^3FZnRiBL{Q4GJ0x0000DNk~Le0003$0000S2m=5B03bI=wUHqw0s{cC zN&^7{|NsB9PytE-f5gPZ#l^+O#>U6T$H>UY$;rve%F4^j%goHo&CSiu&d$%z&(P4& z(b3V;($dq@)6~?|)z#J3*4Ee8*Vx$D+1c6J+S=RO+uYpT-QC^Z-rnEe-{9cj;o;%p z;^O1ulq(=H}<;=jiC@>FMd}>gwz3>+J08?d|REIqvT7@9*&N@bU5S^78WY z^Yird^!4@i_V)Jo_xJet`1$$y`uh6&`}_R-{Qdp?{{H^||Nl0t8s?Lp0%d=iNklZSOAuT*1i26t%$1lqy*1jd)UiQbB2L^J|W3A!qj*zIDwx1>~XKd7$4i@T(_zQn@s(7Ma2&R2e zcD9tXy`Q0AVZwH)Osg64dY_@=dA*@#D?@eJiGUTu_Onb~#=>mW@45Xhstuira{1l8 z{%9s(SvRe{pP|WkiKb(2$PS>>y$!kX6fLo=83#WCs4J4V63~L@`8jkv;62 zN&^7{9w8&MPytE-49P|s00000R&-KMQPLps02a~S@2!D%7L_t(|+U(W^a)VG1 zfMMi4oCtwHgb;UkuX|&J-v25kA(>tP+L_M&NBCxEcZs8$z1!@!&fyCRvV*hTZ+12T z;vf#<5Qu{~1mYkLfjEeRI0WMVOPmDpUlAuk{13%>X9y^PHgxzOafTEl_q{x*1X%v| zF(Q%-I*TJ5Eq`Ro(-^P>SZrE;eu!dEoC*tRWjqQ^z$LIIq0v}L3t`F==h&3luT?@Z zSS-PG7YkKteKW;!o;aP;tqk97wqD*3P!RQ=TFow>v2=+(ixV~@s78D-dv%~-dYdic zhAJ>N;fW(Ikrb=(c5yIo)ITAAt2gF@Vmn?HlL-!8#D8fSvun}dJF8_$(>@?S)3nlZ z)!_|s&0?AM#E%3eVK%8|OeGuPw~)W_k*s27)Fg`~_ikRqX(ZujrN5UO*JI94FvxEGO!C@{ZBX5Ua s#ZTt$pd(YrhWrmv?s#8r=C=R?0Q-B@5Y8*t5dZ)H07*qoM6N<$g1DE@bpQYW diff --git a/WebContent/VAADIN/themes/sampler/sampler/info-bubble-top.png b/WebContent/VAADIN/themes/sampler/sampler/info-bubble-top.png index bf6ab842a9846874f132162239b313d098fa767b..9b43901497af2dad7997d18d8d09f58194dfc173 100644 GIT binary patch delta 2107 zcmYjTc|6qX8Yj2xTSCV+S92^UF-n?bm@FqTvPMG4c0`%m!qDXROR_|VRGRL|(jvo^ zWzcznSjO`JDUt+<)Hp{XEa}{XWn4d6&=2G8i{7zZT%< zrKx75rl6pp>3!HUNI^jn3$Fz#O7N(WxyOrQzE=rc^7eE)n(>)4K@2;ZW;Vb_CXVet zc*P#MZBF5k=B(0SMvc`!dX(>~4s<73s{|gxwR0OgQr83@(g-#k^n{7itx^}%_G_v+ zhC24BQfhtTAFG}gp9@HZRvnk#{-imoL4;&%%qdLO8k0$jdb@yGFmc0#ySZhL&9yv? zTQ~{?7NSd~KJ&$Y->(w_W-pDC@BmjY|+(H~7Q>M*lsV z&e8kP4P$!tUoQ+6-V&Dj3?5)iUmiGa!wyJ4_I`eJAH!{Y0HX=Gs3D8HqaIFw!Fy1QDmD}{8W3)Kr;&UZBJoH57&`V(G( zwdq13Y$4u0dyZoLG5AXueZ{G7y2s|>^#nG_`&vKcRc&5w2~uRR&-16a5;2{jD7a^j zprEs%O{pCLhv|$27SObV`ZKKs2~gvz7YJ7bGrOwqunnDSLaiTs>l6sw&t1-cCI`4a6_OMWK?(4 za}a-9Fr!%gY1wAhSAVlbkJ`}9FpBN+5aS?AI2Br&R4NPar?LPPl4@r`qsFFa({N?V zKirc~xb9yx^q>}!P8Wg3mtF{F^x=jPRM#B?ow@I&y-=lRaw$`uB=w`Cvi`{-W5np7 z`ba^<9lIwrA5tEzA&ep$F&SIxLgb4NWbdhNSnxzCn~cfWRA;fSKfa!8G!$KNX8(ob zF!A2%(B6c64f;61LJnbzq3^}-3taMD7hCf_ySh#_<9$G{zr{Ai4Y}t02Bn|0D7!Pe zn^T10l8^R9-uxXp_u=YV-K$F_Cu8Eb222j)3QdxDY_wW$EfUC#VNFK2Ap(lyz=%5i z)g{+%dE46BV7o-WCE9mBY;Xlp;4+9mo#@+Ir34JjwiYJu+$FyY0qz_Nr!7Ea};6&9J*<3SZh0Pvsno`$=d9waKQ9J#0(0Nk!=^_c-KA$y{wn#`;ycv%V9un6UVP44Q)=1&@fD|omR z)T6ZR&@*9&E`{(BuS0cY97sEef!ZMOi?T1Z2A_+7{A!tplFOLXY-rhoQ_9>z0?Rn) zk5%V%;q-Psd~L317}u^$A>CHS+Cm1w%46lXl&dXA4st9WYu)AeI;&tCpwv7Bi8r#`lnk%9i%)$csKYgq-siBV9L7}#xKo70o{r($6aJElYP zXH8hqdY@zeE;^m>0gYzEVx7!^F*pUneXurrae6ax^w8Gc~v#Q(;3*O4*Vgh zP=5Dl)9s&vRSsyTF?T78$XvM}d|V;FYy<@QSz-q+^i?VWyqsuIK-7UTBeMA& zq8S*wilk}7WvwYfdqq;kKiRb5xT<}Cv_>#09Z7B@rr<{lMDP+9* z>KObId$lol)y9BU?^eR$E!p7fUO7fH)Fr+YGjb<$sy+ey2_z`GNJj+hFC36JV>wMs z4nF>#9O(N`IZrlsW|KNm^1M`y=5mIAUWa(mJRZDaW^J-6kc%B+QI|m8tg3YB5kf?s zlZRh-hZqGf#Zl9=02Y4<^KPs}gf^y346ki)8(znGhzNSIO(dCOE|Q}yb?%m?d}R?X zcUAoWizk=nekfUI2|Kp@PoVQR62UYUwILM&&A|7?GInFlT%kAV0h7!@_8Oeu@eNAf z+T{%`8p5TY&h_{**$?fuj6SA;q2>Xl2n<$!LC!j3sqk`6N0Z5aL!D0u(s K=h^5UbLGD~w`v9e delta 2119 zcmYM0c~leU8pb1t&>$sY30n;NqEHc02oQ)YmL*7#MRpLWG!Y>L68tSVp158p0jgbI<)}<~iSa-sk&0@BA|pxHmX`mamVy z5?ULLLZOsAJ>2|Is4a9ve^QV|p2cXnfDZkAvcQ_Bn{z0aTfD46M!*I}Tw$+2J z`dE{eEfzMQtXIz5PE8oa(#(5)G@7ZBcrc@-`sFRrAC0}jS8<8mlP@Cfe;rjUVX2?f zz%1LJiti7M&u;js345uFYd7`oOpJW;AlWgyw$EYtt8`tmYRCH=xfOm?R8+*>eMO!A zHU+SI5|oaUE{c8*?Qg89s0eOIH#V;EYnxcOI4al6t>nh0y(3t(5${*OI4_{cIEEf( z?3p_B_WCSAO@kdiQBy#9J!+eL5MT9K7;)!Uf002-U8L8k*eoBdv@g1@;q!~dH%TEr z9g+XJwsd{b_oY?@W8mJJC9^&#B?70>iPH=< zA3YE~+IMfFU5~Oo=~Y;g*ZX}`XKs~)s`q?kudfH|;{i_FxWpW+x;GxAdXnu7KS##^ z-Z#G(BPZ5FJxu{>+B@ktETj~0W|GR+H1{A?t5D`RR)@lBowaBPY8p*3QNUKf> z>Z{sCxeVSkQ)c7}M4ujgbK}@rZf zNVE>>1`tT40#V&zXP5}wir{9LLt;^56Snp*Uwqh z+@s)v2$Jp1VU0!u=Kj;v;ZIvuOdbikEm)Jn?4A-j)!{=3G4 z8IagoM`JX8I%?$CedCMc`B$O5W$FmI8eA=DW?C0InK5$h0bA3llV|8bYS8U?I4zGh zW*2RFsr;Q)cqt*vbcfaDV}@|w_BVe9q}C1ZA=%5Ban&2#lx;K7)dd}b2w0}QJ&6>K zH^a_|PsCB@>ZaOZg#^i6S5Ed1aL-azg?J4^s}Mh3>T#mWgNB9!rExoVJ5rzw3~gu0 z8ybZjmJe8|v3T-y20Xd;H;X4kBWleU4iiZCuGui%59Cz$Ch#mGX;lnO2#X<;X8q)0 zCY$H7qdhaDdqIE9qBVI|bQh2L-rvFE^$ARAu6SSDad!YV#nRUKYc8Z?PgZCm(5zWHTa8!I3_+yqfgwb7rhMUeXrVguY*g(Z# z>3zx9A7Cr#&sv+=#rrlYo#1m9lMTlF(0Z*Lar(lM^QphJuUx#u?7X-V&E{%#>$P4L z?_yfB+t5WkuP2ZO!pN{PliJ3e>a>=Q@bTB$FQ>v@eVtjSYQ@zU8h`_=-6TrL01vCS zA#coX%O`eh8_#M4}!e&#Jrv(5YSjMAv$e$0uNU4hmHIDT0RB?aGSxH-nX#6 zsr1O$6#z@KOP1pU-igA)z1Alb5ns2F==N;K4kV1a$pY?y$@*i1pl@?|~Z=tpGEcS!7%OLz?Yb#onL za6gWml)Z%>>p%cZq*-7{rFcIw9i@nkQbwj%^`T^>pacm|L%vOvhJmysQ4xCjmk(2H zjQA`IGxPbD1#1PK%AGy1xevJ(cXgh?s&Jn@iHcVQh*u?QdW`-+i5Sk|PGHt;QbZ0dnPIKAH1xoSxHr5a1AX4oDW6)&PQ3BMt#)P&)GHc-A!0ri5cS$)PU% z3g}vOIpxgB4L=;L8i=WIk$Aa7r@^X7g_)jfh*h@Fj+aYR6cWL#M?;3YOE~epuuXlL zSP2Y)P{LilZ`A)Bn2F-r417zsd9X(G4W_6SJGk0NHKBxDj%>mH1iX%}j7~DJXv(-C z%^hG9b$+i^H7mzOmHdx#8dP-3Bbw)Ku0YRe8l2MmcawMdz4|2_<^Ax6-q`a;;P}}= zZ3H@IPC;jQ2)l`oME_s8|5GVuZu8YnPryh2qY(Qvad4=Ej$gsrO3$KXQRTxvgt3ga S8RXvp<$2J@t<~k|x&H!y0S=A; diff --git a/WebContent/VAADIN/themes/sampler/sampler/new-caption-badge.png b/WebContent/VAADIN/themes/sampler/sampler/new-caption-badge.png new file mode 100644 index 0000000000000000000000000000000000000000..4fc9d378e8084387201fdb06b59dd3b76550b268 GIT binary patch literal 426 zcmV;b0agBqP)uw(=GI|U+mVUfoR;Ct%h+sT)JQtnd2ipqz1Lw>+>wddcyHaPqvOxa)JQqtwzA!w zme_4#*@S!Ag?!@J*xt0T;I*;l=I7(%eJ8tRSX_DZ9xc~pR(4Gt=2XGJ{NeCimU?=zq`2d9f zfX5jQscX@?3@%0GDlizC;M(hmqlBV#c znPJo;3Zv$Ir)=_^Rv`vrg_`BKkFBM-)#OEC1)LPH)xC21C5EZDNVo15ude_D05>KT UE#rORN&o-=07*qoM6N<$f?B88=>Px# literal 0 HcmV?d00001 diff --git a/WebContent/VAADIN/themes/sampler/sampler/styles.css b/WebContent/VAADIN/themes/sampler/sampler/styles.css index 03499a2839..5f01c067ba 100644 --- a/WebContent/VAADIN/themes/sampler/sampler/styles.css +++ b/WebContent/VAADIN/themes/sampler/sampler/styles.css @@ -547,16 +547,20 @@ } .v-app-SamplerApplication .v-panel-content-light { - border-top: 0px; + border-top: none; } -.v-app-SamplerApplication .v-horizontallayout-sample-view .v-horizontallayout-margin-top { - padding-top: 27px; -} -.v-app-SamplerApplication .v-horizontallayout-sample-view .v-horizontallayout-margin-bottom { - padding-bottom: 24px; + + + + +/* Feature controls: title, reset, view source */ + +.v-app-SamplerApplication .feature-controls { + background: transparent url(feature-controls-border.png) repeat-x 0 41px; + padding-bottom: 10px; } -.v-app-SamplerApplication .v-caption-feature-controls { +.v-app-SamplerApplication .feature-controls .v-label { font-family: "Helvetica Neue", helvetica, arial, sans-serif; font-weight: bold; font-size: 24px; @@ -564,6 +568,49 @@ color: #1e2229; letter-spacing: -0.015em; text-shadow: 0 2px 1px #c0c1c2; + padding: 7px 0 8px; +} +.v-app-SamplerApplication .feature-controls .new { + padding-right: 30px; + background: transparent url(new-caption-badge.png) no-repeat right 4px; +} +.feature-controls .v-link-showcode, +.feature-controls .v-nativebutton-reset { + padding-top: 18px; + display: block; + margin: 0 0 0 10px; +} +.feature-controls .v-link-showcode a span, +.feature-controls .v-link-showcode a:link span, +.feature-controls .v-link-showcode a:visited span, +.feature-controls .v-link-showcode a:hover span, +.feature-controls .v-nativebutton-reset, +.feature-controls .v-nativebutton-reset .v-nativebutton-caption { + text-decoration: none; + font-size: 12px; + color: #2667b4; +} +.feature-controls .v-link-showcode a, +.feature-controls .v-nativebutton-reset { + font-family: arial, helvetica, verdana, sans-serif; +} +.v-sa .feature-controls .v-link-showcode a, +.v-sa .feature-controls .v-nativebutton-reset { + font-family: helvetica, arial, verdana, sans-serif; +} +.feature-controls .v-nativebutton-reset:focus { + outline: none; +} + + + + + +.v-app-SamplerApplication .v-horizontallayout-sample-view .v-horizontallayout-margin-top { + padding-top: 27px; +} +.v-app-SamplerApplication .v-horizontallayout-sample-view .v-horizontallayout-margin-bottom { + padding-bottom: 24px; } .v-app-SamplerApplication .feature-info { background: #1e2123 url(info-bubble-bg.png) repeat-y; @@ -658,7 +705,7 @@ } .v-app-SamplerApplication .feature-info .description div.outer-deco { margin: 0 5px 0 9px; - width: 353px; + width: 303px; } .v-app-SamplerApplication .feature-info .description div.deco { padding: 0 19px 13px 19px; @@ -687,7 +734,7 @@ border: 1px solid #336391; border-top-color: #161719; border-bottom-color: #2e5b92; - width: 353px; + width: 303px; } .v-ie6 .v-app-SamplerApplication .feature-info .sample-description div.outer-deco { border-top: none; @@ -715,42 +762,9 @@ left: -26px; } -.v-app-SamplerApplication .v-link-showcode { - margin-left: 3px; -} -.v-app-SamplerApplication .v-link-showcode a { - text-decoration: none; -} -.v-app-SamplerApplication div > .v-nativebutton-showcode, -.v-app-SamplerApplication div > .v-nativebutton-showcode:active, -.v-app-SamplerApplication div > .v-nativebutton-showcode:focus, -.v-app-SamplerApplication .v-link-showcode { - font-family: arial, helvetica, verdana, sans-serif; - display: inline; - font-size: 12px; - line-height: 20px; - height: 20px; - margin-right: 3px; -} -.v-sa .v-app-SamplerApplication .v-nativebutton-showcode, -.v-sa .v-app-SamplerApplication .v-link-showcode { - font-family: helvetica, arial, verdana, sans-serif; -} -.v-app-SamplerApplication div > .v-nativebutton-showcode.v-nativebutton-link span, -.v-app-SamplerApplication .v-link-showcode span { - color: #8b8e91; - text-decoration: none; -} -.v-app-SamplerApplication div > .v-nativebutton-showcode:hover span, -.v-app-SamplerApplication div > .v-nativebutton-showcode:active span, -.v-app-SamplerApplication .v-link-showcode:hover span { - color: #62696f; - text-decoration: underline; -} -.v-app-SamplerApplication .v-panel-content-source { - border: 1px solid #eee; - background: #fff; -} + + + .v-app .v-customcomponent-ModeSwitch button.v-nativebutton { height: 24px; -- 2.39.5