From 22e130d9dbe086d9130db10b4612389bb22d962f Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 16 May 2017 13:06:23 +0300 Subject: [PATCH] [DE][PE] Change icons for selecting bullets/numbering. --- apps/documenteditor/main/app/view/Toolbar.js | 33 +++++++++--------- .../img/toolbar/bullets-and-numbering.png | Bin 0 -> 1824 bytes .../img/toolbar/bullets-and-numbering@2x.png | Bin 0 -> 4409 bytes .../main/resources/img/toolbar/bullets.png | Bin 584 -> 0 bytes .../main/resources/img/toolbar/bullets@2x.png | Bin 1180 -> 0 bytes .../img/toolbar/multilevels-numbering.png | Bin 1518 -> 0 bytes .../img/toolbar/multilevels-numbering@2x.png | Bin 2511 -> 0 bytes .../main/resources/less/toolbar.less | 10 +----- .../main/app/view/Toolbar.js | 20 +++++------ .../img/toolbar/bullets-and-numbering.png | Bin 0 -> 1824 bytes .../img/toolbar/bullets-and-numbering@2x.png | Bin 0 -> 4409 bytes .../main/resources/img/toolbar/bullets.png | Bin 584 -> 0 bytes .../main/resources/img/toolbar/bullets@2x.png | Bin 1180 -> 0 bytes .../main/resources/img/toolbar/numbering.png | Bin 1146 -> 0 bytes .../resources/img/toolbar/numbering@2x.png | Bin 1889 -> 0 bytes .../main/resources/less/toolbar.less | 9 +---- 16 files changed, 29 insertions(+), 43 deletions(-) create mode 100644 apps/documenteditor/main/resources/img/toolbar/bullets-and-numbering.png create mode 100644 apps/documenteditor/main/resources/img/toolbar/bullets-and-numbering@2x.png delete mode 100644 apps/documenteditor/main/resources/img/toolbar/bullets.png delete mode 100644 apps/documenteditor/main/resources/img/toolbar/bullets@2x.png delete mode 100644 apps/documenteditor/main/resources/img/toolbar/multilevels-numbering.png delete mode 100644 apps/documenteditor/main/resources/img/toolbar/multilevels-numbering@2x.png create mode 100644 apps/presentationeditor/main/resources/img/toolbar/bullets-and-numbering.png create mode 100644 apps/presentationeditor/main/resources/img/toolbar/bullets-and-numbering@2x.png delete mode 100644 apps/presentationeditor/main/resources/img/toolbar/bullets.png delete mode 100644 apps/presentationeditor/main/resources/img/toolbar/bullets@2x.png delete mode 100644 apps/presentationeditor/main/resources/img/toolbar/numbering.png delete mode 100644 apps/presentationeditor/main/resources/img/toolbar/numbering@2x.png diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index 9ee7671c2..a8fc490ed 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -1603,15 +1603,16 @@ define([ this.btnNumbers.setMenu( new Common.UI.Menu({ items: [ - {template: _.template('')} + {template: _.template('')} ] }) ); this.btnMultilevels.setMenu( new Common.UI.Menu({ + style: 'min-width: 90px', items: [ - {template: _.template('')} + {template: _.template('')} ] }) ); @@ -1716,19 +1717,19 @@ define([ this.mnuNumbersPicker = new Common.UI.DataView({ el: $('#id-toolbar-menu-numbering'), parentMenu: this.btnNumbers.menu, - restoreHeight: 164, + restoreHeight: 92, allowScrollbar: false, store: new Common.UI.DataViewStore([ {offsety: 0, data: {type: 1, subtype: -1}}, - {offsety: 518, data: {type: 1, subtype: 4}}, - {offsety: 592, data: {type: 1, subtype: 5}}, - {offsety: 666, data: {type: 1, subtype: 6}}, - {offsety: 296, data: {type: 1, subtype: 1}}, - {offsety: 370, data: {type: 1, subtype: 2}}, - {offsety: 444, data: {type: 1, subtype: 3}}, - {offsety: 740, data: {type: 1, subtype: 7}} + {offsety: 570, data: {type: 1, subtype: 4}}, + {offsety: 532, data: {type: 1, subtype: 5}}, + {offsety: 608, data: {type: 1, subtype: 6}}, + {offsety: 418, data: {type: 1, subtype: 1}}, + {offsety: 456, data: {type: 1, subtype: 2}}, + {offsety: 494, data: {type: 1, subtype: 3}}, + {offsety: 646, data: {type: 1, subtype: 7}} ]), - itemTemplate: _.template('
') + itemTemplate: _.template('
') }); _conf && this.mnuNumbersPicker.selectByIndex(_conf.index, true); @@ -1736,15 +1737,15 @@ define([ this.mnuMultilevelPicker = new Common.UI.DataView({ el: $('#id-toolbar-menu-multilevels'), parentMenu: this.btnMultilevels.menu, - restoreHeight: 164, + restoreHeight: 92, allowScrollbar: false, store: new Common.UI.DataViewStore([ {offsety: 0, data: {type: 2, subtype: -1}}, - {offsety: 74, data: {type: 2, subtype: 1}}, - {offsety: 148, data: {type: 2, subtype: 2}}, - {offsety: 222, data: {type: 2, subtype: 3}} + {offsety: 304, data: {type: 2, subtype: 1}}, + {offsety: 342, data: {type: 2, subtype: 2}}, + {offsety: 380, data: {type: 2, subtype: 3}} ]), - itemTemplate: _.template('
') + itemTemplate: _.template('
') }); _conf && this.mnuMultilevelPicker.selectByIndex(_conf.index, true); diff --git a/apps/documenteditor/main/resources/img/toolbar/bullets-and-numbering.png b/apps/documenteditor/main/resources/img/toolbar/bullets-and-numbering.png new file mode 100644 index 0000000000000000000000000000000000000000..7831c5018c53d8f69b8e603462f0b8c874f47d12 GIT binary patch literal 1824 zcmV+*2jBRKP)u_1eF?GxH zX2X0?1?Ss0dSSwZ$xYsuck+GoOVW4=zlj>Es9Yt&B9_9j;xYNw^%ME-!0LUxyt!rStH`1J}CChVwaGg$e_T#aU1 z*NTiqKj<0I?9=%NpqbTqm)PkMfbW;Oezs=MduD-qY89>7i&JO5EvO0dcoS;)@|7PX zvpbcVWrTHK4IeVtdZPOGUx+Ya!h|_f4ud&^s^1}*QOY=iId_!uIX|0HUOj5fs<&Nr zz3OLvce4tD8Rsg38TYW-t{;*xVd;xNGEK2mTmzMEdQrm=US_e_G)!%8TlL4X%s*4+ z-NfQE4dy*wS)IEz-URygN2o;ul?&W*4bA{!KoX}xT=OR*f%F-*r`$~%2i&0zsn zL~Fz1?r$$D%ggpRmKsGWj%1Qpbfa5`xeqV^M2vh_zGZf&6OMjFFs%p)h zge~A5zJW!bwST-Qm@C3mc6@uxlwUXq8YG8IWSmpb3-uqV|M-Q49bdfs!Wr}vzzMVg z&wjI>V`A~yML|V*aD;t(vDk4=;Sw}2X8-{#3{Ds=odBlnTD*)2fZ4)x#!BE|VwCX)y`Q+OC`ht^5wxusGC9C(BwQq57Zu zM%UT-eHs3sFnw8YQ_Q>NY;EZ?jARixbjlx8OkWoKZA_qWn4ie44-bRUJt#|e|9ZH4PVLxG603vBP z!3^^aYiE>K3`~G?s;~6P0dc*u7*&t%HO5v2=S(54A7SEmpg^`ktda+0^vSb|HE7&_ zRR3r%eW?jP7|9~613JbPbHehH|F?PcD9=EPl(HWGO%Y3@wm+T2{1yn)~FJe!c@sP20SA!c_|Z O0000RAtNn literal 0 HcmV?d00001 diff --git a/apps/documenteditor/main/resources/img/toolbar/bullets-and-numbering@2x.png b/apps/documenteditor/main/resources/img/toolbar/bullets-and-numbering@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..2839461c1d2cc73fab059159df0272b3ad467fd1 GIT binary patch literal 4409 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 literal 0 HcmV?d00001 diff --git a/apps/documenteditor/main/resources/img/toolbar/bullets.png b/apps/documenteditor/main/resources/img/toolbar/bullets.png deleted file mode 100644 index afafb23274a94e8fd6e38f5806fe515fdce4ec7f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 584 zcmV-O0=NB%P)QIJIrtwxim%j?=k^XurJw*7#=b^ZhdGC3XsB z${gA4g>qR4*}>8WnG-P^l^ACx(eOf(IEu5MJeb*NIB{by?zPd3;=sX!hRs4R#(@io z=Ab;t#T+!P5)-}IYxyIdBb&+7g$tgHO`^!e*V#;-0^uL8EQ>N@GJ;h8EiF4cEeoi*2SKeteE0dLx?0VVt z!`X1%{#3t#G1W=#8>URzv4>9V#gJ969T;!jHDvQg%s!5Oyldov5Mq2{1Haxn?sOEe z=&Xm#57th<20G+u8H99 zG3da8Nt6(TOcaR&ESO4UIh#$SoEVWm`_wL5wfJN++qD*DG0TZUOkDp@zhHM11s;X$qWoE$(}BbAr*{oF1a5(svyAf zAaJwOA}0Qfj+W;NTw#oC^BP1O7~b7^zWndrrLr?m=iCwxIv{Plv9s4FCrNnrjU#Gi z8y}RG?CH}KsJ^W`W4EC23+ZXiS*vm_zjpSl+9u7dl$lV-sL*I)6Yxo8=b|Ie=g!dl zb3n{ct=+|W<|3UZVQ&>~$Mwi9+&WcFcnVu;ql1^M#0Kf^2{F+VBOlrFUhBK~pr*6= z?a>tx*2m^=oU}uFadUP=(#cKxk_8);cN;Q$xo6D&D!aI1T8sO={zB(m{;dj=>=U^D zzqwy+KW+N0O4bKT_6Z?3|Ie@W+;n2SVRhznKBt_nM;3kmpB?O77!b#`--XU38#KCSomIHj@mADeHp{N1M~ ze^_h(uP!#9f9~a!|8^FK@c~&+E2zwiQ@5YUr;a?AUZC3Tn(p;Lnlny z(|zaf{FE{E83)u{IQ4C};kj+QPd|SARB!&~w+DY^TzH(bTbpOM?73~H6C=tjZr91T zy$}6z_}JAqJI{RC{5Eet?}`dn<(9JG%A`ei&fff%f9wDTn4)dY!^6`f_9Z+i0S)~9 zTNklkWU=O@u1g~6M>D%NHBIYFWjrmjVL_^$^n|04%U0B+28m5HKl)Vrbke6~9W}1c zeFcAZotvHXNp!aP(I?tw`CTW%OYVtGT;H+BHQ{H?)A{whr=M&8_px6*|LNyvt*td5 zA2Y$d$HpcWosht++;^il^Y^N}8&`t1&Rb)dXtqSQ`1X41#I3B|?$ukq?c+{6elF!jsS*<5Mz4KKQzE4>ll2gp*75i** zlhe}t19`1pU2Yt?E52Nik3u$Rh6F0Mk;-Tzs$Idy;f<5vbVlboFyt I=akR{069Q9$^ZZW diff --git a/apps/documenteditor/main/resources/img/toolbar/multilevels-numbering.png b/apps/documenteditor/main/resources/img/toolbar/multilevels-numbering.png deleted file mode 100644 index 4c4251d923d230d596f6f61f0c9b501723b5edd8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1518 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')} + {template: _.template('')} ] }) ); @@ -1262,19 +1262,19 @@ define([ this.mnuNumbersPicker = new Common.UI.DataView({ el: $('#id-toolbar-menu-numbering'), parentMenu: this.btnNumbers.menu, - restoreHeight: 164, + restoreHeight: 92, allowScrollbar: false, store: new Common.UI.DataViewStore([ {offsety: 0, data: {type: 1, subtype: -1}}, - {offsety: 296, data: {type: 1, subtype: 4}}, - {offsety: 370, data: {type: 1, subtype: 5}}, - {offsety: 444, data: {type: 1, subtype: 6}}, - {offsety: 74, data: {type: 1, subtype: 1}}, - {offsety: 148, data: {type: 1, subtype: 2}}, - {offsety: 222, data: {type: 1, subtype: 3}}, - {offsety: 518, data: {type: 1, subtype: 7}} + {offsety: 570, data: {type: 1, subtype: 4}}, + {offsety: 532, data: {type: 1, subtype: 5}}, + {offsety: 608, data: {type: 1, subtype: 6}}, + {offsety: 418, data: {type: 1, subtype: 1}}, + {offsety: 456, data: {type: 1, subtype: 2}}, + {offsety: 494, data: {type: 1, subtype: 3}}, + {offsety: 646, data: {type: 1, subtype: 7}} ]), - itemTemplate: _.template('
') + itemTemplate: _.template('
') }); _conf && this.mnuNumbersPicker.selectByIndex(_conf.index, true); diff --git a/apps/presentationeditor/main/resources/img/toolbar/bullets-and-numbering.png b/apps/presentationeditor/main/resources/img/toolbar/bullets-and-numbering.png new file mode 100644 index 0000000000000000000000000000000000000000..7831c5018c53d8f69b8e603462f0b8c874f47d12 GIT binary patch literal 1824 zcmV+*2jBRKP)u_1eF?GxH zX2X0?1?Ss0dSSwZ$xYsuck+GoOVW4=zlj>Es9Yt&B9_9j;xYNw^%ME-!0LUxyt!rStH`1J}CChVwaGg$e_T#aU1 z*NTiqKj<0I?9=%NpqbTqm)PkMfbW;Oezs=MduD-qY89>7i&JO5EvO0dcoS;)@|7PX zvpbcVWrTHK4IeVtdZPOGUx+Ya!h|_f4ud&^s^1}*QOY=iId_!uIX|0HUOj5fs<&Nr zz3OLvce4tD8Rsg38TYW-t{;*xVd;xNGEK2mTmzMEdQrm=US_e_G)!%8TlL4X%s*4+ z-NfQE4dy*wS)IEz-URygN2o;ul?&W*4bA{!KoX}xT=OR*f%F-*r`$~%2i&0zsn zL~Fz1?r$$D%ggpRmKsGWj%1Qpbfa5`xeqV^M2vh_zGZf&6OMjFFs%p)h zge~A5zJW!bwST-Qm@C3mc6@uxlwUXq8YG8IWSmpb3-uqV|M-Q49bdfs!Wr}vzzMVg z&wjI>V`A~yML|V*aD;t(vDk4=;Sw}2X8-{#3{Ds=odBlnTD*)2fZ4)x#!BE|VwCX)y`Q+OC`ht^5wxusGC9C(BwQq57Zu zM%UT-eHs3sFnw8YQ_Q>NY;EZ?jARixbjlx8OkWoKZA_qWn4ie44-bRUJt#|e|9ZH4PVLxG603vBP z!3^^aYiE>K3`~G?s;~6P0dc*u7*&t%HO5v2=S(54A7SEmpg^`ktda+0^vSb|HE7&_ zRR3r%eW?jP7|9~613JbPbHehH|F?PcD9=EPl(HWGO%Y3@wm+T2{1yn)~FJe!c@sP20SA!c_|Z O0000RAtNn literal 0 HcmV?d00001 diff --git a/apps/presentationeditor/main/resources/img/toolbar/bullets-and-numbering@2x.png b/apps/presentationeditor/main/resources/img/toolbar/bullets-and-numbering@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..2839461c1d2cc73fab059159df0272b3ad467fd1 GIT binary patch literal 4409 zcmZWtcQ_kd+mG5K)TWWz9;+p_N{y;jvuZ{u2^v+2Q8i=Ms)#*nZ?$7IRuw_1S+&Jz z?GdF~N)@l?`TqId=e@7%jDPO&yU%_9&bdysv5^jt?iw8c008RV*EG3Y4FCX2D9z;t zAQ}c=005W)x|-@{zH_8;LuPV*2FfoOKStxL)S{hajK(44Y+nG><~T+Rb)I+l0<}B4 zq1TTxd}zB3-gEQW_}cRbZe=*cDX#xLaX_kExtw5y8*th+)OwII}yMb`wH(kRxgQP8fm#3b=(RDDiz5Q8=BlNG2 zJomkkLfi+}Oru#%&5Sy6-)$|2svvC{?4{XO4hCJ)ck)uDs#bohmGWD;s3>kk%>SlOI@WnR^XVK$V!qp2=Sj^kujRqh7yM%x$n7w}C(k1Bx=YWZ*zA^u zxV%sz=A)i?#y6KCI^F14gdnA@iCBrUL|VAE-bXWSnc4)1uk87Lc5CMF$CJS~d%<3d z>*FmsOQ%c34yBd4lq=-_BbC>YE=ZfX$A_H*GCvzK2e+Ut>KzpY*%+XLenDmwOP%Z5 zHcS978~;|=KGv^lGg{716>+Mm6v99Hv^jE$wEeSHuATHl$L^Nj+=1X^$HL3b|B(!o zkA=3jI9Rn|cky?{v;%&DIW32=VOI}o!Gj>~5e{-NK{Ky1m3d_X@e5l%01ewQnt}ym zzl-;uKO#X4{}z&z!vH%MSB9E4{l5Wa-G`R1Mx_>W875k!ltLx6O&i%8WhLpM>migk zekg`WLY<-IY>kovZkR#KwBA)i<`c|FmcRjfjzaIMguEN(qa|{YEwOgaK3${?J?|&p@Qr-xqtYh>o}js^(nY4N46t$3?5|;G+a>5NdFTYNfj4XX z;7)nQ?!?P@i=}LN75$#y^aDddsG8;rLly++@QgtcS#vm)&PJ+fT$Dr_JqnN^Yby&7 zwg-6{Z#$@pt-hHcpGj>nDS|*5k~E$&Q9N_~y|jhW&&l-n?U7`^bDk_t;&OM6OL~{- zkXQT@zk6}-d*CE^_aeAM?!V7XoB9u~k8>EfvjdSLd0M9X!MiK*L5GCvBX*WDe^q_1 zx1Y$y>Bq)I4%6P5{q%b%8|P~H9%VGczg49OSNY87NifpgEi#&kppsL2D}<~bndEGW z`TRt``#Kxu*U-@Q;e;bA0R&NYuVi-rUiq2nts{Gk#ndyG;_|aJ>}-(puj{&H!(?a` z)1=04mDGs8gvt+7TVT8!`mOe=89C|r3{H7G(r6OcU~PG^1p@!8NU)Wb%@ur5=FGxs z8pAP*Pb@f+kEA|9GN$PYN7)k_<*r^!6XT&h4NlN=70~4DH`_1Uy4xS}3$RvK;JfB+~JzC3ogn(YQSQ z)5*x(>ik%jqYw4(tE={&go97VKFK7cDBG$Y#Lb`xcsp&{e)R0J<LIwBT*i#iIVXx<0dpmU0$uarlc!6gnF9-^#96k-(YIrqr&2?pNwHY-2f1DBEY zQB;zBn;$ZguYn?HTgB>sD|@>ipE@1UfaL%-bK-ZFvoYP;v$1|$P^_o8h%r@um~&9S zB70bbVu_>lh!})KH!h31(BWzn{lG08a)M>)x?LnB-I2xu0*r_jLgB53&aY7t~;)z+v| zx^Dtk2V{d;SL{0foV!}(9BARj&IE?! zr=a^HcFHjir2(!!osZ5(ysFNbq;|O7UL8LR^eCyVr#!XPNp7V0z+jd+%7R~+VH1Bh zQQIdH!YDOaSx44Ex#JKcfTJgG{~m`N0)+eY*|*YqIxpjct))#2@ej(BY?Y1-+VRarnoyrF_KtEO^!QC#GVkP4%SD;p3I1 zfsONH9>mC=!PuUPvmefC1e^69|7TljNsZ=Pj;8c^MP! z>5Ch$0(Uyv(f^DVLU!MD zA^CoVPoy7{eG!O%jrkBn;+48AgP5Gme-aRy z#iwn;#Z2RpK`+8fnd7gm{yLRa@=Ys@f&w}WO_){&qqX^uD%)i&o)f7E``s|KrQ=uX z+ZEm#Y3bVHrdpHbW9{MejecHV@gVrQEX1Hao2^tjLd*but*P3B7*wHfr7-aq@RyI!Q2Z@Vz@Mz| zQVz@b#~S(aWe9Sn_5NHBZ{CZgT(9_$Z>Lz|R5L0Da8q8=3p5u#K}+N4>6;dWzs z7}!9VT4GCxs&cW0DdGP1#}IT>4FzS1wBwYD`gb#mx%HCwjAf#`oU_6S*zk=aY`809 zH!}If>D0$wNugL6GM8_iBtx~^LQqW7L+3NPlT$Ct92PFVv=5Cq*K`hyoYkD zRvBKe7E6@9_pNJejy_cYr}B33NPsoe{Ke{dZ+AU55BS1IH^dI>KP7tMF-~-Sh1zlz zXAz?F@CY-pJdn!6IStZqDBND}527P{(IKaD0?iHbJ-rT7QM=ZS-5>p;6I_7eLGGNa z-ckC1CjQ(;jhePt73u0LW=ur5qD>Qwh;&4@7l-(cp1f;b53SJNi{7vG%E!Cr_8OT( z!Sky!=?}|d72lr8uxvM$04HccSGr^(f9#YIs9==bkBGTS{L4f+8Zdbj&uX_o+s}#e zEWL@bA-H;I7z0;4IR$W@AM3dEY14fqjbRt4(Z%jpFQW7`teqw|%7Uv8U~ zRv6KlW)Rq@Iy^F^{afSVHH+X#3b&s7-Q?@kKLnXVHZ;Nx2DFR`_qnVYJEdocupMGQ z+`kv!u71#jWmg$p*WlxMqim(ytG2A+W65a4;EYSk*`H@_`rO=vP=l|M-IbiD zPl)R(=1}9HlFIT}P~ii+txDe!SiSnmw)wBZjoCZh7QP?5OVuumZ<4mwxoeZQc8ke# z!1R;#ui2#*8lMM(Oq~kzB53mN|v7zdu*@&T=ry~9Ev_5?v(Yd<`5Axrnaz*ce7Y&mx zd@BpdW*q2GLmO|-%u2_FUcZ@mwy~$F$+XbkUMsW|yk9sNwGigyul(qg$bK}#jhG%s zT*sZ|1_m6TWSxPV+`kr_9Vci}xRM_oe|_2!^bF3^3?@7M9zE1II?6;d9~W{GN__BK zn!>fO`@C>e33agq*W#zqz<8$yrH9Q5aE9+bhU=e^CF)MH1>;3>f{)5EK*V73a$CDi?I*8m=v?zd?B-!{&Y+<>wbH9j zcg+Zxx&K4prb2|=>?6iVF%8EItD6AgFxGh^cObh6&c0ivB0FXK6h!aB5_cyOxqKor zLEai}_>)Y7(E{cNU{RH3jEAFfK)F9-gU;}`j^?45V=-J4EJoHQh@Q#wt2Yzy2lk21 zJlU5Nx&FsUj0tM@E1TalcOpXbBX&$xdtYm+>r2d5QPlxw7}9kMnQgSW}Z!Dz#uYAKbR1xRM#D9-8>Ye2@`rs6i#! zVV`Elz^?G;(`)z9Okps3dqP)qd-uUCK6Gga(QuQ2T(cu!&6DIlS~V>AQ)s5aH^Uh| zoc&C5PRlk65p>rgd&G&ZO=f1%eBH`c2v#ED_WX^IKVA@42;1-Lm2Xc7Lxsh6K{Jh~ z>9i_bCrT<_N9^R(nS9T$XeaywE6`?(1Q%Lt9$QynY%N`RI3jP)?TS%Y~y&q?H$ zJL)-3Uv~Xrt(BYgKYek@w>_w$-oAeZb;J8Q+pY!KMd}qidZ)pbo0+Z1;m>e0N|vby zU~Ab0Z3Z{RPK|O#fgs8Tmuk`fr|O{24sNPO>xz@km+@=x6AE->GwPB2*rjDonb*0A zF+_QDJ96W&0l8OKT-15f4puBXPR=2c-z0!RJ)g+>e_UtqK*xpDK)yY>Iu(rFN#_lX z|FT!0C_CiH?*oV{O;VIQIGX5x7%fri^om$&H$}9#q$zwBGi?tgKWrUPo*Yd)0wvu) zTb@Y>``WzA$1r(c$>b%V;A&N|2t~K{`9hXx07Ln>2u=6poA`+ozrqX4rlRDD@=*J4 z_lP2%^Z5QhX z&N0>*){AmR)pPQBA6IgM9Am@l zxC$c0lxchcg24?E!YTVeH}s3q1mZV0s;>IJ3qwnC5n~rG%ycQiET^Xi@MFi0jH~o2 zcCkrY@$<8**L!#&p7G%Y#{%L~N0lOR;a&>goj6vwZXYOkvUS|#(v04_Mux7HxXZyo imJ+#TP$?a8M&5fx9yagX_x|rc5nU}K&6<0#m;V8xVn5jc literal 0 HcmV?d00001 diff --git a/apps/presentationeditor/main/resources/img/toolbar/bullets.png b/apps/presentationeditor/main/resources/img/toolbar/bullets.png deleted file mode 100644 index afafb23274a94e8fd6e38f5806fe515fdce4ec7f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 584 zcmV-O0=NB%P)QIJIrtwxim%j?=k^XurJw*7#=b^ZhdGC3XsB z${gA4g>qR4*}>8WnG-P^l^ACx(eOf(IEu5MJeb*NIB{by?zPd3;=sX!hRs4R#(@io z=Ab;t#T+!P5)-}IYxyIdBb&+7g$tgHO`^!e*V#;-0^uL8EQ>N@GJ;h8EiF4cEeoi*2SKeteE0dLx?0VVt z!`X1%{#3t#G1W=#8>URzv4>9V#gJ969T;!jHDvQg%s!5Oyldov5Mq2{1Haxn?sOEe z=&Xm#57th<20G+u8H99 zG3da8Nt6(TOcaR&ESO4UIh#$SoEVWm`_wL5wfJN++qD*DG0TZUOkDp@zhHM11s;X$qWoE$(}BbAr*{oF1a5(svyAf zAaJwOA}0Qfj+W;NTw#oC^BP1O7~b7^zWndrrLr?m=iCwxIv{Plv9s4FCrNnrjU#Gi z8y}RG?CH}KsJ^W`W4EC23+ZXiS*vm_zjpSl+9u7dl$lV-sL*I)6Yxo8=b|Ie=g!dl zb3n{ct=+|W<|3UZVQ&>~$Mwi9+&WcFcnVu;ql1^M#0Kf^2{F+VBOlrFUhBK~pr*6= z?a>tx*2m^=oU}uFadUP=(#cKxk_8);cN;Q$xo6D&D!aI1T8sO={zB(m{;dj=>=U^D zzqwy+KW+N0O4bKT_6Z?3|Ie@W+;n2SVRhznKBt_nM;3kmpB?O77!b#`--XU38#KCSomIHj@mADeHp{N1M~ ze^_h(uP!#9f9~a!|8^FK@c~&+E2zwiQ@5YUr;a?AUZC3Tn(p;Lnlny z(|zaf{FE{E83)u{IQ4C};kj+QPd|SARB!&~w+DY^TzH(bTbpOM?73~H6C=tjZr91T zy$}6z_}JAqJI{RC{5Eet?}`dn<(9JG%A`ei&fff%f9wDTn4)dY!^6`f_9Z+i0S)~9 zTNklkWU=O@u1g~6M>D%NHBIYFWjrmjVL_^$^n|04%U0B+28m5HKl)Vrbke6~9W}1c zeFcAZotvHXNp!aP(I?tw`CTW%OYVtGT;H+BHQ{H?)A{whr=M&8_px6*|LNyvt*td5 zA2Y$d$HpcWosht++;^il^Y^N}8&`t1&Rb)dXtqSQ`1X41#I3B|?$ukq?c+{6elF!jsS*<5Mz4KKQzE4>ll2gp*75i** zlhe}t19`1pU2Yt?E52Nik3u$Rh6F0Mk;-Tzs$Idy;f<5vbVlboFyt I=akR{069Q9$^ZZW diff --git a/apps/presentationeditor/main/resources/img/toolbar/numbering.png b/apps/presentationeditor/main/resources/img/toolbar/numbering.png deleted file mode 100644 index 2e481e695e23b0a44f37e3c74d9100c35f49d122..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1146 zcmeAS@N?(olHy`uVBq!ia0vp^UJMLO0USUE15f7KN(KfNM^6{WkP61Px0wsnDn(d6 zXwS{vTws>8CinKXw|Cd_=hYs)|bsl{&S1E|qdXVyDTf zml9%E|9Fa}et&gzQG;Dg*3RXgE?MOduk3#dbonRoF8ybZ114K7yc@z-`bn$m>(hV( z^ZM6MTCsP&tisY4of{S_1Wt|T<(6LJAf~FN8*uQ?#n2c&(|yLD-aiT`dr$0v8>z5ZtJueCd8(er2Fui!XR@H3L6Lz*TKsNw`=hgn+Teo)etzCQ9aK`m(VH-1Z zbMH%T=_>V%mfE^nXYJa#_vg8No#`2UvBpkpYu==Jn^$~sx?7r&`?l}ko^9K@e6zEE zpIfkXtM{!-w{FFzX6C;A^KH$xutpuPkRo;?G*h>gc}7P??}i$C_1Y$;o6CW2_nHC< z6jjx&=KU-Fd+L6->U5iWZ%wYas#Y&c(Zscj{;41J2-I5of32vh)>)QM|NrR*i7317 z40(BWWxlH`IEsM=6kSaW6yH=Yq!7rwD}27wA|?NIr_L_yvzuc1xb`_C!@_^A_cH}9 z>{4(2^+BoNMf2U(;J;m6LaJGRg!A{_>v7rI_Vs0?m}tk&GYjK>yqPJ)_jkKz#al{l&TBjkgSExD~$JbMDzWslvYE z=Ua;`qk10Rshq1Z@A>J6bF9~|+8mIt@%&tN)ikZjT@&8zVPd>nsj95%)tJMxly#Hg z6tNR-_iQ597cMU? zQI>NYe{!X+=TkRsesx*){v4M!g~nCe*ciCvoL{IXEBnr{77$hmxZX8g=ix3%OM6Fq zgTL9gj7&C8e*Ulnl#@X5BzP;T;o3E(E!)I^(ax}X?cG?3E!)g?PICmx9t*HLnw8BM z70rDCqH4{yX(A^$UV(JKS`QSuj-*j{@62o0)b1L=O`h4DIVJVtii?kb#4Gehy(<;! zz7-pBThA**iZi9yKzD*}x7dlr$3O0O5Oehm)Y`gx!?xHdD@=q=JWGgDh!)eG;NJhZ qzEP)Z(xQ-4Z&m}756HdyXXi7<$+7u0FVJ-c6)K*telF{r5}E+&wIB%q diff --git a/apps/presentationeditor/main/resources/img/toolbar/numbering@2x.png b/apps/presentationeditor/main/resources/img/toolbar/numbering@2x.png deleted file mode 100644 index 5e219610699ee76a96165df05d682080974f145c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1889 zcmYLIdtB1@8ph1F!%5A=nVp5Ea`IBT9WSM#t|=-~D58~`lB{%LUQ)u_)Uz%_QKC2~ z&HDudb?7h)lR@s7pVKU_p^=CuNzDu54Z&g9z&>;DKkxhgp7;Aa-|zc*eubgPKttd` zAOHX`ga`SDX)_G~*j@9fzP7RtxQo;#m(Ww;un!+TbaizF1qF#jqW=DVrBd0^(SgI^ zqN1W?G8vIb%*x8Dt*vFV*;1*rq@<*~ySqON0tEo}%)$LnhG*)@#{Z9;KJi(=3T0rW zT6FtAs{ApJeKk43Y*b8f7_aHol7n>osL40fV>h&tJF)E5nLR|TcPz#_^B0WF+;#;- z(4W8-?dP7WE+OY8S?q@zM~CW1;(s>gJREoq&Bb`%KanKIpt@aRM#_aT2!~{9C#Bsm zg%Z%n8%NQN;W^D=D#&He%jtJ%iMj5$l%%s=V$fIv$`~CO)mnNt{CinW7b`jm zn9#ZV%0ZLzw4Yb7;HpSY-RkmTgCfsd`zT@CCed*)vtt9Dbp^UtNA;Bx-!igxYH~`GlgM8_?`clH$?Ampm_u(6JL%Xjog zv%oSw{pdP64#YF&#_*0CaB?ort=jiBS&@$O_ae%j4LGZ3X=9B+glcN1Sr8aWHEIn# zO^hX>@9Fjd{On;_khdk z^DldO*DnPwK}6ygIC-}XF?*>w3El%4wj#8mo#n$bj&EK(s03a#Z2k7eIWcT#59bvj zJFgF_@4>e=#HRcP8MJb*ggcibYEH^#);5(r9+xD!_wm_3j6v7hB_vSdzH+p>~q zHhp?{GUofeD*B{f{_i9C0Ro;fgT063S)pjjEHaH~_K{V^)wx@C8osk*LYegB9&;wt za@(8dG~K6wwvUzc84HJ|Sx81}Dr)S!!nB~5Kb`q^{;^v{O<<3Svd&#(^C$JLpMTNx zNpX~q4Qze&U(wOSBXsMat9H_&40+OC zcj4_Mt#oG(+G4r+5M2t7B_$Xcw1xFj2^f+Tm*-(iZnC2Oue4>x*37vl^cO_udB#-T zS8|pNeNuKw8E+1kXRDM}ntI{58ij?8l-ed?xXuAIUTlBsEwD`!kHHoPGLFSXh;vi? z4o1ZN)V?5DZAhJYGX&Z418Y_PJ=h{pI8`I!K+J)nvbV5CaBW@K@bhVJWOyS%!jM@U z=}qX25;r{PDV(QLnc)>!jVUpzp${?|g2`a4U z!8|?BH^;65ui-@+;&X0b4@JGATt~c4plJm#PQgy7I{C5Mp0WMyKP+BNshZ5|OT};a zE{=0>H$wpis8am(Uq5^pyO6%gxKmi6uQdPe=h@y3{718D#h)C<9vLmD47DKylSO6Z zUNHpbRvx`TKLo*tIA+hTWE*3BOI`CmOEfq z??Z8!XV>3$$rx1Wt$d?}mI)hzw2)^i81jwM;*#)PTmU~ycy-1|y_Qm-mD0kS9oZqz yFp0qZ`#W+2EY`E`pi(TaRs4EGZusRkwW|hz_l!0HKX~t|>)|k@f6LbwuKxkidwk0P diff --git a/apps/presentationeditor/main/resources/less/toolbar.less b/apps/presentationeditor/main/resources/less/toolbar.less index d99464004..cf97d63c7 100644 --- a/apps/presentationeditor/main/resources/less/toolbar.less +++ b/apps/presentationeditor/main/resources/less/toolbar.less @@ -63,18 +63,11 @@ } .item-markerlist { - .background-ximage('@{app-image-path}/toolbar/bullets.png', '@{app-image-path}/toolbar/bullets@2x.png', 38px); + .background-ximage('@{app-image-path}/toolbar/bullets-and-numbering.png', '@{app-image-path}/toolbar/bullets-and-numbering@2x.png', 38px); width: 38px; height: 38px; } -.item-numberlist { - .background-ximage('@{app-image-path}/toolbar/numbering.png', '@{app-image-path}/toolbar/numbering@2x.png', 74px); - width: 74px; - height: 74px; -} - - .color-schemas-menu { span { &.colors {