From 0a54513e4716670417bd5c8f876f72a4b5980370 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 6 May 2020 18:04:48 +0300 Subject: [PATCH] [SSE][PE] Set svg icons for chart types --- .../main/resources/img/toolbar/charttypes.png | Bin 8042 -> 0 bytes .../resources/img/toolbar/charttypes@1.5x.png | Bin 15189 -> 0 bytes .../resources/img/toolbar/charttypes@2x.png | Bin 17074 -> 0 bytes apps/common/main/resources/less/toolbar.less | 116 ------------------ .../main/app/view/ChartSettings.js | 14 +-- .../main/app/view/DocumentHolder.js | 4 +- .../main/app/view/Toolbar.js | 4 +- apps/presentationeditor/main/index.html | 1 + .../presentationeditor/main/index.html.deploy | 1 + .../presentationeditor/main/index_loader.html | 1 + .../main/index_loader.html.deploy | 1 + .../main/app/view/ChartSettings.js | 26 ++-- .../main/app/view/ChartSettingsDlg.js | 24 ++-- .../main/app/view/Toolbar.js | 4 +- apps/spreadsheeteditor/main/index.html | 1 + apps/spreadsheeteditor/main/index.html.deploy | 1 + apps/spreadsheeteditor/main/index_loader.html | 1 + .../main/index_loader.html.deploy | 1 + 18 files changed, 46 insertions(+), 154 deletions(-) delete mode 100644 apps/common/main/resources/img/toolbar/charttypes.png delete mode 100644 apps/common/main/resources/img/toolbar/charttypes@1.5x.png delete mode 100644 apps/common/main/resources/img/toolbar/charttypes@2x.png diff --git a/apps/common/main/resources/img/toolbar/charttypes.png b/apps/common/main/resources/img/toolbar/charttypes.png deleted file mode 100644 index e13818e761547b29f367e60e275462c1ba8ec15f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8042 zcmbVxXH-+&)-Fh|iAe8FDI#5ZkuK7)AksmK(k1i~dXTE1(o3kXf&`@pLa)*iKw7BM zLPrRlz!%OrcZ_p?eD}xQV~w%aUVE)Q=kv_D=AL8j_r``gG?c8A1Ox;$x{ozY@%=dg z0iiWHDSlMJc*~oBfJ;JGQ|(#6%yyduA%2oj9GCF*ZWMR`fWP_AHS@y<(Dshso1n)5 zUFVJ#&2_)&M0)Fz4tEmLhPo%N_Of&8;6ctOh@H%x#@w&x-TnHLSlQY1vlt0VF$d1N zrM?2SD0Z|sK+J)j60KV31)1mujW3ri(G5f11(2J>#sA~$x5)FU+W)oP%58F9yKQq- zuHg=u$GlzJPHe+JK>>Cv-cBn6J$G}cNdA&)ete7hCTolwM#X+yFUW&z(W{bpw*qw@ zh5&SJDM*8XXD2`hDA5As$AuTnUFAR=o1%IZKs}-HM_*?_nrI|N?+07qU#a0oVSwX- za^NzQ2u89>9?X?T{s&Rl*w=~tJf*i}&Mtdf>9G8EshV`%;uHDs_{cJ@m^N~+MB#^DyhkM zcDZZ|%|me+9wwAn#1$6KU&XOnp+xl4PWBN!S3$wRLOt)hhkkp!0H#RM@cUKwb@$)0 z@BE-Il#4DinTIqU0{J6Y1alM0Q%5rhbr*TIhQo(T=u%2WN^y8D7nbN+`-bcO( zITF9SLD8sn<0|3Ik*K$$mbqi&1DTK*^TC|vPv!>B(C-ei8%)ZML3IABXl(NeUJKxB= zBVee+dA)wmAPcn82~c%&Sh(=KdpyoJLNUWKw?@SHQFcY71=B$#rj+PzX6fDi#}$S+ zj>`6cZ)~DHTM@dkT#LgIE|wm)U`tw5Mm9>Wvi0ix{(D8n>kGs25v4%!o4RM|l+69tYNKJYPwAw7)y4}=+PlY(VxX$F zF(0$7b1>YjB~i@hpme$Or2++$oVceUAD#nlJ4T+#(w_AFp4tKMwULQTSkUIHo-Rgh zruo^aAUxk-Oyabk5?%WdU5n1m?U@As2@fl5Q0+4%eFl(f&an+_n0%pylr8vJ{sYY% z2(EzaZ|YkIt};A4W*#0|Z9U`Wk63P)X!9G1amn#qTu@m!fp}*Hk5^7DOPW~z`8Ak2 z5WEuxw~b_I#NlO|(~m5@zU+M=*0_@DOmR^_cVUt!13VL@mZ`zP9!cM0KCKrx#|0V8 zh12eSZ0cnQ7a02Gt_9?)zYgzKuyDBB6~PxkyLuh=-H%1n8)!8acj+wsP%hR4n8e(C z-Zto>>SxHdUFA8N4bCm@@^EQhB1|}9XnP=ct6euFRw2tDldnc^Qu9k=<*D)f{>%79 zKwJ-?Z%fB^(s7%ws-l3TaGI{MIwRDUnX~Gpjk|t~ocQgXv=E`K6kxaZ_%E#$&w>v+ z4ngFpZPdi;39nwNIk@$g_6@0sQv+UBz_?V}HJEcZo$ryuAJA&hmmACLuJn2*0X(Vd zH0VwV=S-U|uL)Bh(XTeMKh|&?jO^^p?xq?_OQ`J|}OjL+2O1N7f%&)IhAvL&EF?L7<(TjbDy>LEFk6mc?+0;Tf^MOFH z|KR8h3#r#-`3jL$A07MMf!v=Br-Zwy0PeRvA9UZew`-{bi5YZGX!Ce9EYRQ4J6`9- z?1IWK17SG_^EzPF0PZgJ(4)(XwVbK6^ZMW(aMjz>%d zc{X=K!ikVpN!N6T!EYAlR4?vM>qrvLF&rC7=tuzOJaE3UbIXuj*Zf$V1M~m+O#F9$ z3bUAZvgqyX)VLTOKli7_)e@i7FQl0FNY9Bht!uwehMEk94N8`7I87_do@1a?Rv2^! zI-@CLCqQX_*r~edEF>&AB&68@MD6b2;jjzuH5e3j5(Yu35dPaaIXRcEKRGq5;rMOp zBkCA+COC2o7=)wpq)-=Y*uRG*j<(+Gu;@WvFwIBjg(J6G^o>}8+DESDx-5CH!geJT zh^svfj5^E+b2QRh9b@gKB8pw2P#)VW!h|TPVX}wTMg|53Y$mpjj80BYRH>A`F`Y0C zjFyQ2IYN4~|Me&*CudzkcOe1}p9$S7%D`nf>hpo10LE(MR*W^6L!Bw8`|vL%)J%@c z2pE(_RNgVLM5%fRznOq>J)S;mK*oq-Bg5}RU)i^*8!?_6Zvo-|(pD4%6#yXk-`+6t zUR^9MCq1s6EJ(m2CTnyY+P2VXZe-%xSVI&cFDh8Qrz+YgUW`9jpj zYsmnQGpO6D<%&$3691TMGnhevJap>tue4&&gw@seChN$D^eG&OD?FiO+<58&GDWeb z>P+XaCEox50CcxK%G%0mCz82)yH~`4^@g}TZtPocYP`X3e988tlJlHxxYyrRPEpa- z$jHdwb!uq$?{4GV!k5F9SdzEV{kDoohp#3<^f)x^Z!F)pLdEz#5kU zHFp?|A{QVWp#&u+|M7&Ft4a;7ZheOr5=l1_SfOSg?*7Y782rvIq1V-Gr&s>f@tHk| zbP&9hbiMuKnH$H^tR7-hKVf9W`kyI4)62OOPMd$8;|&50Nf%RveTO~4Ji`6QL+-x1 zNh1I6t8KT%LjwH6pHV!S&z#xXi4-Lv6`$PbogpqN$r68nYrBbh4Z94})67Dd19P<$rZH1e(8_>?i7ojHCttZ6NR zh%Bo+fhpVmhfBf%@f6WKU59&_Ph-x;#)bs=`eGq}V`oQMJ-)=I@m&dv zYS?8c2M5Oq2|wJ609!w@{6-&>D!>$7s0hr!M0PxVJ+9F&1h?o(Vv}{-Uujh5&QO?pgPKYg|lbV*sZ}9Lv7*c-1KkjB^$8_*EN^5nMT3q!PM}ShY}lmuS3{ zAnJ=D=j}=z$yZh7+>jXIyuSV<^t3Q`wj5pWsmheP()JM#G9P9`K3va5!14|AJFevk zt^WPT$qJE7bCnuTfg8;!EK)rc)`*!;1CGI(A;h2Bdx?Nn|J-T}xHpBej6YMi;ZJda zcNM@=$wc5*5GJdW-CYkUhaT!`#{tGnj|AYgwnMy#;)&L9z(aAdl$+;53N+h>VNm!C;Vfqg{agVH0^ z(bflQ4ux?M%Le53)Q`@JSGB?_&w6=+;|gu44i<5X%t)GF1*M|!4j0j9X^%w%cpE?X zr&}6r|R?Z8zCZS`AosAde88#`3dwO3)Bv2$Wl5=$-X9s1-oC_ZQGitdh4b)EQ z?5eE(J>_5~raifu zRocmYLaz1hTI&QHZ2Nk*Z}lBGy344EQjF>MV5U^>q7z^!&*KhCm4I?lfef`3NU%-9 z^|K7!%r@j$M)=-On9Z^OXv-L=9IjBj#c4wVxj+BsW6(KvgLHHNerHK-a_-AK*PAui;&c9;YRTHk9^A!~Y{^5ok8LvoR2q%o&f-cHs||D?}FsM&**iruQ!H zlW*-Guv-=DR6p2lDWdZ9oo8G2p2RuWiUn{Jqsm1UY39>T5Dd}2r-DHa8{YMqr%YDj z3!LGYq!JxvuCVX7PZakH%?bxx@@!x4n*t}6iZHvQOq4O0c=+kHBb)|IF`Lv%eXN#x z5-bRx%V=U;X?Je3_o@{ebC=8-Fl1=vuIQw}dDOBUB`L+(`8?=Dk6xHUYH762PcBB^ zq~{8|s7Y_xa-5H%$K0X%wbP^JM)mzJqKeO}A_e=}6`qxxT)hf_e3em!@Biz4HQbc% zs%Wo^(^pTQLDCBy3=d^O8W;UVNaSBaAfv%SjvHi;2;;ELt|Fask73;KEG&JlH+e}b z%_V{UtqJMpa-(Gr=X%7cJO6(gs&iHiY)rf!b)!^QLhHuh1GelU^#lR~Q2AFsAT!O^*Q@jwd;5k)Wc$r|(0bg9uhU2yFtrbRlNk&8=Cf2yW@B?34RD8D* zc`~_|COC^PXhG9R1kr-|(-Yi2U;xB9?$6gGYycA9N#Kr1{tD91c?|x3#K69Egg@x|3yCsO{V5QegerLVvRSCJl{k@m94m-lpo&;~ z*Jpq_YT9L-2hC|=O~1az2Yu+OR`+=>15 z{abfTL>Pxw`qQKiZw(|*@@x@xi^yoJnP4L$xjC&D3{f1#CkEJ)i1dit_#%d_7i;Pl zs=q(0^vzrLB?G{WY|H%n;iE2Lsb9FyAq(e+7@qgLya=7bglz`f&9Bddop9$zPJg=I zmm&~2-{A0(uKaGvKaSG_WS>Q3`vgf)J_?bi3vbFW{Uv6MIA$;CW0z|1by&6E&MT?l zeg^Jco850Bivtt8Waup(u}ly7 zW`Nl87zk5npwCEbq|d4RVM0sNs>?0mNvn%`nr>aPwJUnzz1Yk04D5I(fuda69P|GmA!O}}=< z3R$H;|FVLtFD_uJj@)P-2^5vbk_ovOLFTU(jM7dh_nklS6|ryMVVq5o zpIO-98fFh|C{Bn-9;_lcf*#6a4TLbCscGk+W@#F&36aM>7+ORY`x(3R7t+z1e^09> zMOF%JW^e@c_Cvv1Y6A)&h_y9s;0yRa?}OQlkrp>E6%&JmagyXt_94(h7+c6La$w-2 zkr9!g>H0*lp=uWC7|4+$Xp77g2OTi0L1b!kfI{H@w@BtbL31?xG4EE!konS?U!V`( zIjF{}lofm)P+I#*vw}F8Pw4qod|r2p)@^A}f*u6ko$-@aNm9kk*{e+Y;rBg7u1mi^ zcKb8<3@b(Q{l(tA=$mad2ooNK6)lcCemr2N@uL)(F*42IlKo;7nDryz-{MC1=s^r5 zNu>`qL-}Xw>1(W|R3}Zl!(y^E(z&FrY|pR$HvWL+SME&Aq-frsM{>Z~&)lRldd5r} zx166M#b0Hslokv9->OOe25|GTShCZ_1YwzO6lkqH; zhiJ4$MT)*%nsvvr{Jt?lqjn3WK`Ho6?2C}ydPhk)5Tx=Q4Njg?LD*FpPv7$n*{=wr zr}7}kJb6D<@BifvH=c5~0WB*`b74p5OP#EgecSzd=_9Rc6LR+34b<-H**tySLdK~A zd3%>NAnCZ6YlDjNJT|QGVenhbWoX^Y_57_%DASqcmi&I;#yeK+zuP`y_%d!#@|tja zpKP%|Mob}^v7{gnBf_dyX8c_ik4JG|YlD$h<6}I8Gw|{nT6R@pK&7znh%sS(vObF4 zI9HRF@b}<2|IAq?A2fhxkH{usxA;B%nab5lb^DvevwNt!(vE7RDq?f$MH@j`)$=&E zH!cX*>QN1>fcwi;s3M3=MON7`O^9_XNp^wrQ_tK>81m8_@FZ$S?_`Y5ASW=U#q-a+ z_cgvY|EN+Vn7tQvb2MS@QsoZlU&{YJr+u9HnCq6$MLCG}?a<6wx8KE^)fu}x=D2T7 z&Tukk6Po$}DNOkb*vI+M^Cx3YL&dK39zVTMf9Tji$+)kfHZ6JKU9t`Et{` zeG%;%Iyshg_KtTpCu)myw(etvA!S0P@UPW(maRUu0{BGa;teuVOfbnad9>%74_)ty ziP>~?bnpuc$DS-5tmlKD#85K0wY$yKWR6!_>CDu)3;3)LA8r&J20mohQq*tLqK+(J ze+8AyI}AhCerP4->&pCG{=$NkmUB%KE_e=X2Vod*jcUv2l-f*+6YfUJxBuJ~su0E*%F4U)a@^q!*Gq zpIU)SHM%+g*0)eXOB{uyF7hUAe}zP_VeNoAUqmg!pgJS-6E)aGAC^pWZ8JNYhJg1? z;2L3JQiN)doZJ-)>EbO)Z$|BkwgMGvh{=lmaN+U9a z_D~kFvVj^hqM;!`$O>K~Mykx#884B(mk7nfx`S=}aK9q$o{{og!+UGWC!cHk2gI!U zLjJ}w=uX4geNY8r)<4JRRHxNuD@>8=1)RGYgmn%APnK1h$*5jgU$BzdwMqhH8{~{A z?*%GgYF#J46c^KXtBnjjs5;tQ?lIc0E!YyTVO9gPm+dDpf_ybNL96jF@2UNdWv=5D ze9`E43NVWUmi(3wBsx2gWy6jzvP5K) zoEZc5;1p>EOYiF9k5MDDcUTshJbQ&K5=Y3juLL-Xj7CPvn!&&ai zdZPM&fY<Iw8{j55cV$DnTnFQoq><&;TBb}{s zaA59_dhY(i-Iekh6Gx)aoKFi;J}>_%_?|4jbeqW+%Un7UnTgN#bpryT#ji;V##ZH7 z;6$033KSF+XCuKNrPpN)J&a{!rQ3?^#~~?|B+3+jqGN*L+IM*X6cn|B{gv_c_|?g; z=ieUd>sS0K(9zQJxu{MQ6OC|>_}fh$#K`EPcH)L~;7NY%v_UIOBX72BK&c)^m{JZr zQ1xQ=R}>6pyhm+{9QFrxHT>g4M%!VuQ!tVtpFrgXreK<}B+X?2(cQVz`#=VqDeqb* zMvCKM*ZL*om9xym`rdh|D(yA#`$4gO-}&MHR{*m%5^R z=o{&r$7f3ymkgj2L~Z2PsIILo_u-jW9*y|4vp>vRiCt$uCynPy*@cEEbsT{xJz6_H zJkW~|J}g*Fpj7whW)qISbY=Exjr#eeYLSR!=TjuZ9$r@}86K1c`kDDy+pOZ#hBjn68t zSm^hv#PPj(lldg*&_wuX?T#_5@5hBP8DoYwLAf|h6pGOIW6I0Rh(qS(HOuy?1a$Kq zkZu2{V`^5`FYWZja$ zY8}G)&LP^$*>s#3r_vAmRpGC%zGt~}4!aE0#rXajf78;+HTTyYc>t{F5Q=uWK>gkt zGE?&+O!B(EM$ONiQnR=~116WvE%HZX5YOZqDb8 diff --git a/apps/common/main/resources/img/toolbar/charttypes@1.5x.png b/apps/common/main/resources/img/toolbar/charttypes@1.5x.png deleted file mode 100644 index 57a3ed1dcb635686d6902c73286f696aaf8f7fd8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15189 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 TgL(V--|v;>HRP&f-iG}j6s>Q` diff --git a/apps/common/main/resources/img/toolbar/charttypes@2x.png b/apps/common/main/resources/img/toolbar/charttypes@2x.png deleted file mode 100644 index aac960d29f61bb1cd7011de4b2ce1b02fdf473fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17074 zcmb_@XH-*NvoJ_iS}4-1h#*pofOKL+L=w|PzcgOQB=AhJs{E) z0z^>|fzU%}iI_kL^*ix--h2Okcio%CIypIe_RQ>=+0*vn$;}(aT*pL@F)%Q2UA=PY z76St#g@NHn8#^oTL`37dAOpk2u&bA#w?lueeT)U3F~p$u-wM5@-~Io5kmy#<^m*%& zvwEkrl@fF4AMN+?sIzL7pG;XF=ZGwvRRcbsXBBK$TS+{3Z~45%TU4v7p_gv!I~&`L ztQg!OQM}g|b36*(_StG38=JL>h@EySuWWcZs~Hiy+ijI)o4K^m`b2)ybu&nf?Y+{mj7FU&Mh zfsF;rd;m=MkxrRR$k z6k!gHJxb;~>H?q7Z%eXPLjn{}seEk95m){6ULh#a3LI9f@a(c%)y3+l+Y4$lzQS$4 z0%Tq*W4oLk;@oZ#qEuIl)SnqIeX_(WQX&?T&r~5fvx}KV)9yUKSy*y{gg|ec!MtVC zbRLRBdmMn2MlMpr*&jaPGYV3%2apa&*Qz2kosATNkGVMLvBZzXTeroK-2^K9A9JT( zd+w0KZaiChGM-@H)NlW|VD(mYm-F_B`I_NQ=>EGduxGqBI_U>Tg!)a zl(E$)@;%%7Pe+~yC}%+-eHx@hH-F{+8iq=w%25QaeDNZYX?5-vCt<(38aAs4I}T?| ziL{7#_OQ0@^7R-PSP=hPLlj&yLteOJ9m96k>UgiSiXH=pzZah%+G>J!eTuPs2L7Ga z(cUZbI0IOS!|z*#3?3!=DJ~v9wqk`J#cczGd()iKD>zq+I%>RB_gKBG_E=VnEG_Zr z?+Jk$As5&x#FT~m4mUNpPd~qnzsB6t4l0Oe5oj$_Kh6iD?YF)lsizSl z$fHF*eAF+FyS4a<%V<2H-s#BU*qB!7&09IfpcnAywe-;#mk>Sa-smj72E+v}1+w<; zOhJM+)3r#J7tJNNo1Jn?IANiphHZ|H^D}2QvFAKeuYF!=IitAs)}KoW^;3c;DIiY{ z;Wc$XR(n5IZuj@)Rk;l|%v&S3g7>$Zt;I@|XTBI%Y?~O*KfU<&nwxLTHT{t{KdrjL z8GDGK7gFby!o*jH1UwV9*Yi4;-{w2tSVvxTODA5-PpMBY$DGmHr;J43%-M~~Al_qa zbE~>FtoI9Cgk&pu)G?#7<3jk-$f+Bx0dADMj8G)6xk0K8~+rS(jT z48=F!tokz;@C*0q>4^R3Qy1JED$h}~;i14DQ%egrRTSDizs-7wcSw(HI^kV6I0rG2 z++tL6Lw0@8M)Hh(67PRwm6P}aK61!;A+ukv4bx?!UxSHV>oaoWe)ByMCF1IQ82m*p z`=>+rx?6d5JNzYS2|NXe5se*7&{ock*RJKn-1h+thJ4HK-C6eQisYDcA!IkCb%)+u^9&gJrmiS~@Maq&BH<$KHS+28*OAp#FHL;Ut z!jnhCZ|I{ijP=eYFT!3K;miRx`pt9BC{k3NxH%R*3zRrv+wVsQB7!5h;%O#Rj`-ux zYa=fv^@~^CBJH2EqFr=zz`nso$7`FuENRv}ikTg=RUzAKuyFp)ZfV4{evL(2;{Bh) zS>39D4NGn+F_Wnn__|jfANKu0&Tx#Gb4-PTWSgz{9tr{Sk_7*}(yC z@tOUK*)9E(Z%e3)voEL zS=}sDxL-|%olW!!@>VW67x0``8v3K7>5=~1iq=~QXE2AhkmMU+s+qg)DMhl}Z-cey z7uR0Zzd8V|z-byoNoG#^loPK9J3q8b;!$h^_bgAH9%z$PO;Az66<)D;p_6e@e#Snu zDdSp~)H?DWJfE%jQLwd@SLKH+E-3>&pSRPgjM~a%F|hBADw_G(LUe{XpoHk*$zdNq56mCnKVw+bUW-{!@!Y{#fDyZ&2#LpC`fsH6LVK~sRyFL&9T zQ_k#nGmtFsS5`^?b1R2RZ1%T$Tdpqt#i{R-TRTTo;=_{TY%cc6a4YL;ukxPL3V)tU z9BY?!LmHYx3?5#o;P=$i6K`+Yjy_@eX+Y12KJ{z*Rrj&bW0OZ$d#ANZR`XW{Hb2xn z4<2s9bbNBrmQ0kNQSNI#7lDQq0Z#73=v8%L>SI-vgTgB>exEY~43WziP~cR6dIX1| zoNIuF`xV7U83iCx=Pd=-%+&rpBhy@R?N1&&Y4;-Ot_+^5(zK;ESE( zv&!k)E7e~|ejftZO>ia@Qly_#(rTW!_jwZy`nIl3V9yJtl6RMn@-;4PT87UwH27|Z2Nu5 zH1n;L%9C1*rRWCazM1YRa|z>JHr3gS>Mr2#a+b$f&kO0ebY=&m6~|d|gl_&D@$6V?C60>FVFRoGSL^=hQI{ ze+a(fo8az#4MStE`rDzmFV0!zocRSdS6GT_I?g&K>$2}g?4VUjlU;QFjo4cbxkHXH zu7Bcn7F4^E)#Q>}m1p0jR|d?5AHV7BuGLll$@&?2}PLEeDN*E6YIOngM)(&UoVUGM3U`3%I6%v4bx*PYW33K zPVTpV6%|v5neU(t9)jK*JF$?3S29A2{~aTh&EJU5>5C@kx(=Bpk2$k!=$yJgsz9BR6!>9lONV=?}vOyLmw$8QCi0H~3zyPL7MaI*IJE``l}FupT%RLRAZYqix$Uxhi!-`5JK9sdVtr}U@CM`)J_-wjr^?5udDKdXOy5qyuj{`5ih=nq$dR?Ajk$?&X zu}-H1Pxv$z4j1U}j#}K%UL1YQA%rtua96#yl#VQS-9pfQxTqi1iBlm|KtEayz0~lc z?a|17b~R3&`6+_Rio0c>2OTJN$W>SFbXwXGs4JwTMWVvyHTe?U~fUm65`V7 z7u*rxn}d$(??d3y81v8IKM(06UDvSyUjUM+XH{{yV%fX7`xUZuc-?Q7SUdkxuYCb_ zI@}g=lx0eCM2qnES9%cIYlpH75ul7pEU$Rn#qtJ0J$}o#emFxYSi}GG+ZYSu3v!k$ zM2$R&VQ-m8L~*qI7c(LM;RDY07vEq0<}YF+qbCiRC7@=&`f+*xun<+cy6`1)z%^a_ zbsM2Lr5_Q!H~%5rtfI3U`4*hwdPm@{3?Veh3Tu%bB=H)UqOpHqmUHfv9vks14|t>#NM|6$c_47C6-$PM=NXw63-FRgN_FQvapCFe({Yn zcw`pLPyfk+KEr$$TbW1~o$oNP(!PWr+}!6jV7P_-HgV->EL!|JmJA94v91NgYb4JrK^rA~ zrH-7C2C(>81K8+42%{w|-qrx0fL1PDs7ORj(3zM5egIRs1`^}|s8PcU%u{fHyKcBO z542ENO&R|VdHl$G-~6C&SEI$M4Lc&}mV$!~>lfAobQo(Tm7VlkK-)hn%A2oU_{AGa zXAQLatZWzb$@{2UBU3P&79 zO(%} zT);*P!Xh!9;0{1gzWfwQF4pPT`zqrp_dD2k6MYP;FCVsu2k{Jsq|hx8FmhrMP35n3 z0m{}_pJoKCf$m6J67j9k|Cs4NK-}WXiUeQ~u(5E@_SHrxeFxB8i6OZX@@=zfd8F*{ zCf#O%JwwGtuobMG`WM_I%u^C7MDYgpy59{f2S5h^`Db#Z_}_gBpk)AVxMNU_NL2Wh zS|`0R*)GGXQQ7&>&v$`63lPT9orsV8KfBfp05(Wvp7JrlvgpeY*x|ZITV(J4^`Ffs zj-45R((q-h%|wwPoe;A=6P?k&*NJObmdHN~Ulz@cB`h66XCE&bLw3GCcz4*kQ@26_ zSmOs4-xvq%+Fvlnj^)?6{keYa&08K#@Z1%j@K}Ir0AJ+yc!!=DLJ2}ewS`c;;($U` zqhk=O!+Sy<+dY3)9S`BOSE`Y3_ZC&7Pydy{&KoxUeOy^A;(9b-Bl#gX+H8)Rhe7bD zjmHa3T&U|hmC{U2p$8YwZpjAk@%Mqt-(D?dckC^CFcthqIgXQ=)xpz|)IU!Rxla%4 zkui1#2OEg#0@jEc|4?n)Dfo}SVx_AwS7$zRidljI>L&wbyMWcbfYmQ0$n0DikoxpN zay3+M!QuYF+C#byfImMuKsoqf2O-KGabZB$D$;QdfLy0|OGMQ5&RzyQ;vlf+=^hRK z-T=@P;3D!@+xKO3EowxH~I=(p97zciWtp&9bqbpHw1!d0-Z;tef_KZt=Do%U_!m=41f zXAA032@i)-pN7xZN`^`OsuWqBwNi*9o@)TuqjUI=6Q&2E|NQ;+Xn$Spe?R+Y@E_X$ z#n`ZRoB`O~7GnvfM}spO5T5fFZ!b47!;my6v%QsVF~QHC4RsssRC$tLfLM4Z}wS z_dh?42%%2~Ae)B+AwV09q_Bn$)Yi*N&COx^sFSLRYmE2`^kADvhE9v`6pu=xG0#lU>J zZdKb%90zOqZn`cp^suUxxbv0Xk?Yt#lowRDMI`Nx^hrhUQGq7g`{s?ht(NwQ?}A{m zOFQ`@w3<7+d1s|OT0C*k-a$gg;vR#G3PD+HI1r(bO@fcL_J=Ao>8)1O6=)KFEc>&G z`(F_G`u0ZJDugxI4YLSt?e)He4b{hy3#fW9pucy}ai+TM&)RnLZsk%+IL8rg0Gp4L zs-4{+X=?1AxHR`n_DqSQBXP!;yeTH- z_f0Spv`2zqzkwEZc#Gr|&u3IeNQg$m-s;!g@raXnh|3ltEWf+#7P*gY>PC`rZQhXXPd0wGq&1^7rB3=so% z#@4-$ZFUMDJD`~>;iqjkGwN4f-4}@`Dp7eNW|%bly!NPyJKa|UqWRdUlc3dyg(#kB z09ix72sx;`?bOP+s|sPT4_?|)S6LA0AR%lKS-Brj&5d~S@piP8grY1VXH?cfuI63K zO_M#>)u|1&CWo*5eJcmJT^zOjjEgc+kTTm8QZV!_4{Tti=I|ENQUYa}<&QFCuf(s%a8Jqpo&d#1kFX#L&o$lXud zeLq#1(Nol+k#R*U%m^=e=grbTqB6Gu&~O`U&-_`)H2WLS51Jt1F{aa`DHi=M_-!j^ z-5o+nM+7cxNkSM>BDUG5uaX3F-*a7yo*OY6 zmLwf!HGx$`D2bObbv=eyJ24p4%wu=GQI$I3*Ky9_fu+&xW5DDb($=4Z<|4Yq#mPHy z_|>ni-4FC^|5R=#{$QK)*naiJ$8R6m@kCo6&vvBX5EoVwzP!<(nlgS4Pe4YeHOr2d zGNV5LPH6R6-!HwsNFcL_+zK6QYSj8{WLuC-^Trf`{ghcx5FU=1AxO)$8*2OgaTw~5 z*rZ8y!AV|nIGC;5UXYxIEPHVNG}O-x!xGsv)^#;t!nf5&WcZWHe9;W$gz`hODdrEd z#5L+VR?IYTpR%1e%A?w`_vb-%cq9}TzNAs7j#mbUcjt}n9!iNjW%5zD0i&O2kvx*& zP%1}M&e}Lxb*`ZM1#6pcyQrF`yBgF{ccit1I*v4SJ*RhK4i}bi{Tg;c3IVL#2Fe>2aA7T1kHXo2-8?GWWkU>b z!bk*=np=eOWeAdT75u~2(<KO`L%+K$w}p{|Pw#X?>KoFt8KO?k9VDR|_W+t-y6fFD z-(AL3nh;TTh`o-w>+`s1QTxr*O=>$8{X^|1i~b0_G=S7`Y@))Z&NtQ3M(-p+868sK zdu}7T(dD112f)-xMw`qgRqGm*j`*oAxjQV8*XJaMwYSUZse3s5i6wM6n$#AY`2;dh zbM*%TX_vhRNR`HP&U&&uEs{9dyjXvKTB94t3{EYY)Li zWImxvlmRwYnF5sO5dri_KA@%b3Z6^(^X|uVw6437J50z!q_L^2aTt z$_G#8sTRPi4~tSY^3{oP1v13VNnO8*Q*wmS9yt5X-%u(`Ty^Mv*qF5DF>kYiSh7bn zO+^AIUmxtQ;KI&mo`yE6jCQSGn(Wa>OS}#UA+_b_K1bPQ1CAOtNBr~d{-hc++JHFK z(e?mNYV-L!hWU4FUXrR#*bE>YELx6)FI7&J0_-e!=y#(lr^5rx;)ydk6kM3eUlKGM zo&Y}*)nSqajmL%Q{*Rt%+aUJ3(ViD4S@h8%xFNcvOngUWApxqQydh8$J-SzUPP5MU zev1pW7FvB4+a#0*dWJjU?tlpywZSris3({L{6Ikr-DrtytK%WrRz92;CMS;j2MGE9 zU!}AR3{H7Uw)LL>7U(YR5^92VVHh8P9X0T>=gaJMsnds7w(^J3ytyI^g z9RxGPOd{7^&nq*qa)dVT@P-Jh&-tZkpTjpG%Ut?fo`gcC^^U{rFwek#stkNU0y>4* znhKeI1(foK0oO4-60GdB>Ap$izZPW2j zC@UBYQ_gaai;gJ0X|>#!`8d^9nuXf-{&n-2i;Jbri}GOXutLjz?ReC zm{sOSj6h|V5{`Sl=YufIQsAYpx`AMaaGOzKkera?h4i#cRuQNKxzq4zr_a z*&TP^-}@prW)B-gsGup|)*FJRTvk83bo|9Ku?B;$8kgQv%P;xP*?5&7N_s@k_7 zA{!UwV48!uZ{!fCLiiAX*mqAshJkJ9^YYWXBLXq+($z~|T7okZBh9lOo+S)0-`k@Q zbF#loS}XuXXMsH6c!FJ5k(LtoFN{9 zNnHWT!o@RGgcDXOX}okjrOwb)`$S4zJPN@L4ao{816Y8%ZpA-`ezMXR@DsE6qe#tA zm@;MjMr3&nx79;~$kuDgAA>itw-lDC6Gh?-Zcf73^bFO8Bxg~DQ(HYY=PstyUBdEG zZZ{4GR*QKw^Gv2rT-G4ax3|?qyOyJHQ4cK+HCEVJu)hwJ_-c8J?ZI(CYCIfCgi+J{ zu~NR_SP}r#Y=K=Jb{gK@8l(&6No$ECn{Th0?B3H|H6O>k#LJ!mk^+<+SvzujB)y?~ zeU4sJe$=OovZ2La_0W4clr30Rc(}4%!`iYr*UpeGX|fn-8Yn`mwd3`>CPJhM%13Ka zK+@B3+TyidKIHW}a{E`gM!3<}W0HX###k?a`tL0oojRfw)wiVU+?y)0_=Z)#ee1!X z!xUbuM?$t<`miw*S{-&rJFb8a2yY~7tY*G$2=VhjP`F6|O6b>N8s+^5{ID&(i*{)F zvqgx)q0)q!jM`l{R>A)mvyWW=K}8K}Cd+kEu0O0XO^`2=0UC=+)E~_Huk#EdcRsV| zx8on6ZKWv9vh@n`$8_R|O=B7&9?cLxtY+$I;5ch-Mb2K9pS*2bULB?o*WPtD()Dhh zTvuH`Z%{x;*6ssJ@f}H^=#k~8Y}@W0nm0J-`myKs>S-KF`Ewg{rj_q0>#(9RHh<9p zG89;SbSI95qyI~$e24))eEoyf<_GTK>ML`Z4(E?R9Y;JsZF$o z&~E1~8ay(GbP!kH72Iq9P8=KCc{j9AnMK*H=Rs06Gon{-Vh$_47z5nH>6WWKkNb-1 z0OMy{sw?69ThELoZSESkJ&gS6mVNi#@OtwYa%`{*>?hhQ_QlQ>@T(ZWuX?e?6O*i< zX6*3Xd0Y{y%v>tv^w_<3DKEtzem7qPT1m}A6E`Ede=L1##rD4(`gwNx=IbD7f<^Kp zp#PE{?xRx@krfX2p&+Zff%CU7@`d)2L0IVG4c+zUK7;QLM`PI}t@j(thn=xBTg)Tp zj#_)IZg59UJmZEp4C==iAhl69Ir7F&5EgB!O;ECLs?l36&FnYi)-Ij&D2yCkS^Zg# zu#Cj4xLO^iZToRa{z2l#8f=7orTJa5xScV6={eZWn9v5GrjKcAJXE5tnNRDuTSkhn zN@Z0$oC^kyS+mqUhLp;#=iV`*jmuZAH_fN-8)NPqhG_hlw)C?=`)nHg*u5iFLYk#q zu2XbhRhc^Lz)v2ONv3JKI;bf!La}6i>WzX$oZd=i<{O^fisT&opi6M2wXuYg_-d(F zKwP3dY0a*zJijv0tM@$?2@$CC$@XKfPNJEnxJH>^%2QaGB~}6Nj?-F+79fwvq|?k? z4?G2Y8C0Lx{QQJeO%8h!~qVJzVMt1WY!4DvN;eC_SaZe$jx<&xx z50J-6Nw1MoX|tg2y+klcd{Jsgv&X)X+chc@lgoUPry{WlIK>)!H=Ir@6inC~LXM-y zkZh3Oc5dycflBby7 zuessj(OW&Z3Cucr_;rszgJ)EhuH{U$93BB2{pRt)B31h#sm=0uTsvt#5`B1>h;D3d zry5vD;`UO;gt(_Ao&U{&RW3>1^}&1nJ$ z7LkHso}#{{QNN2GnWKb!!E1C};Jg*bU0jZij8#$ zB|-I}Y_^w?csa4LQ5F|$3~Grj>Dy&6WObsxU98R_R#+V{CdT4=v-kH0RY36x%=(ZE z&wZCCY9v#`!u}nNqp*ER_<*{=DauFLV}Q1(kJp?(1Bz#*!=^eMCtsO%-+X%n?0E%C zX6hy|eR2N)F!C4g#rh}=V)y*J3D@%q|4v8>zHa}j2X=c^ zKvG+DdUz~V%mf#F>t9Tt)JojDw0$)W*|!VZ8)*(0I7^%XH#1sNT8H1omo#BdOxIR? zZHoWCu>bmGbhPKc(~8y9(3%AYVbgh|)F@5rKFttZt-$w5Zw=}}`?I(xZNX4ca??kg zOkTjz26he(_Q7WIGFqy5Y9_?)c2FED6GDg)CJEL-yAWXc@r5P5;fXfQH25Dx%!Bhl zKT#?V#pKd%gUJLR3ab@;L6c8@6RXDil$}&HTP++G$d@K8@aRYrq}C^phpRo8^l?i+ zTf&#VOpsb$z99iY+&~M;)*Vq6_y?k`do2;{ zmifkN_?{Uqq?e(vYZQ#w!jT>oGco5^K-sQ1N*(BtpCPY5Fz7wwN;Dz5nJIjVG4D_X zqNECe2^18gSODgs_b87qQ&3} z4+AiFADWX|L!zRmC-$}6yN*DmqT{%+DO+lhxf@olqom#4>GBjfY5m4koV#r-DpQUS zgRBsOnY#W87I9bdmN zJZ%Zc=cvw1#pc2_PegAU8Xp-Yj~}{6J_y9f0>a$nV2+Gn*SRpL_HC(hc6a|W-)7L3 zA}HuRvjpf_V~^g;HiwA$6Y8luV=kj-{(UT#!4+CqT;}{eMD-2(P7{C7g$oDg$0M?P zDySzQqq;6p;ugITr)gU3J6gO!7xYFEvwx>4lriC7eZ2hhrV%)NQE zw{qm<*zu!(*^m~mPO=$qTsC-mctnAIoT|>%m-FRy_-$wuaHz?|)wNL_DMsXRJte^D zMnA1$-1vD8ZvxgmPCqEqVE{BiKY?A62hL(!P)so>rvLIu|A#l&`}9K})e>x>xs>W^jG*V=78_#o}<6Z4}326FAF#$ z)lzRh`u?SnM1mnk`*KS&9DI0_MeaDjrutoD9I}NGwq{$a;-aYRe-G>UOJK8jm=%2(I;f%*&O_$?| zd93=aY!>lVhK2_U?$Qi7YJNo^3WMzlq9Ywn>?|iE`w`&;InZ9}2lEgr{B~%>Ob7mWfUdD_Z!^(WK(RAy0n#d zvGTLQD~I3iutRrH-uv3h0gK-UJUc}6?!C!JN58dP7rXzfA}44SXXrjyARA7V(qe;- zp>n4WkArz(SRq=#GuFF_=@o`iV8wZpD<`v5?C!g)f9AB$nN9qLlw$9g8JrbYlinWh zG*G$GxvNPizf=9}+ba{c#-mmh*5Kvw@@#L@U!~B)>?3{QW^-OwSfijkla;`d<`4V! zjz+LO`F_B}*3|(CnX}N_fD{?V18-1GS90L;Qh(cxigS9D&Fo82N(b#qZx&tbq>_Ob zz>XeuldFwjIU=PRM#k4&%s6AEavxh$lq#Y-1h4e#i27C)89w`_fI!U}hbUIQ0AXMJOGHx@vlsX?(G)#SFo$vvfV7rZAz1v3kQQo!8kuSYD+*{kPd>=9ZJX7tsO*Pp^Kp=-Xs zow%^_!|&c(yXvCb6}OF!37tOS?aE=ibIuj7#06h~Ix=(y+vj&aE_hWV=`v!j4$Y%e z_CNEo=|hxZ#?d-myGGK_&kpareNn zjowp&dVlcxZyib+j)wI<_+BCF)}NJm!YIWC;`)S7F24GOa<+n;NftiIpnB7x<6vKc z)jEF2t5J3;l%fQiLI_usX7=N69|e&lqWc^4Niqs4mkS+dXxq$;nA-ilL4pY*o&XgsdS&=~eouQLT@ z2OJFuMHI>g+tdZ;?*se2?*g`OK4ooArq@n1NMd|rs~#cq?AM2IglYbH!w28r9QXWI z-`rY4Ho_Ao^K~O7$xAX<`YgD&!bM=uSda22sjqk+$}v0YOsWbo@4Dy_#LdSz+8x?2 z%8}xH1y0{mZ@Rv}!?nhCH@;moF3`M*%U7H^98?A@B|pxAh40C_ZbtLBkT!MSZ}y5- zZ-aaH++So>+8T>flLEY$UDM+56?G`uN&4BEk%D0AgIYW1@UxPx=r zFz;s#_$n)xWPhdZ_3pi%te1T)?ChQsRq^vk@_wt3@e&iT&^S35y_W2e9hHuS~E$(>{6w=0Q0*tA=(=Hn;iPMvZO)6Hd_ zf=5D_{fuRi?nS4d$5eg*^tpk2uGVY(&x=Xd3HcF=c`C=Qq7 z4O45GH%r=(Z<%$k8)Qy0|MqL#`Fj{CkXc%ouXA`rEDl#INxAkyk;QSzG?NO|oWKM9 zf~NHu8N(sTAg&!>_CVv)glrj>xGX@UQHZb`dq=k^ z!Or7~SCT3f62wKsXAhY=A*1oudB*yCcRpUqr@f!g(lmt z=QfB^D&h^q;#$l(;o`xDXKw+-tHB*CeKNBRKGV+(;25phi;YT$E-rGF-y>*$CTy)w zh7c#el}*Q(x*9~!x;VQDtH$9leNaE1&ao!G^6hA-#76nHeWbpkuRrD8y%{ z$BjTUCBa&#CI5QuT#rPhV6PGETlCBfXMFqpfjeVh%>v4Oj9<4od&8`8QUGUsz_1No z;VAgjBlNn~%53AiX8XXcTEJ=4%*tYztdosZ3C?4ALF=Q+WWdhL4Qte2c5=2F`91<- z&$LSve15fNm-$%i+tzjQ-v*D)<~ zHl?X42`-ZK4B4|DXjXgz?yQpWEUrt73GAD?iBh$$|7^>Upfz!;?#^8>c_VtP7VY>r z`NiW%_Hf?u=-*FSC35x(1jPG(m~-!hgTy-*+mE(zOXy~VRLP?5!|+3mDnYQ~%Y(nl z0vG$&)$v&o_8|3$ZqG5}r9JVAwhs=1O7L@D%B1iZ<_`dvp|qalSGw z)ZQ)cG0EB|M|ToseSQVkwD*NLHJiCcaoo80`|_jR!q^!#guzHdU3ZI+;@s7R&-c>X zK;lL>I`nuVf4uyVp=&0&8WqG=HYssvGgseATe|(#g7|rkN_7O?zHmc~N0u+

fsB zoI{7T96(R z%=?2T2JAW?*Y9;wQ+_pRrN1#25AvmP60P3dzR#ueKD0xOc^9W&YgMC-aF_R?lSCh@pQO%_DvK+xEMUaCyR^nmCrQ@A9xWg64 zYJLoGV0VF((?uH}BEt}nY*~2&E&;nS#Zit4J5FgZ(ATME1Kb1lYr8X#!v=xO86&LP zge-$FuVPHvId#~5RO^B-Mv-@aw4wk}_t+}??)RPq(0g0)$94F}XVSzcPY3cfJ^*+R z#2Q2M=2Xiw@z35AT)U#MYKcM2>l7N8E3?Gea#OjYeR!fg60Q+uz(qiU-J%4D@8ko-E7f^~98ile+vhjD)wFJd|hy>#JJ<?zHxQ=MB9GTUNQo%~_(WzC+W>^F*v40!GuSM=?{#bHs=-j(xo ziMiaE-O{X%Yws>IUNVy2?)%c?eM72k&IxBGqm=+8fN$A55lvbX%u{)AvnyB5dQ}S@ zzhhD_5tQC9aH6KX&2RP<7}mc^x_XCLpw)sl|nhN~`_ zw4T@Md6ootXb#Wra6Z`l^+HyCkvPfG6iG;EPiNZ(sO0rP9e1L%r?bP5BvkWGg{?Av zm}R;=yZ$(3MdN|V!5&LR^-K8HigGKJSjX$c)shzJ+cgaG?p{1Exs|~aZTMTh-`bCE z5TO{@oKzCOQs8VPX7H=_z&*g6rwr0)x8c4;zVP(alrOBn_N2*r~|cnoVqG~Lb@YWEZfzF%L*D|5AQJ2Io0 z@(lPkpD%$mwbluXU&FKuStB)=yNWkwjpk3B59_&8pu z|1n#Bt5(I>%J;XjUvwcg`W>uO8||vIe(X^feA!PfQ1%p(z`Z-yt^k2o9^AnfePM0R zW~dMI)mUI5LsVlm^f;Lm@QlaxKpY5+Ze;b~6GuR$^ZedD5vfofb)yr1W?3fV&kUWT zzPR$RJ)v#a%^?!7#w}ohU;Cfrx$smSO2TI++L_oShO40=ZHMvO!hHCv74gFBmHFxf zod^MnASm}p-uXNXFD2T{Q9tDvA>C+OfH6s|Cnfv$A3|HR8DePZ;@O_w20v%b?#C9} zyt_4mYGBTFL;MZH-|DX*Sz&3hC^0cjA3+*s4GFY&?=tjo<0C(XS{;szoMQC z=xJLKpFQi5#O1Zols559((r1~N7J>w(@7HI&A=L6KQDJ7AxS~(l7lX-Kt=8%e%Wg> zJ#j-cxu_)!E%n-oC3xK@j3HK-$RqTnYZVvfuQy+RvvY+H2R?U*H*0~S5{aDec z!hc7#wsTpe7J^yuTXz7x9kQS$7nBT)owGYm!)6==F2YPNojZt?-s64lAiOqGLf!x= z4K3`8omD!S&dAxt#d|8uPrb|`W5P09`7bo4eq->Ktvm|(y8TXYM85NhdGGE`>h z8U=2Tzc+XGrO~eQDSTE&$k&(;GxFr&i6{IZp>O^Oz@h5ik_pw0XRELOj*e_z7n=)L%Mw2w2SBI*}j@1gJ-pL2HGC{t@pXpfP|Qj@6=JV-fdel z4J%r=A@WVe*@5hgsqO=_|GD?KQ{W0t#_R6eBIBoJX4@S9oBF`TixFva2KzQuAIsmw zgOPOE+yJc&F2pt7X~GzLVIk=W){i>;KTo(hXb?n$^34)^_1Fv&W)y7aGGNpvLCA3Q zVa$xHu29=D_Mg6pD8=PUAM>O*ztpvougoq#TV}2&(pwE=0Dz~r4!l{UE;_B-@!wB* zy$nk>c-zwkIdJNPCE0!IM#uUO8TvnM#GnqV(atd(tee{mXF-Nz|D%4DbgI4Y^_y}R SAJcnVSB-95s=DYD_x}J{tttTk diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less index 07292b1db..175f825da 100644 --- a/apps/common/main/resources/less/toolbar.less +++ b/apps/common/main/resources/less/toolbar.less @@ -515,7 +515,6 @@ } .item-chartlist { - //.background-ximage-v2('toolbar/charttypes.png', 250px); width: 40px; height: 40px; .icon { @@ -530,118 +529,3 @@ } } -.line-normal { - background-position: 0 0; -} - -.line-stack { - background-position: -50px 0; -} - -.line-pstack { - background-position: -100px 0; -} - -.line-3d { - background-position: -150px 0; -} - -.column-normal { - background-position: 0 -50px; -} - -.column-stack{ - background-position: -50px -50px; -} - -.column-pstack{ - background-position: -100px -50px; -} - -.column-3d-normal { - background-position: -150px -50px; -} - -.column-3d-stack{ - background-position: -200px -50px; -} - -.column-3d-pstack{ - background-position: -150px -100px; -} - -.column-3d-normal-per{ - background-position: -200px -100px; -} - -.bar-normal { - background-position: 0 -100px; -} - -.bar-stack{ - background-position: -50px -100px; -} - -.bar-pstack{ - background-position: -100px -100px; -} - -.bar-3d-normal { - background-position: -150px -150px; -} - -.bar-3d-stack{ - background-position: -200px -150px; -} - -.bar-3d-pstack{ - background-position: -150px -200px; -} - -.area-normal { - background-position: 0 -150px; -} - -.area-stack{ - background-position: -50px -150px; -} - -.area-pstack{ - background-position: -100px -150px; -} - -.pie-normal { - background-position: 0 -200px; -} - -.pie-3d-normal { - background-position: -200px -200px; -} - -.point-normal{ - background-position: -50px -200px; -} - -.stock-normal{ - background-position: -100px -200px; -} - -.pie-doughnut{ - background-position: -200px 0; -} - -.surface-normal{ - background-position: 0px -300px; -} - -.surface-wireframe{ - background-position: -50px -300px; -} - -.contour-normal{ - background-position: -100px -300px; -} - -.contour-wireframe{ - background-position: -150px -300px; -} diff --git a/apps/presentationeditor/main/app/view/ChartSettings.js b/apps/presentationeditor/main/app/view/ChartSettings.js index 8bedf958a..6785ca887 100644 --- a/apps/presentationeditor/main/app/view/ChartSettings.js +++ b/apps/presentationeditor/main/app/view/ChartSettings.js @@ -119,7 +119,7 @@ define([ value = props.get_SeveralChartTypes(); if (this._state.SeveralCharts && value) { - this.btnChartType.setIconCls(''); + this.btnChartType.setIconCls('svgicon'); this._state.ChartType = null; } else { var type = props.getType(); @@ -127,9 +127,9 @@ define([ var record = this.mnuChartTypePicker.store.findWhere({type: type}); this.mnuChartTypePicker.selectRecord(record, true); if (record) { - this.btnChartType.setIconCls('item-chartlist ' + record.get('iconCls')); + this.btnChartType.setIconCls('svgicon ' + 'chart-' + record.get('iconCls')); } else - this.btnChartType.setIconCls(''); + this.btnChartType.setIconCls('svgicon'); this.updateChartStyles(this.api.asc_getChartPreviews(type)); this._state.ChartType = type; } @@ -200,9 +200,9 @@ define([ var me = this; this.btnChartType = new Common.UI.Button({ cls : 'btn-large-dataview', - iconCls : 'item-chartlist bar-normal', + iconCls : 'svgicon chart-bar-normal', menu : new Common.UI.Menu({ - style: 'width: 435px; padding-top: 12px;', + style: 'width: 364px; padding-top: 12px;', items: [ { template: _.template('

') } ] @@ -215,7 +215,7 @@ define([ restoreHeight: 421, groups: new Common.UI.DataViewGroupStore(Common.define.chartData.getChartGroupData()), store: new Common.UI.DataViewStore(Common.define.chartData.getChartData()), - itemTemplate: _.template('
') + itemTemplate: _.template('
\">
') }); }); this.btnChartType.render($('#chart-button-type')); @@ -320,7 +320,7 @@ define([ rawData = record; } - this.btnChartType.setIconCls('item-chartlist ' + rawData.iconCls); + this.btnChartType.setIconCls('svgicon ' + 'chart-' + rawData.iconCls); this._state.ChartType = -1; if (this.api && !this._noApply) { diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js index a38db7495..8f689852c 100644 --- a/apps/presentationeditor/main/app/view/DocumentHolder.js +++ b/apps/presentationeditor/main/app/view/DocumentHolder.js @@ -3458,7 +3458,7 @@ define([ if (!menu) { this.placeholderMenuChart = menu = new Common.UI.Menu({ - style: 'width: 435px;', + style: 'width: 364px;', items: [ {template: _.template('')} ] @@ -3480,7 +3480,7 @@ define([ // restoreHeight: 421, groups: new Common.UI.DataViewGroupStore(Common.define.chartData.getChartGroupData()), store: new Common.UI.DataViewStore(Common.define.chartData.getChartData()), - itemTemplate: _.template('
') + itemTemplate: _.template('
\">
') }); picker.on('item:click', function (picker, item, record, e) { me.editChartClick(record.get('type'), me._state.placeholderObj); diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index 26051856c..71f68771f 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -1112,7 +1112,7 @@ define([ ); this.btnInsertChart.setMenu( new Common.UI.Menu({ - style: 'width: 435px;', + style: 'width: 364px;', items: [ {template: _.template('')} ] @@ -1126,7 +1126,7 @@ define([ restoreHeight: 421, groups: new Common.UI.DataViewGroupStore(Common.define.chartData.getChartGroupData(true)), store: new Common.UI.DataViewStore(Common.define.chartData.getChartData()), - itemTemplate: _.template('
') + itemTemplate: _.template('
\">
') }); picker.on('item:click', function (picker, item, record, e) { if (record) diff --git a/apps/presentationeditor/main/index.html b/apps/presentationeditor/main/index.html index 56f0d0641..7f7060d5c 100644 --- a/apps/presentationeditor/main/index.html +++ b/apps/presentationeditor/main/index.html @@ -284,6 +284,7 @@ + diff --git a/apps/presentationeditor/main/index_loader.html b/apps/presentationeditor/main/index_loader.html index 4d37d5841..679142047 100644 --- a/apps/presentationeditor/main/index_loader.html +++ b/apps/presentationeditor/main/index_loader.html @@ -257,6 +257,7 @@ + diff --git a/apps/spreadsheeteditor/main/index_loader.html b/apps/spreadsheeteditor/main/index_loader.html index ed2469838..b098ed4bd 100644 --- a/apps/spreadsheeteditor/main/index_loader.html +++ b/apps/spreadsheeteditor/main/index_loader.html @@ -260,6 +260,7 @@ +