From 04b52140155468d30698c2aab2a462cb85838211 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Sat, 22 Apr 2017 17:51:12 +0300 Subject: [PATCH] [Common] updated app logo --- apps/common/main/lib/view/Header.js | 4 ++-- .../main/resources/img/header/header-logo.png | Bin 747 -> 864 bytes .../resources/img/header/header-logo@2x.png | Bin 1542 -> 1863 bytes apps/common/main/resources/less/header.less | 16 +++++++++++++--- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/apps/common/main/lib/view/Header.js b/apps/common/main/lib/view/Header.js index ee3ed54e5..e05dad4ba 100644 --- a/apps/common/main/lib/view/Header.js +++ b/apps/common/main/lib/view/Header.js @@ -89,8 +89,8 @@ define([ '' + ''; - var templateLeftBox = '
' + - '' + + var templateLeftBox = ''; function onAddUser(model, collection, opts) { diff --git a/apps/common/main/resources/img/header/header-logo.png b/apps/common/main/resources/img/header/header-logo.png index ba5493b302712b5e281bd71e22728764388f1b8d..5baf86a667a902d975dfc9f815fcfdb4da2bdd3f 100644 GIT binary patch literal 864 zcmeAS@N?(olHy`uVBq!ia0vp^DL^d3!3-pQA+A1|g)T&c?p>bB;5+Uj%3KrR@mK^QX+*>Bhr_O>hIWo^WhOuGlM`j?ZG?*+*}$#HyI z;P$dQ^i6x}yZNC6O~9D12|{B`c}*S4D;8LxYwvGQKnp6AbsJRhf7Jx;d{a*k3K8~dfdMx$S;^dP|4UOG_8E*s@-SqzWe|G|NHmv|NlR~ zfByXbhK7QEAX!l0;9#I2pkPo?(9kfyfB$`u0x)=gfB$-r6i^7L?>~)og5i_+d!nXU+8F2%FC9ets8_je(x)3-*nj_`rrTaE7vQtvh$z)qNqQ& zj(=Zz&GCO}@1}m}FRZQj_VvvNDdi`x9(eaRYxi`VUVQ$%Osvu((YA#qam(XQ9iPu; z`A*Vk(z=Q4mz=t$a%lL=&O0_S=Nf~vV|x!;LWgF^0Z9H?b?xDhF6J_a1E4+my zqAE>PO}2cDd#Y)A?2411=OLYoYQ3@#(%yfmeNytCttoZ$kNM5Z7HfMySTQx-x3Yas z3tO9%gO1WiKgE4oH}cNEomVe#uKf9}+X5alSDflzb~5ACq!zQ(u04zgZ?AHxVxIIe zY_+N3?&6PclhVtS&R^b}$vXX7PF7XuqyrPjO)PCQWfGTbO}gOi z^Pl5>t@yj?_jT`!zvOE@dhE1@kcy*{3+JRqMp_{%la@~ZrmuW0uimD3cbkW-bKqC| xFIf@^wJ+2AmzMTS=smhT-oIP=$9aJ|<_|))xmACHcLGxmgQu&X%Q~loCIBQdsXqV! literal 747 zcmV#c3uwr$%ktnEE}D>ap^c{ca<;C9maa;m`K8JJMU9lbU+Iqxn#3GnG{= zp_8puco0T?&hSGzuEoI?H6@SOPX^*L1!$s?gS=FvkV^x!ARL%tYQN&XYJCXc1g8lm zIcpd|Y`&ozYXud|I);%)k&MjpO^yGI2J-I;Z<4B7kcAu+Ftr28fWm`7GV-1V*SUIj z1vz=2)c9H0)jZ=v<2>2RLqY_5oTKc*3pcDpEucAFcu59j<5)td8TVxt^9W@fZJbKM zlG*VFmJ)havHJ$wS|!6+#C%#1i-e5h0e2ZeY~s&a?v^N8W{eypRvUE4v~H@augUXj_r4mJK$2ez}GAGu)X&|6Vi{X;%Ru}IOM%=i;X zb_SVzIJpS;QP|`NR(=K7$&VXW;!~b-mCzrBolIjzS_9kH_>Uaeu6lmpf*nOkMSA@) zL?e_GbYqc?g>)h@;e3ks54OQ>rws&4ERC;r!8+nLn;bXZwt){bng26wP(jbKKimez zs74jC@IGIvcs4VsEy$0^PF2kmw2M;lh`ppGE|Y*}8ZoeX58$PR-JvxKH>~r4#o!w{ z+7Il7H^Y*N>n5*k$=SR dz0n)J(JRS`a8<{f%Gv+`002ovPDHLkV1i|cS~&m! diff --git a/apps/common/main/resources/img/header/header-logo@2x.png b/apps/common/main/resources/img/header/header-logo@2x.png index c4cd01329308efb6a0a7b47905e45bc8fefac55e..212d5180e97795c35f21f9ffe86c3bbc15de5445 100644 GIT binary patch literal 1863 zcmb7Edo0yWm1M65h_&7y}94XeR9c4rBOonPN?QKS?2Qgy0noHT|}=n zE#?+`Uz;u>3o|Ua#8!%G@AI~E{88t0&ikCt@B4h8@Avche4jsl=gIK#a#m8%P=G)n zO0F&#Kd^U$PhVaJ#OyXlV+cfA!N+5-qsO6RnE$h~XnFudx&eSB|8@KY?dMiOE4sAP zy{Z>`haD#Y$Uy}Fv?Mu5R%tUC2j8Vd0K7dL2r!lGHId-NKV-w(zjHL)cqC8{fa|jn z905Qb01yBG6Yzl$ILzh7OR#$U!3Q`RMz#vV z7*hfCNgvt-fZJbu$40(g!?@)=o_YP4$?Z`9gPIZ4tv8YgT7a2B|(EUy_4kQ3SUjy9XhhiTwTL$kHu_jZn%H9H0#{qeSz+KtPBupFj*NXw5VV+9rzk4C`=KmWn|_Qdh}?hvsw8A3blsb!Y0m26f2Sq=$B?k2fyn8 z&E3yzs}5Wi3R8hes{ygKL%^XkL@MQB@9?x}{=Abk1Ol~j#n|sXIW${zknwEiZ&$=x z_tbJ<<+t>_LAdn_Qk(3Gji@s%Td1;@Z!2)~EzW~N^iEQxX21aPoXMU3h|*mHq{?w& zH>nc)AeKY1#y&bb#=F!zz~*DE6Gicz9Md39JJ#YH-{fiDvmkZ_)-vgnH%dI>TUj7|P1 zCn;@Ky%5!4CGA4SoMeWSqn=kdpKHbT&@ETX~nXjP|K2;-k zbSP^&>(}~9*WM+J`6lTF@CQwDPOZ5ZlCxJ+HN!0giE1HT#cihSwH~N@ujo%mKcC7> z6v^sFC!AxvtXtpJuK}C0wiYF>zf$@pP1glQK8ilyp13)0n>!SKYCt7Cc;vosycQ(i zsOzSEAf6mDd7%GErISWV8U5RqoB{8-RC|A>setBy%)74ba7Wi8lw2fd$Me!wxrW+i z?lwL-9%MUBKYdnBK?~uxXA8!Olxc_;AoJtocT@75?N!kx5g2-K1ED*3__SzIj$D|F ze{mR&Oxo%mjk{}RWV6zM$u>YFe|E65=cjMc^}~60!#AKSf`-rN<899_wD3Eauhoap zbLJIu(Y-S+z3}QpL$qW1z6_m$O!B8%`&nru3XyG<$4R4gWNW2$jkXHs)%!L@vPQM& zO|Q#2nFQISi9+18&Gpt0q?5jFVt#YG0g956w)~<-F*#Q+T#ndQvLYU4r1{D`>Lkr& z%IhLi@@O4GmhwfNk81@;SNB4>YwuC2LGbN%u{o;CotQ!?9jRy}$?8^?2;Lvh9trd!8Tgq*h;QT039GuMhoz z@an7Bh>e&zZoAzSqfDsZh@E+EreOWBurBsA%TPuOEi2%bAzmV7hJk zwaE0k4E06z`2|I4IYI9c`G~oTb*D*@Cu^ih>&fy_A(t*T4<4weds3PmYo zK2dnK3vrl^Uug?zr*I?Y_f_Qoj*pOQTM(7ehAegkVZ_y8!O+Wwv`e^f%>Cr9!m>(X z2eFYYc*Riar<8Nmo4GG%uwM>^t)IuHP3|8c6_?#&Vecz?_ViSm+7z&YX{w&A8l0SM uv?jJm!SkPKcrPRLakP2pgV==&;}Ppl2G=&|9vlI0AjH+t3sdh9nffn>F{zpW literal 1542 zcmV+h2Ko7kP)@}Dk}7}ohSY1dk@&q7*WxFOyXGIYRYF0G$h(ig?U}$4`uk(1!joWQlXo5 zJfk`8w}MX5GAazRw@O56FviBSi`9pQ0b_}Tle zwXrdyhNC@R#NEb<8a7wt(l4l}FnhYz!MVlxBPNI@7@6vpjD!)kbG94Y>_U5(N2f^W zd-+@Eqjw{9d{ zPvW4c;UMsJaXcPiu}GNFZ{WtLp_9kJLkfMyb*#JOaefc%#o4A9vd0CSR>q#p0tMUk-}n zon^at2E5ip>`gubOE)VvVU%CN>BZU2;3>u1SUdI3>{q0hYm58=?G$@_I-5UA)D>$Y z+d9EwdPL}8VK@5|Wqx;=*@`>HvYaEWW?+%$u4$q9$NVi`Sxa zP3-wivQy+@&8OU7%VPJiN-ZW0yGvq|s@;qz%KO^cvwruh$82uw2p!B|Ki8(pdSbr= zXO;gvV3(TM`ywn2ellSLu^EQ@nZ)zD<&Cp)seV+tGFPg}W6UHrj}3CMR!ql}HWHh~ zQW0TtJGd&-dz=Mz&BtF$IyI}g!sf<{Xtmf~n~IHa8@Q^W*bKV>em7IZzeMcH>3EXX zh%M01S}x4QU0_WU=%}+vZRpbM+BsGUl~-!Rn@~MW>qBGn-_G=3*@@{c~C|#%3?Ku#;S;aU5xGoue);2cP}5#`=Ka zx!4FNfXD3IKx~G0AYb*R$?LdM?Ph86>d}tLYtnSQSF6P8ZviWqO6Le2OlP0kIGV>b zb~a^kM-S6l!U$tE_}p4E%Xan@cs-&dwy!V1)$J0yPWs%MGRuzRn)ZKg>EMF&^yynH z)`B)nv9_6wU7PtY&!k>#T?3MaxvZD&*ud;{7YN^)I}*A$2e5o5HepNfd%MJr?aHEg zmzgLM#&XO*Xn`C2cNNXD>ootk*oQ7A3J6Mz|p@PB%1@>8$CB)Xx@=XqVWu07-F`gY4x% zC%MH&4VJV9nAiH5uH{XUZ)WRigq5?JbM`WwB)%iA{GMSDK$M zG%})HViRU^QR(SB*58CFFs2!;m5E!^jQZ%HqyA>IPIhf|qjisl815)f_|h*vbe&Dg z+lEfh>QD1{dD}3LNVvW@-?`52a@sa@u|3VBb7|Xfcw|^FZM-z0&bDD^^V-vSZgGQ4 zonS{Z*4;MDZky7IHf$W0F^P`RS}Kfd(K<>uFuy@j(RTDQhjlZlYn$0vQPF;MH_Gxh su)bwXtxHr?R8&+{R8&+{RQ%8LH)HxPXqW0i&;S4c07*qoM6N<$f{NP@pa1{> diff --git a/apps/common/main/resources/less/header.less b/apps/common/main/resources/less/header.less index be78c32a1..be04a942c 100644 --- a/apps/common/main/resources/less/header.less +++ b/apps/common/main/resources/less/header.less @@ -77,9 +77,19 @@ height: 100%; cursor: pointer; - .background-ximage('@{common-image-path}/header/logo.png', '@{common-image-path}/header/logo.png', 240px); - background-size: contain; - background-repeat: no-repeat; + line-height: @height-tabs; + text-align: center; + + img { + content: data-uri('@{common-image-path}/header/header-logo.png'); + + @media + only screen and (-webkit-min-device-pixel-ratio: 2), + only screen and (min-resolution: 2dppx), + only screen and (min-resolution: 192dpi) { + content: data-uri('@{common-image-path}/header/header-logo@2x.png'); + } + } } .status-label {