From 371ab070a466e2d60ca32105a4506e350160152e Mon Sep 17 00:00:00 2001 From: Jouni Koivuviita Date: Mon, 25 May 2009 11:19:59 +0000 Subject: [PATCH] Black window style for Reindeer theme. Multiple other fixes to Reindeer theme. Some fixes to base and Runo themes involving window styles. svn changeset:7988/svn branch:6.0 --- WebContent/VAADIN/themes/base/styles.css | 14 ++ .../VAADIN/themes/base/window/window.css | 14 ++ .../a-sprite-definitions.css | 4 +- .../VAADIN/themes/reindeer/common/common.css | 7 + .../common/img/black-vertical-sprites-ie6.png | Bin 2664 -> 2707 bytes .../common/img/black-vertical-sprites.png | Bin 5838 -> 6694 bytes .../themes/reindeer/datefield/datefield.css | 18 +-- .../VAADIN/themes/reindeer/label/label.css | 3 + .../themes/reindeer/layouts/layouts.css | 2 - .../VAADIN/themes/reindeer/select/select.css | 1 + WebContent/VAADIN/themes/reindeer/styles.css | 140 ++++++++++++++++-- .../themes/reindeer/textfield/textfield.css | 1 + .../window/img/black/content-bg-ie6.png | Bin 0 -> 254 bytes .../reindeer/window/img/black/content-bg.png | Bin 0 -> 176 bytes .../window/img/black/header-bg-ie6.png | Bin 0 -> 241 bytes .../reindeer/window/img/black/header-bg.png | Bin 0 -> 161 bytes .../reindeer/window/img/black/resize-ie6.png | Bin 0 -> 213 bytes .../reindeer/window/img/black/resize.png | Bin 0 -> 214 bytes .../VAADIN/themes/reindeer/window/window.css | 86 ++++++++++- WebContent/VAADIN/themes/runo/styles.css | 21 ++- .../VAADIN/themes/runo/window/window.css | 7 +- .../VAADIN/themes/sampler/sampler/styles.css | 3 + 22 files changed, 287 insertions(+), 34 deletions(-) create mode 100644 WebContent/VAADIN/themes/reindeer/window/img/black/content-bg-ie6.png create mode 100644 WebContent/VAADIN/themes/reindeer/window/img/black/content-bg.png create mode 100644 WebContent/VAADIN/themes/reindeer/window/img/black/header-bg-ie6.png create mode 100644 WebContent/VAADIN/themes/reindeer/window/img/black/header-bg.png create mode 100644 WebContent/VAADIN/themes/reindeer/window/img/black/resize-ie6.png create mode 100644 WebContent/VAADIN/themes/reindeer/window/img/black/resize.png diff --git a/WebContent/VAADIN/themes/base/styles.css b/WebContent/VAADIN/themes/base/styles.css index f034ea5801..5c17113141 100644 --- a/WebContent/VAADIN/themes/base/styles.css +++ b/WebContent/VAADIN/themes/base/styles.css @@ -1444,6 +1444,7 @@ div.v-window-header { } .v-window-footer { overflow: hidden; + zoom: 1; } .v-window-resizebox { display: inline; /* fix IE6 double float margin bug */ @@ -1454,6 +1455,19 @@ div.v-window-header { background: #ddd; overflow: hidden; } +/* IE7 fails with the float:right */ +.v-ie7 .v-window-footer { + position: relative; + height: 10px; +} +.v-ie7 .v-window-resizebox { + position: absolute; + float: none; + right: 0; +} +.v-ie7 .v-window-footer-noresize { + height: 0; +} .v-window-resizebox-disabled { cursor: default; display: none; diff --git a/WebContent/VAADIN/themes/base/window/window.css b/WebContent/VAADIN/themes/base/window/window.css index bf14c0a453..5920fe8e86 100644 --- a/WebContent/VAADIN/themes/base/window/window.css +++ b/WebContent/VAADIN/themes/base/window/window.css @@ -34,6 +34,7 @@ div.v-window-header { } .v-window-footer { overflow: hidden; + zoom: 1; } .v-window-resizebox { display: inline; /* fix IE6 double float margin bug */ @@ -44,6 +45,19 @@ div.v-window-header { background: #ddd; overflow: hidden; } +/* IE7 fails with the float:right */ +.v-ie7 .v-window-footer { + position: relative; + height: 10px; +} +.v-ie7 .v-window-resizebox { + position: absolute; + float: none; + right: 0; +} +.v-ie7 .v-window-footer-noresize { + height: 0; +} .v-window-resizebox-disabled { cursor: default; display: none; diff --git a/WebContent/VAADIN/themes/reindeer/a-sprite-definitions/a-sprite-definitions.css b/WebContent/VAADIN/themes/reindeer/a-sprite-definitions/a-sprite-definitions.css index 2b3eeb2a7a..50993b8ad3 100644 --- a/WebContent/VAADIN/themes/reindeer/a-sprite-definitions/a-sprite-definitions.css +++ b/WebContent/VAADIN/themes/reindeer/a-sprite-definitions/a-sprite-definitions.css @@ -4,8 +4,8 @@ /** sprite: verticals; sprite-image: url(../common/img/vertical-sprites.png); sprite-layout: vertical */ /** sprite: horizontals; sprite-image: url(../common/img/horizontal-sprites.png); sprite-layout: horizontal */ -/** sprite: black-verticals; sprite-image: url(../common/img/black-vertical-sprites.png); sprite-layout: vertical */ -/** sprite: black-horizontals; sprite-image: url(../common/img/black-horizontal-sprites.png); sprite-layout: horizontal */ +/** sprite: black-verticals; sprite-image: url(../common/img/black-vertical-sprites.png); sprite-layout: vertical; sprite-matte-color: #0b0e0f */ +/** sprite: black-horizontals; sprite-image: url(../common/img/black-horizontal-sprites.png); sprite-layout: horizontal; sprite-matte-color: #0b0e0f */ /*------------ * Buttons diff --git a/WebContent/VAADIN/themes/reindeer/common/common.css b/WebContent/VAADIN/themes/reindeer/common/common.css index f7e63cd7a0..5ea77f98dc 100644 --- a/WebContent/VAADIN/themes/reindeer/common/common.css +++ b/WebContent/VAADIN/themes/reindeer/common/common.css @@ -51,6 +51,13 @@ .v-Notification { font-family: Helvetica, Arial, "Lucida Grande", Geneva, Tahoma, Verdana, sans-serif; } +/* Fonts on black background */ +.v-app .black, +.v-window-black, +.v-popupview-popup .black { + color: #c9ccce; + text-shadow: #000 0 0 1px; +} .v-errorindicator { width: 13px; height: 16px; diff --git a/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites-ie6.png b/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites-ie6.png index 1f0bc9fdae1c973dc353d77d9b0bbf95fdf052aa..ee9ec13b8e964c7909841424e33ab9e000ae064b 100644 GIT binary patch literal 2707 zcmV;E3T*X>P)D|K}0r4Ryt5&KUHQ#M@dgm zQcqG;S6W;{S!!EgVoP9hU}R=XW_)F6YH)CIZE44ikCB<0nxLVh zrlzK}w6)OC(Kso*RsaA10d!JMQvg8b*k%9#3Cu}EK~#9!?VSsE8z&Qn8DO=t8h@_i zq)pwNp6~zvupYN3cVBebh3T@AR(o@`Gmu)bha((ICwT$`%sapeAUCR&&^w2UoUHMk z_u8mUNv4>rOF>jtBa$h@f1$M^V)XDM^x9JGQvYo+NCq>C~^jlji@#_(y0D!T6yd+vByKvTWl2*u#avHETs3k<(&U1!{RELa-g zRf1%)evJ&!!Nw+#fKgYVsa^Q9t=2foD)YftPYV0mU(t z#Oq$j%u851Ot1| zqco7xUeuWv?{2#cmgldQAp@hO&0fLq?JEsGRe2k%(wsvhgKw*zH`CnMd;iO)O=X!4 zx217kqYqV8J}_f%W17;ee10D?!!BTFqn~@y`lfa%mXtIWDJabO=AflF@ffoWng^nU z^j&VZs{C%u5(-?l|5N8no(7y@&rAtoZ$z++*n40Nk2Yuc-9hW1vCOh`VsGTe-W|t{ z+VChBwyg6GLyzFAXaivOKUmGHtizkCJ|(NA&$Id5R`~&tR69@D!N9%I;i zili(*gp7(6!S6bl{(4_$ZtT4n`*c%Ajw8B^JVq%J#NLdp!V!w2tM$MMAV(5xUUXt_ zp5L{+CC5HRb}di7MnaL6egf;tuH}T46E-DJLJ{xHFAJui9G_WEpiJ1wJW9bSJDEo( zF>cCE=26P~DLa|w*!1ImVU+(CZI>xKnG@P*!cHbk8Pmq4=(|UIop^8Y-p|&1V-m`w zN#xOWpTk~elyxsJHt~9tnXBL9^+-?I%be2EyS>a9B~fbmcf6{#_A(>9w{b~&oy6Wx z?!8SCN+E6Zw6XW`oy-Z82|JlbM)De)xGd#ZpZ{nXi{QMmIiz<^) z(mbasWBTOnlBO){6mCjyQarq6%Wrv-ji~45F_pTEhM4E*F%!7Vupx#gQX`aD>g4T` zq%7Gw0VPu#tD^nxI()k!h1b>dBy9vvMu1R+B2lwgcOoUp_PV(oo3cLJPCb8~X`ioG6@~kLY?D8EcNfxHmAEz@vx=2Ei`H@hB zA{3$gi1VZC)0rI&*6SQHHgWoT1j;bZIfId#i-3F>OW zbUWH%1Q_F7dl;-4c2UZ8#vr8Vb&7T+*&`G~JKy^e3i0sVaf+cGcQ{Tlig1+(d6^#H4Gr=A?OijG%j8RJ-T~f>e0?k zFCVnk56c6Arbqk2Y?QsdJ6M>eM~8E9iqV%qPJ+k2%*UF%KJyP0~ zzQQ0;kBsr1Bkt=N7EzBX%HWv%a0M6b?%dYd^zG6x=0{NX{Msx!Zhn;2j|V+4=SO>r z^K&TG z_1*Cmg0-0?ps39v1*ODU0*Wf9%d z+tUyzd0wi!UT4=SS~^=Lpk#R&Pl5bPg0;gl+BK--ltoUw406QR&3;qL)Kswd+lNs=T<(#uWoItk@01x3!%JAI0@ zkx*WCe>tTZ$!L5j6qDpzOb6WcBEClE*O;&RLIe5B#Zn?6+ZqK(b`?pfA@A;ETj$!$ z|38mAHf0Za6Hz4{s$<{XtlrGO#1tiLh2`5nBqdH}zhtO?b4B!+hIeWe?HMY_4aQO; zAzMm-%w9)QYDnCeu3G2%T35pnV&tHKM2+cCo$TGs`YLivYk(Z8F%2>Xlh4Z2%%^<{ zibP~W5sJ+Cgd!B72t_DD5p5KT^cS(NP=q2Bp$J7NLJ^8kgd!B72t_DD5sFZRB9!k< zF>=DaP=q2Bp$J7NLJ^8kgd(xGP=q2Bp$O&sYJk{9C_;Hw6iF{7{R0BIzl1WUoZJ8a N002ovPDHLkV1jfvFed;2 literal 2664 zcmV-u3YYbXP)!RwOHuC<(ywAyE`bm&66UaTH*PWWQO|BcqQ7K9bjgu<|sRK|*>WZhO3qTnlnq1Kh$I)OBuGy-yF(|crJwRK= zsVgY%{;!hEAoBOzMnj3~BHZ?#G}mQN2zF`@0leGYc6vOz2Qa4y)Rv5rpwY8SfM0epN`l-UC%Vk)gi&tF}OO!UO1+w$Y-A~z@bT(T|S{RgQ| zY>JNmD~dp*Od=;Q*DVp!!Q~2NGEY8r!Qu))S%>QL#=WRQP)17=#N2y?!V2>4DlKOZ zA5c;Y>JZ>vi!V{0w8CU5unXeeBusuCq!F_bbWX4G2k|Nhs$QJ~=d|aqOt@t2s6xDZ zwC?I@Fek$b7`t_M&Ae<`0sM0O&!S!tbGg}g@#GpQ&qjngheTCQqQC#^%a2)hkhLf% zXU8o>7)}>CFXL9a5e?6CdJv0hV#7Y%I(PvXb(y3@%=+J4Dx(BAAHKelN6C&kfrj5- z$j<3JZwqvK0z+YoxW>cQpTI2YqA3mQs;eaFYDK$`ym?sTSK=DhM|*DDY6SHzs7rek zJ9WvnSUAs?_^1c49Q8-Hq~pOg_Csby`f_q5_=B= zEmR14quBc;=W03~pnUVDAZ(UHA?WyxP|nPQ*jwm`z1R6j=pD{MC|3!{!t$aDLHUT5 zLBgWZiR$vD+}K_9h1hE$<_2{NXp6P-L#KmK%R-2PELu&YVZi?50XX(vx(!aEYN_fb)VAeh{oMx7(&m7ECR`Dt!% zh0ml>(8+Y*Z`viKCIa?SR6xM7x69KFBWMQ_dt+B*C)Uw#>an*FAC9DFQ$E2G;>|H| zjcgE7<)IxoP;$AIHkQClC`xXd^f0MneNR%ebn?k%L?iwb~azYQ0k;^ zTcnPB#n^ig1ge7}gk4f7F?ow+s0u?N?*>s_mZo%c7`6U=@ZbBjA-n2Nqah?6dl#Y{ z$Z`y>n(kUZxW7o|o^ym!q6jSOY9&Z_2ccIum<;a`x8q+@Yhw8mv`DrKo?H*>0r67FVFWxosuI(k}E*~zS+0Tp&Ki&lvZV{YS$k{%Sp z-k&t~uJjN}DT-$;bo5c@dR+P@T1HdN^wV;T*y#Jo5GQ$=!W{?>wgV1ecObwJ7Cc zr84h6L3gO^>F~?ri4GJpG2_Lc7?f>7(Xyswyn7RhmM@m0yCX<=PYa64j|_@IF(?M* zbIgwp?@o4!Rjca<@MB2n)iNIpGU2I z$pgs>_@(CElRfx0i()(Vt~`Hd*Xvy305rhp(XHzdrK=uaL{l50N7y0Z&&x(7u#j?y z9uXUHo}47fIkK^|9#L#zE;0`1h|wQp4hSSP3nF;9Wi6*i1o7Mv_gr3&a17$MLOr^U zj)4?dR*zOFKJl!@$K_d)SXz%(@1C6d=c{FBA+1NrXHL!&R|vQs2_LRU7NgmR{i5G@ zkkuoeAqR{ZK##;CO)}vj((-x~`Xw-mtR2e$dSq=xP)3i89{oS{Xd~2w=n=640_SlN zf>=UG>k-A2@{J?zMMxEk`jsR~?wEXt9u=I|Pa*kH*iEr2t@|C8AKB55U;DuPXobRf zsA^0xKSI-Kc&X+`$lv%GGpHVM1wA4~-*y1#QQnPQT93l-AJNod(IRSztR97ZvH7@m zXrlM%7kOqddURWQl-WOW?47@>>k*|^yDN=TphtFn?<;jZ;{FtU_f{1p$dcyndvz4F zSUmef9R+cFAjb@aWq$n^9jiFLmi4-s4?@YV*D;7i+4VZPuM^$0UPoa3l3A~lduaN` z^*UEaPitAPb398O1-IHgMScm&&col4a$9!pOFmdoV7}ApdWw2v*^N%)Z_;{{**|hf zO&Y`K(e3I{VSY5Zbfw!;kRQqGQDJ^0tw%TmA~=!PqZ{%gUrT-j)1zE|#2_fy{0OE; z+58BoN16Nxsz;gpNKTJ#Ge45lqvHGsq(?NHAIa)bVSZ%vNS7XAWQr-Km|}`43gv&J W!=D@pNF>bw0000z; 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 BvMB%n literal 5838 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 .v-button.v-button-link:active .v-button-caption, .v-Notification { font-family: Helvetica, Arial, "Lucida Grande", Geneva, Tahoma, Verdana, sans-serif; } +/* Fonts on black background */ +.v-app .black, +.v-window-black, +.v-popupview-popup .black { + color: #c9ccce; + text-shadow: #000 0 0 1px; +} .v-errorindicator { width: 13px; height: 16px; @@ -2254,6 +2275,11 @@ span.v-datefield-calendarpanel-month { .v-datefield-full .v-datefield-calendarpanel-month { width: 124px; } +.v-datefield-month, +.v-datefield-day, +.v-datefield-full { + min-width: 240px; +} .v-datefield-year .v-datefield-calendarpanel { width: 100px; } @@ -2524,7 +2550,10 @@ td.v-datefield-calendarpanel-nextyear { .black span.v-datefield-calendarpanel-month { border-left: 1px solid #333638; border-right: 1px solid #232527; + color: #c9ccce; text-shadow: #000 0 -1px 0; + padding: 4px 10px 1px 10px; + margin-top: 0; } .black .v-datefield-calendarpanel-prevyear button, .black .v-datefield-calendarpanel-nextyear button, @@ -2608,16 +2637,6 @@ td.v-datefield-calendarpanel-nextyear { -background-image: url(common/img/black-vertical-sprites-ie6.png); background-position: right -294px; } -/* IE fails to position backgrounds inside table element */ -.v-ie .black .v-datefield-calendarpanel-weekdays td { - background: url(datefield/img/weekday-bg-black.png) repeat-x; -} -.v-ie .black .v-datefield-calendarpanel .v-first { - background: url(datefield/img/weekday-first-black.png) no-repeat; -} -.v-ie .black .v-datefield-calendarpanel .v-last { - background: url(datefield/img/weekday-last-black.png) no-repeat right top; -} /* ./WebContent/VAADIN/themes/reindeer/formlayout/formlayout.css */ .v-formlayout-cell .v-errorindicator { @@ -2714,6 +2733,9 @@ td.v-datefield-calendarpanel-nextyear { color: #fff; text-shadow: rgba(0,0,0,.8) 0 2px 2px; } +.black .v-label-light { + color: #72787c; +} /* ./WebContent/VAADIN/themes/reindeer/layouts/layouts.css */ .v-orderedlayout-margin-top, @@ -2753,8 +2775,6 @@ td.v-datefield-calendarpanel-nextyear { .v-horizontallayout-black, .v-orderedlayout-black { background: #16181a url(layouts/img/black-bg.png) repeat-x; - color: #c9ccce; - text-shadow: #000 0 0 1px; } /* ./WebContent/VAADIN/themes/reindeer/notification/notification.css */ @@ -3057,6 +3077,7 @@ td.v-datefield-calendarpanel-nextyear { } .v-app .black .v-filterselect-input, .v-window .black .v-filterselect-input, +.v-window-black .v-filterselect-input, .v-popupview-popup .black .v-filterselect-input { color: #c9ccce; background-image: url(common/img/black-vertical-sprites.png); @@ -3612,6 +3633,7 @@ input.v-textfield-prompt { text-shadow: #000 0 0 1px; } .v-app .black .v-textfield-focus, +.v-window-black .v-textfield-focus, .v-window .black .v-textfield-focus, .v-popupview-popup .black .v-textfield-focus { border-color: #4e6a80; @@ -3708,6 +3730,13 @@ input.v-textfield-readonly, .v-window-wrap { border: 1px solid #808386; } +/* IE6 needs border on the outer element */ +.v-ie6 .v-window { + border: 1px solid #808386; +} +.v-ie6 .v-window-wrap { + border: none; +} .v-sa .v-window-wrap, .v-ff3 .v-window-wrap, .v-op .v-window-wrap { @@ -3746,8 +3775,11 @@ input.v-textfield-readonly, -background-image: url(common/img/vertical-sprites-ie6.png); background-position: left -1257px; } -.v-ie6 .v-window-footer { - zoom: 1; +.v-ie7 .v-window-footer { + height: 15px; +} +.v-ie7 .v-window-footer-noresize { + height: 0; } .v-window-closebox { top: 12px; @@ -3775,3 +3807,83 @@ input.v-textfield-readonly, .v-window-modalitycurtain { background: #56595b; } + + + + + +/** + Black window ----------------------------- +**/ + +.v-window-black .v-window-wrap { + border-color: #2e3030; + border-radius: 8px; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; + overflow: hidden; +} +.v-sa .v-window-black .v-window-wrap, +.v-ff3 .v-window-black .v-window-wrap, +.v-op .v-window-black .v-window-wrap { + border-color: rgba(0,0,0,.9); +} +.v-window-black .v-window-wrap2 { + background-color: #0b0e0f; + -moz-border-radius: 8px; +} +.v-sa .v-window-black .v-window-wrap2, +.v-ff3 .v-window-black .v-window-wrap2, +.v-op .v-window-black .v-window-wrap2 { + background-color: rgba(11,14,15,.9); +} +.v-window-black .v-window-outerheader { + height: auto; + padding: 0; + background: transparent; +} +.v-window-black .v-window-header { + height: auto; + padding: 7px 0 7px 0; + height: 15px; + font-size: 12px; + font-weight: normal; + color: #dddfe1; + background: transparent repeat-x; + background-image: url(common/img/black-vertical-sprites.png); + -background-image: url(common/img/black-vertical-sprites-ie6.png); + background-position: left -549px; + text-align: center; + -moz-border-radius-topright: 8px; + -moz-border-radius-topleft: 8px; +} +.v-window-black .v-window-closebox { + top: 8px; +} +.v-window-black .v-window-footer { + background: transparent; +} +.v-window-black .v-window-resizebox { + background: transparent no-repeat; + background-image: url(common/img/black-vertical-sprites.png); + -background-image: url(common/img/black-vertical-sprites-ie6.png); + background-position: left -578px; + width: 14px; + height: 14px; +} +.v-ie6 .v-window-black .v-window-resizebox { + background-image: url(common/img/black-vertical-sprites.png); + -background-image: url(common/img/black-vertical-sprites-ie6.png); + background-position: left -592px; +} +.v-ie6 .v-window-black .v-window-contents { + background: transparent url(window/img/black/content-bg-ie6.png) repeat-x; +} + +/* Must be last to make this image last in the sprites */ +.v-window-black .v-window-contents { + background: transparent repeat-x; + background-image: url(common/img/black-vertical-sprites.png); + -background-image: url(common/img/black-vertical-sprites-ie6.png); + background-position: left -606px; +} diff --git a/WebContent/VAADIN/themes/reindeer/textfield/textfield.css b/WebContent/VAADIN/themes/reindeer/textfield/textfield.css index d9233ebd11..06e1055053 100644 --- a/WebContent/VAADIN/themes/reindeer/textfield/textfield.css +++ b/WebContent/VAADIN/themes/reindeer/textfield/textfield.css @@ -82,6 +82,7 @@ input.v-textfield-prompt { text-shadow: #000 0 0 1px; } .v-app .black .v-textfield-focus, +.v-window-black .v-textfield-focus, .v-window .black .v-textfield-focus, .v-popupview-popup .black .v-textfield-focus { border-color: #4e6a80; diff --git a/WebContent/VAADIN/themes/reindeer/window/img/black/content-bg-ie6.png b/WebContent/VAADIN/themes/reindeer/window/img/black/content-bg-ie6.png new file mode 100644 index 0000000000000000000000000000000000000000..39e712127ebea2c4123fc4ebc7f940bf9d01de4a GIT binary patch literal 254 zcmeAS@N?(olHy`uVBq!ia0vp^j6nR0gBeJM&%2ulq$EpRBT9nv(@M${i&7aJQ}UBi z6+Ckj(^G>|6H_V+Po~-c75N4Dgt$t}$%}}K%PA@eiHeCyN=Zn|NXg2Hic2V|s%h%z z$}1_$$SX+7$O?;z3kZvdNl3~nD2hu-3yO&H3kfSIt0=0d@(Bv@3JCJ>3vl!CKTF;> z8ECSbr;B4q#jPy|Pm4Jyh&Wt)BD(O&)c^kjg(p{EOTBh4&EQ?FM)}hYG3BZyesea6 xhUXk<*c|6H_V+Po~-c6$N>^IEGZ*T65&MV1oeMuu+7;^Rr9ki}p|1Q_g9? ZaNvLK)5zbJfk4w4JYD@<);T3K0RTODK_>tJ literal 0 HcmV?d00001 diff --git a/WebContent/VAADIN/themes/reindeer/window/img/black/header-bg-ie6.png b/WebContent/VAADIN/themes/reindeer/window/img/black/header-bg-ie6.png new file mode 100644 index 0000000000000000000000000000000000000000..c86b4b7bcd17c9cde17e04158d741e10a179424b GIT binary patch literal 241 zcmeAS@N?(olHy`uVBq!ia0vp^j6f{Q!3-p0?thC0Qj#UE5hcO-X(i=}MX3yqDfvmM z3ZA)%>8U}fi7AzZCsS>Jib4W>LR|F?jpY=TwDt5ARa7-~^mOzLl+`r!42_gj)g@)* z)HJnq4UFWKl(lsArDWx0gTe~DWM4fOrbz3 literal 0 HcmV?d00001 diff --git a/WebContent/VAADIN/themes/reindeer/window/img/black/header-bg.png b/WebContent/VAADIN/themes/reindeer/window/img/black/header-bg.png new file mode 100644 index 0000000000000000000000000000000000000000..a956a6b27d216ef454019b297a095b4fa30c3cd6 GIT binary patch literal 161 zcmeAS@N?(olHy`uVBq!ia0vp^j6f{Q!3HF=8QC&{lw^r(L`iUdT1k0gQ7VIDN`6wR zf@f}GdTLN=VoGJ<$y6JlB4F!NoP)-jz6cPrkHy0$cOjx%$M!k{yRL9pU_b7 zznOEx4f_==Q(F6f^anE~$uV!*^FVdQ I&MBb@0GmZL`2YX_ literal 0 HcmV?d00001 diff --git a/WebContent/VAADIN/themes/reindeer/window/img/black/resize-ie6.png b/WebContent/VAADIN/themes/reindeer/window/img/black/resize-ie6.png new file mode 100644 index 0000000000000000000000000000000000000000..ca9f912af588f5c0abc2499b129d4a4913ba8efe GIT binary patch literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^+(695!3-or^+GlRDajJoh?3y^w370~qErUQl>DSr z1<%~X^wgl##FWaylc_d9MY;h#A+CZVqKYc2>DjqqQPIL;;)Nw;0>UEZR@Q-`Va@HG zDH&N>dirUZ*?fXR+R%pgzxgxc~-5v=zKmx zNRIpC${%;qve#_dGvoD_r$6GX7}qYH$ literal 0 HcmV?d00001 diff --git a/WebContent/VAADIN/themes/reindeer/window/img/black/resize.png b/WebContent/VAADIN/themes/reindeer/window/img/black/resize.png new file mode 100644 index 0000000000000000000000000000000000000000..91e0b742d9d6663f82a101a4cade4be88a79885e GIT binary patch literal 214 zcmeAS@N?(olHy`uVBq!ia0vp^+(695!3HFgJ}hYlQj#UE5hcO-X(i=}MX3yqDfvmM z3ZA)%>8U}fi7AzZCsS>JiYh!^978H@CCxENm11T*z;?vDu|idNB9~)=Fpyl__(NQH zBbOtOnhaMsgQ0QALP>$`$-z9q987`%t*aX=w09-Na5*>r;P9B&>d`9P@WYxr