From 9e78e6b2e5bc9231265e5cb8e8ba1d7cdebab94b Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Mon, 17 Jun 2013 12:14:36 +0200 Subject: [PATCH 01/11] differentiate delete from close icon --- core/css/styles.css | 1 - core/img/actions/delete-hover.png | Bin 254 -> 0 bytes core/img/actions/delete-hover.svg | 6 --- core/img/actions/delete.png | Bin 240 -> 334 bytes core/img/actions/delete.svg | 67 ++++++++++++++++++++++++++++-- 5 files changed, 63 insertions(+), 11 deletions(-) delete mode 100644 core/img/actions/delete-hover.png delete mode 100644 core/img/actions/delete-hover.svg diff --git a/core/css/styles.css b/core/css/styles.css index 40a17a42876..7100b8c290d 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -655,7 +655,6 @@ div.crumb:active { /* icons */ .folder-icon { background-image: url('../img/places/folder.svg'); } .delete-icon { background-image: url('../img/actions/delete.svg'); } -.delete-icon:hover { background-image: url('../img/actions/delete-hover.svg'); } .edit-icon { background-image: url('../img/actions/rename.svg'); } /* buttons */ diff --git a/core/img/actions/delete-hover.png b/core/img/actions/delete-hover.png deleted file mode 100644 index 048d91cee5143ce826ef9ef3d7619d835bce0877..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 254 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFtWs_ aoD4g!3*63oe>4_o2!p4qpUXO@geCyPB2g0n diff --git a/core/img/actions/delete-hover.svg b/core/img/actions/delete-hover.svg deleted file mode 100644 index 3e8d26c9786..00000000000 --- a/core/img/actions/delete-hover.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/core/img/actions/delete.png b/core/img/actions/delete.png index fa8e18183ed3d126ab5706d093f7e64d944c835a..6362903937c001f3bd5ebac47fe8ed48195c66a9 100644 GIT binary patch delta 232 zcmV+&}~bf3=zHpZ|7e*Ceq`u^d4TTzUyp%6)=tL3jrL8e=F`1_{v2FgFH?d(zz{22yHp2FkHy i{}pye@U`kQEzujdT3cnj%BXMv0000BD)H2AVO_LHz0xN sSfI!Nio8H^AW|b5DN9I0Gcy4I+7e6GgT+Z{00000NkvXXt^-0~g7-r)8UO$Q diff --git a/core/img/actions/delete.svg b/core/img/actions/delete.svg index ef564bfd482..08ea381f378 100644 --- a/core/img/actions/delete.svg +++ b/core/img/actions/delete.svg @@ -1,6 +1,65 @@ - - - - + + + + + image/svg+xml + + + + + + + + + From 257ebc2830a04272c0b662cce85fea6470e77f7c Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Mon, 17 Jun 2013 12:18:45 +0200 Subject: [PATCH 02/11] use consistent icon for 'restore'/versions/history, also SVG --- apps/files_trashbin/js/trash.js | 2 +- core/img/actions/undelete.png | Bin 624 -> 0 bytes 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 core/img/actions/undelete.png diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js index 691642811b7..82119a59517 100644 --- a/apps/files_trashbin/js/trash.js +++ b/apps/files_trashbin/js/trash.js @@ -2,7 +2,7 @@ $(document).ready(function() { if (typeof FileActions !== 'undefined') { - FileActions.register('all', 'Restore', OC.PERMISSION_READ, OC.imagePath('core', 'actions/undelete.png'), function(filename) { + FileActions.register('all', 'Restore', OC.PERMISSION_READ, OC.imagePath('core', 'actions/history.svg'), function(filename) { var tr=$('tr').filterAttr('data-file', filename); var spinner = ''; var undeleteAction = $('tr').filterAttr('data-file',filename).children("td.date"); diff --git a/core/img/actions/undelete.png b/core/img/actions/undelete.png deleted file mode 100644 index d712527ef617dca921bcf75b917a1f728bc2102c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 624 zcmV-$0+0QPP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01m_e01m_fl`9S#00007bV*G`2i*Z4 z3Ih^4(F+g&000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0005YNkljtP1&(N=qgyIH-$IORb=2uhU1ruT51DFWl*#dmi_k^F&qomon=Oo)3xb zj>=#_0(psc4$7&g?G1sdimGz4pCVn^hZoMX?U1D;m^xyn5ga2-8>EgMC~^JMc6Ucr zR|pFGxD+(hFimy9A+%|hcwz)YArWV^HN-675Z&{FTb~mR34jVvp?Oz@d)n=NY5oQ~ z`(jKYIP4u7N7eWU&h>KHB?ua7q>ewLq8oiAqomuzR1GaPuD&~{sw*O<+b9ELz}Syv zMp*p#gzxw)ik#KgNBVfP%+gQF;~9XUJIs}JDhE@4vMuzLIiQ2ZxfY*|6Gvsgh~%X| zm;D{Vw`Mv3XiY5nYq778i8U^$D(`R7xjV`$1cz{BhONnAV<;qJ+}Yg341z Date: Mon, 17 Jun 2013 12:22:09 +0200 Subject: [PATCH 03/11] transparent background for lock icon --- core/img/actions/lock.png | Bin 182 -> 295 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/core/img/actions/lock.png b/core/img/actions/lock.png index dbcffa3990f7dace24aaae6836977a142d57fe47..f3121811ea69565b897e2806f7d9aa66ac90bd68 100644 GIT binary patch delta 279 zcmdnSxSVN%WIY=L1B3kM|A|0~rP#?cgaZg_I8r)*e9i)o$YKTt-s>RD=%g{b0w^e1 z;u=vBoS#-wo>-L1P+nfHmzkGcoSayYs+V7sKKq@G6j0F;PZ!4!i{7{A^|_oJC0IV( z?>d+z*ps&Sp!Uh^vi=VTURl~SDcn1fu#v02ZEMZH==uCdk_r+MZc09zJ+U}UD0t0A z{&j}ApUOl$G(&GZ>T&(hlbdl~L$ANk>FR}5T)BU~#LvijGiz1bKIgk;iA`s{&sv*3 z+_{kF#p4@71w7|(H}p?Tnmy%`(B>UQ6_4dznnTZ3^4(=GY>{g_Xx6i?f4%x2<~qd( aOw%K3&I{Q5%Mt>*n8DN4&t;ucLK6V}&2v=% delta 165 zcmZ3^w2g6sWIY2ASj||l7f3M{J9&n1JmZR<3FL4VctjR6Fz_7#VaBQ2e9}O{Xipc% z5Q*^QAN)+|heSn{&o|HHQAkqUe0$2vcRHsNn9OflIi4x&+Z`b4+Lmzi|5vRAOzT_) z8f)}dG}M~9EVv`t?!er?#8ATHgIV+1-t>m%6gev{5wF9JFaQ5%*vHx)6&$7Z6lf2F Mr>mdKI;Vst042>j5dZ)H From 344a73b173c3dc0a1a203e5db4fa64adab7f0e48 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Mon, 17 Jun 2013 12:26:32 +0200 Subject: [PATCH 04/11] use mail icon consistent with Mail app icon --- core/img/actions/mail.png | Bin 405 -> 303 bytes core/img/actions/mail.svg | 100 +++++++++++++++++++++++++++++++++++--- 2 files changed, 94 insertions(+), 6 deletions(-) diff --git a/core/img/actions/mail.png b/core/img/actions/mail.png index 8e884fbc0ea87ee8549053f603bbf9bf55c29817..be6142444ae8052e6f96c4b8afc3d267704d1507 100644 GIT binary patch delta 202 zcmV;*05$)W1Fr&*ZGQl)Nklr_MR^`+ZL{%_JcNRaUK%`xgM%Abc4cF&QKMz?eo)$N(qw--Mjd z!!ZvC*vE}mkRv+S<$8C5ExIL;1KL;@`VYb>8U@G!bxfY#Rc=|2~>PY$^U<*8}*KjdyZyb!vFvP07*qoM6N<$ Ef?jo5dH?_b delta 305 zcmV-10nYxf0+j=hZGQn0NklS$-FB#tb_!SEaWFs;Y9Dro1c*cU{M(X^P;C8Fpa46iAZ9 zQ51={<$2DAVQ?JBJdUFX&X{2b1}q#=;JWU)ZCh@dh8@Sbd9&wvBG)r8VBx@}X_{Wb zFnnv=6|ivNk}9Go4|~PW*<89D44u~8{V^x{_rLKK%>&TsaB3rf00000NkvXXu0mjf DVI7Wk diff --git a/core/img/actions/mail.svg b/core/img/actions/mail.svg index 2c63daac034..6e8a4bd7f6b 100644 --- a/core/img/actions/mail.svg +++ b/core/img/actions/mail.svg @@ -1,8 +1,96 @@ - - - - - - + + + + + + + image/svg+xml + + + + + + + + + + + + + + + From 078835ee9dd02e8f4cd8387c0eeace9913dc9349 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Mon, 17 Jun 2013 12:27:45 +0200 Subject: [PATCH 05/11] remove unused big images --- core/img/remoteStorage-big.png | Bin 8372 -> 0 bytes core/img/weather-clear.png | Bin 21917 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 core/img/remoteStorage-big.png delete mode 100644 core/img/weather-clear.png diff --git a/core/img/remoteStorage-big.png b/core/img/remoteStorage-big.png deleted file mode 100644 index 7e76e21209e539354805d12d8f92c5a8176c0861..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8372 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 From d9dcba9a39a468a0fe5cfaad99d6a7282ba2702a Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Mon, 17 Jun 2013 12:35:25 +0200 Subject: [PATCH 06/11] remove unused loading spinners, just have one --- apps/files_trashbin/js/trash.js | 4 ++-- core/img/loader.gif | Bin 847 -> 0 bytes core/img/loading-dark.gif | Bin 673 -> 0 bytes 3 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 core/img/loader.gif delete mode 100644 core/img/loading-dark.gif diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js index 82119a59517..307ac743a3c 100644 --- a/apps/files_trashbin/js/trash.js +++ b/apps/files_trashbin/js/trash.js @@ -4,7 +4,7 @@ $(document).ready(function() { if (typeof FileActions !== 'undefined') { FileActions.register('all', 'Restore', OC.PERMISSION_READ, OC.imagePath('core', 'actions/history.svg'), function(filename) { var tr=$('tr').filterAttr('data-file', filename); - var spinner = ''; + var spinner = ''; var undeleteAction = $('tr').filterAttr('data-file',filename).children("td.date"); var files = tr.attr('data-file'); undeleteAction[0].innerHTML = undeleteAction[0].innerHTML+spinner; @@ -94,7 +94,7 @@ $(document).ready(function() { $('.undelete').click('click',function(event) { event.preventDefault(); - var spinner = ''; + var spinner = ''; var files=getSelectedFiles('file'); var fileslist = JSON.stringify(files); var dirlisting=getSelectedFiles('dirlisting')[0]; diff --git a/core/img/loader.gif b/core/img/loader.gif deleted file mode 100644 index e192ca895cd00d6b752ec84619b787188f30ee41..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 847 zcmZ?wbhEHb6krfw_`<;O|Nnmm28JI$eppyow6wIav9YPCsa?BvZN-WeVq#)tWo2n; zX-}R!nK5I=v17+PJUqg}!hq_D2a5l>{aizWogD*Qjr0td8G$+#|4BI)r6!i7rYMwW zmSiX-W+hhSNI#p{aB=u^kJ9BqzM)+D@@g7D>_ZH z6>Nk>K2^#dec$hd&5{fSg)a9?JsDb3M<1+M;h^GLd*HyqYe$(ldZsj_W{3#!96X@l zAjsu&py5MupnEfu)0U^(0!(Kp*sL-QO$pql{X%Kq;`Av7E5z0lI$B?E`RzKdsAZ)9=nHHN!5+~JF4SY+VADb}iE(C2i8t1nx?>)BhL zPS>_TA<--6ZN7=uLx=rfr*28JR#UU9l!(BR!@3s} qR&*pBVEQRw*vTQWVY)*bLIMx~ diff --git a/core/img/loading-dark.gif b/core/img/loading-dark.gif deleted file mode 100644 index 5fe86acabc41f3cd97b09eb626e5e9020d5ea28e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 673 zcmZ?wbhEHb6krfw_{0DL|Ns24v9{i`YZs6)XV$Em>gt^AY{h?4&PAz-C8;S2<(VZJ z3W-^X6*>8dDSDZCY55F_KUo;KfLay*bNji51UowhxEkphFf#&$bU;Re3};|A=Gb-T zpTQ~5Y~f@MD-Ovy?0z%SI9)dy9@-@`^WZkUgd>LvFX%=~Sl(U6ZYjaT?v?%A185}J zXhvjnOhD%N^(ZPxxA5%V@T|+F&?zt^!BA2m!N)aPYDJCA*3$cL6D8Oi6s}7=YIBy{ zq^hDN1T}~W*&s8HT}H~XscN4xYMc0GPFQ?v_cG2_MIIJIm-a*%!BuWe z8!pN-Ck4fRwv{)q(2?ptv82e-2j({xWOIx-b`_~>dp%DP`5^Jxr;$gk>~KO%Qpl9n zmYs4LkxrWDPdNxM%e}ObKdc5eCukDP7*=FsfX-1kG{I8*amn*Nx8@m09+!EbsOPk8 z?y2xKiwt?#xJ8N+cW*HLK9#Z2U;}68?)kZzUNCdmkj())=gz+moPsy!gvQQde0Qs` zU}{3g-NZR}O{TRvx*atTnUFAh8zV2vAqRokh7E_Votp?Vh8@EgV9c*hb-FS~^ST@d t$6EjG|h_^oWQ_f4N5p*002a;)W84$ From 0f904b3c9c9542d542ea52bc7683c79e6916fe18 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Mon, 17 Jun 2013 12:58:43 +0200 Subject: [PATCH 07/11] use proper style for add icon --- core/img/actions/add.png | Bin 441 -> 195 bytes core/img/actions/add.svg | 68 ++++++++++++++++++++++++++++++++++----- 2 files changed, 60 insertions(+), 8 deletions(-) diff --git a/core/img/actions/add.png b/core/img/actions/add.png index 25d472b2dc41bd4412507d422b579ff36abad887..13e20df6626b5c5b907176c9887386b19545c25d 100644 GIT binary patch delta 108 zcmV-y0F(c@1H%E3I|~ih000fw0YWI7c#%dYRscXrL_t(IjqQ>_3IHGs!>suKFUPaE zL1BU*=GxJ*FafQ?$O1`AGoWa$m)5^gAYc>b0_gq;XB>pVeY0UKMn?p36o*~&(ft!qZt?&(m=SZtSlZVCP9h;+%sp+jDi`EpPwHG6cZ!K z3;q55kuU?&)6+o)h~P7T_uad9axnby<42X2mKL}H@$vC-pFe-rL{lRKH{i^fGa8|x zf1znsR#tGVtgM^{GeAa021U-((=%<)o;{Xu1ArVgAb@KighfO|(l&42Yz8-A+qP}W z$TkwfLPA1mt5&Tth8wVd|9+Xu%1XbYq9PvGX z(7+c9tiHa!!7u|%O-*A!F+)l;vN$?AP6ojY(9zKW8Nfk`0nBD*W`QsRR8&-=fnw~W z7{Fv=V&V@B?GzB!(9nnkd5aVS7@!)EF(au45QPDtx=du=nI6{w0000 - - - - - - - - + + + + + image/svg+xml + + + + + + + + + + From 1f518025a3f5c1078b7b94e93f218b8ed58b556c Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Mon, 17 Jun 2013 13:20:02 +0200 Subject: [PATCH 08/11] standardize on 32px loading spinner, decrease size in CSS where needed --- core/css/styles.css | 7 +++++++ core/img/loading-dark.gif | Bin 0 -> 3208 bytes core/img/loading.gif | Bin 1849 -> 3208 bytes 3 files changed, 7 insertions(+) create mode 100644 core/img/loading-dark.gif diff --git a/core/css/styles.css b/core/css/styles.css index 7100b8c290d..6c9d00114a0 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -416,7 +416,13 @@ a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;paddin #oc-dialog-filepicker-content .filepicker_element_selected { background-color:lightblue;} .ui-dialog {position:fixed !important;} span.ui-icon {float: left; margin: 3px 7px 30px 0;} + .loading { background: url('../img/loading.gif') no-repeat center; cursor: wait; } +.move2trash { /* decrease spinner size */ + width: 16px; + height: 16px; +} + /* ---- CATEGORIES ---- */ #categoryform .scrollarea { position:absolute; left:10px; top:10px; right:10px; bottom:50px; overflow:auto; border:1px solid #ddd; background:#f8f8f8; } @@ -661,6 +667,7 @@ div.crumb:active { button.loading { background-image: url('../img/loading.gif'); background-position: right 10px center; background-repeat: no-repeat; + background-size: 16px; padding-right: 30px; } diff --git a/core/img/loading-dark.gif b/core/img/loading-dark.gif new file mode 100644 index 0000000000000000000000000000000000000000..13f0f64eab152fa4949476ed83ea24d6fd45a9bc GIT binary patch literal 3208 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 A6951J literal 0 HcmV?d00001 diff --git a/core/img/loading.gif b/core/img/loading.gif index 5b33f7e54f4e55b6b8774d86d96895db9af044b4..f8f3dff6fb955ebc02453352e59c845461723292 100644 GIT binary patch literal 3208 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 literal 1849 zcma*odr(tX9tZI2z31lM+(&YVk%mZ}5P~KlG2s=WSbGzm0!x7^P##Mnh7t-jP!X0Q zk_SQ}Po-L1tlDK;6l?(>v)e5ZBQx4|Y-Q?nr@Px3?9h(3ZWr3^tj=`TP57gKr87N$ zp2wWee1GRRCwo_xahnw)5cxNPJbCg2L6DV|6`#+yw6v6!mDS$f9-JvFD^n;GQ&UrZ zzh5jCkByB101O60U0q#p_1BM>Cv-vP?&s4@g_((4_1L=L$(a91)0=J91Gas#R{McE znYG^9*0A5YZ>#;~+Wkn(W5B0^yELIYLP!K}mB~<)AM@1&nqekynuaEGqPrzoH|KodRXJy)%+w_fu3nE5>@Bd_b zqC$EQ;{c`T&?EsNO|igL9gC7Ygxv?aQUEXMq?~>wg{EyW;VcJ37CUF#HjrT=KQO_* zS>M9yydXk18D(+QDJ1>r);Lav_uYKp$T?4vr{Q$lTo&pKv^?(>L-)G2*lwH!Ah7k? z7oH<8h-(KTKt5V6$8gF)C7Io&P5=SjTh)=zV=E2EUhQZP##L8S{d%UK>>+y82>+FV+#^BzW7u3F)Bb>=lYQ%%j`F>ASe zo*cw@V#u6T`A2He;70mR(V&iV&-7{qP~=SRf&jm9-T{*ZeZ}$rd0#6c&fLG^xJcf5 z+p<`wJYgW+_s*V{uI$nMB;%8`S_3>PfGOj3Rq}@Cx^+j?rk92fANSFDBYnOqQ>Vdj z)(|$AhP4t&Lb=Gvo2#3Gl%9<=Gv`Mz?Po@P4iLF!x}GUWJICDlFk-hS^Whyh7x~VH z@0vD1>HYD4&e+~yzS*-sFR{9`{QEEZO1zg7>R&7cHts-6j!xHVdA8eI+ZlVzd%`es zJT@$#GX(gvCJ1oJN%yLBK}{V=V;seo;!w|Yte!W1%5qLNFWqvZW>h&IiH+oPT=b@E zPhGzv5=(Un*X>v`>%8h_nj^NdYcE6NHS_ifkCV$*D)Tqrbu`s;<=t<4 zAHNqNV?6(g<1PY-w@#I-WYFViz?9TrkMr)u0g`O`u|>T;k|2sV*YF^punvT;$SuTy{j3Gv)yqD!R_CF>yR)MzmmYS5v+~R zXAdD%ng9?df;wd8GxR#%3O+gz};Vo;)sK%Bj-q>Oq%R7JU-KD?vYu>#2UjaDo z&8$>5xW~?KPD_#XFToU1hIb*VOMidUr6iYiO0N|i-7s`T8!cFT`rN!^1Pt78J93i6 z5HI1wIM$94m{3SLDvISDe6$ZG1;eq_D9RTaaC>=cO{@Bs>$IlPCPJJ$h$)-3vzNUQ6OsN#_zWxey!_9%hxwH2_dEJi=yY|1c7nDm2_Lm!Cof8-R_+9UkS zcBE(o47yE)oMR(Q=dp1a2wTX5KvvGyLqlWTa7V&!A*|w|)ax~1_~aJ0=_Lilg*0iQk7#ZD EAHN$8j{pDw From 2a5776354251ddfeccc854d2d0af157575afa28d Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Mon, 17 Jun 2013 13:30:57 +0200 Subject: [PATCH 09/11] use history icon in Deleted Files template as well --- apps/files_trashbin/js/trash.js | 2 +- apps/files_trashbin/templates/index.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js index 307ac743a3c..87dfea491e7 100644 --- a/apps/files_trashbin/js/trash.js +++ b/apps/files_trashbin/js/trash.js @@ -2,7 +2,7 @@ $(document).ready(function() { if (typeof FileActions !== 'undefined') { - FileActions.register('all', 'Restore', OC.PERMISSION_READ, OC.imagePath('core', 'actions/history.svg'), function(filename) { + FileActions.register('all', 'Restore', OC.PERMISSION_READ, OC.imagePath('core', 'actions/history'), function(filename) { var tr=$('tr').filterAttr('data-file', filename); var spinner = ''; var undeleteAction = $('tr').filterAttr('data-file',filename).children("td.date"); diff --git a/apps/files_trashbin/templates/index.php b/apps/files_trashbin/templates/index.php index cb5edaa2c91..66ec36df867 100644 --- a/apps/files_trashbin/templates/index.php +++ b/apps/files_trashbin/templates/index.php @@ -18,7 +18,7 @@ <?php p($l->t( 'Restore' )); ?>" /> + src="" /> t('Restore'))?> From 7fd45e2875f3f62f4bff3b107076578f15665366 Mon Sep 17 00:00:00 2001 From: kondou Date: Fri, 21 Jun 2013 04:24:40 +0200 Subject: [PATCH 10/11] Optimize pictures with optipng and scour --- core/img/actions/add.png | Bin 195 -> 184 bytes core/img/actions/add.svg | 64 ++---------------------- core/img/actions/delete.png | Bin 334 -> 262 bytes core/img/actions/delete.svg | 66 ++----------------------- core/img/actions/mail.svg | 96 +----------------------------------- 5 files changed, 9 insertions(+), 217 deletions(-) diff --git a/core/img/actions/add.png b/core/img/actions/add.png index 13e20df6626b5c5b907176c9887386b19545c25d..1aac02b84544ac0e8436d7c8e3b14176cd35fb88 100644 GIT binary patch delta 110 zcmX@ixPx(mgajiq0|SGqZLSiKVlH;_4B_D5xc$)o!9+t_Z?*uR5ZC|z{{y8$4_&SU zQj8@*e!&b5&u*jvIpUr!jv*Y;$tej5DfhaYUcDCN@a<}3WDqRn?ws&BdNxoAgQu&X J%Q~loCII_8B7Xn? delta 121 zcmdnNc$jg5gd_(W0|SHn=l_X7ilx}eGlT;OYB*9lCK}j=I(WJ`hFJ8zo#e>Hpulr@ z&5!^3$2aeAOl(qkcI)Cs1ID$7PB3|T8!yOMH~rfFK!pV1XG|~tai+_(9IRKF9kS>& Z%Ml$3Vc}J4dVq#Ac)I$ztaD0e0ssI?Ed2lg diff --git a/core/img/actions/add.svg b/core/img/actions/add.svg index 6db768d9a42..250746e1660 100644 --- a/core/img/actions/add.svg +++ b/core/img/actions/add.svg @@ -1,62 +1,6 @@ - - - - - image/svg+xml - - - - - - - - - - + + + + diff --git a/core/img/actions/delete.png b/core/img/actions/delete.png index 6362903937c001f3bd5ebac47fe8ed48195c66a9..fe826a14dd2f14c3e50e57bdbd1d0fc583aea929 100644 GIT binary patch delta 189 zcmX@d)W$SHLV|^vfq~)e-A6${in-XyGlYYK*WG`LR|m<|9_Ez;VJ{e z6$}KF;`K2(0MyA*666=mz-?Q$;qKGF%p20S0ma-rT^vI=qLULG7!tROI18K=xp?v7 zDu$F5S%~(8kOhecVUkg@=Q|gP?+=1#b(O1*O6c=(aL3 Yy!2Lk&1A~I8fYYgr>mdKI;Vst0Pl`KW&i*H delta 261 zcmV+g0s8)i0?q=E7#Ro#0000V^Z#K0000DYLP=Bz2nYy#2xN$nFg<_ENklY9d7)C*(rw46x?ldoEYoV%q=6IV6hxQ4qSQ(Q_6jU zY(aPi{~BW`RR#&r%rG|wiF?xBB?eMza0be;Wd9X*NAR`kGcC~@w_00eyvnF>00000 LNkvXXu0mjfPWf)3 diff --git a/core/img/actions/delete.svg b/core/img/actions/delete.svg index 08ea381f378..8024d402a85 100644 --- a/core/img/actions/delete.svg +++ b/core/img/actions/delete.svg @@ -1,65 +1,5 @@ - - - - - image/svg+xml - - - - - - - - - + + + diff --git a/core/img/actions/mail.svg b/core/img/actions/mail.svg index 6e8a4bd7f6b..c01f2c113e7 100644 --- a/core/img/actions/mail.svg +++ b/core/img/actions/mail.svg @@ -1,96 +1,4 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - + + From b9be693305b9723ce4a37bd527da22cf68c78b77 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Fri, 5 Jul 2013 01:34:19 +0200 Subject: [PATCH 11/11] change delete from entry forbidden sign to proper icon --- core/img/actions/delete.png | Bin 262 -> 295 bytes core/img/actions/delete.svg | 13 ++++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/core/img/actions/delete.png b/core/img/actions/delete.png index fe826a14dd2f14c3e50e57bdbd1d0fc583aea929..99f549faf9b70be5d0917d601485170bfae526d8 100644 GIT binary patch delta 194 zcmZo;TFx{fw_Yp2C&cyt|Nj>m7%nj|TxDRm%)oF32?0frxes?9Gh<+2;4KOA3ufTf zwaqNsaQEq}kAMI933)^SCBi&i978ywlM@^mF7|A55I7rC{rz1jv%=wDSMKi4HZwLb zxMp#7@5-W>hQ_bcnx3gxFWbtfpxAcX!!XnDto0d9L%B3na4M c3DRI-V9V5c{&TTfBG3v3Pgg&ebxsLQ0O*!UivR!s delta 161 zcmZ3^)W$R+w_Yy5C&cyt|Nj>m7_KrfT){v%f6KjBIQ?Is$FX y%+bev6kd2Z7(56nI9l+wfLTx~?0{}76T?eywbx9h{HuXRGI+ZBxvX diff --git a/core/img/actions/delete.svg b/core/img/actions/delete.svg index 8024d402a85..568185c5c70 100644 --- a/core/img/actions/delete.svg +++ b/core/img/actions/delete.svg @@ -1,5 +1,12 @@ - - - + + + + image/svg+xml + + + + + +