From 7115871445f999110eeb9a388eaa643a2618129a Mon Sep 17 00:00:00 2001 From: Maxence Lange Date: Mon, 5 Jul 2021 15:52:30 -0100 Subject: [PATCH] new icon Signed-off-by: Maxence Lange --- css/files/circles.filelist.css | 2 +- img/add-user.svg | 1 - img/black_circle.png | Bin 732 -> 0 bytes img/black_circle.svg | 1 - img/circles.png | Bin 782 -> 0 bytes img/circles.svg | 2 +- img/closed.png | Bin 796 -> 0 bytes img/closed.svg | 1 - img/colored.png | Bin 1262 -> 0 bytes img/colored.svg | 1 - img/join.svg | 54 --------------------------------- img/link-group.svg | 22 -------------- img/personal.png | Bin 690 -> 0 bytes img/personal.svg | 1 - img/secret.png | Bin 826 -> 0 bytes img/secret.svg | 1 - lib/Activity/Filter.php | 2 +- lib/Model/ShareWrapper.php | 2 +- lib/Notification/Notifier.php | 2 +- lib/Service/CirclesService.php | 4 +-- 20 files changed, 7 insertions(+), 89 deletions(-) delete mode 100644 img/add-user.svg delete mode 100644 img/black_circle.png delete mode 100644 img/black_circle.svg delete mode 100644 img/circles.png delete mode 100644 img/closed.png delete mode 100644 img/closed.svg delete mode 100644 img/colored.png delete mode 100644 img/colored.svg delete mode 100644 img/join.svg delete mode 100644 img/link-group.svg delete mode 100644 img/personal.png delete mode 100644 img/personal.svg delete mode 100644 img/secret.png delete mode 100644 img/secret.svg diff --git a/css/files/circles.filelist.css b/css/files/circles.filelist.css index c2f42cb3..22030686 100644 --- a/css/files/circles.filelist.css +++ b/css/files/circles.filelist.css @@ -40,7 +40,7 @@ } .nav-icon-circlesfilter { - background-image: url('../../img/black_circle.svg'); + background-image: url('../../img/circles_black.svg'); } #app-sidebar .mainFileInfoView .tag-label { diff --git a/img/add-user.svg b/img/add-user.svg deleted file mode 100644 index 4186f0ff..00000000 --- a/img/add-user.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/img/black_circle.png b/img/black_circle.png deleted file mode 100644 index 7e58146c07cc997d15656ae47dde39fce1e7ea01..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 732 zcmV<20wev2P)`i5(~)+WhWNiLX1*ogF(j2WM(YRd75XQdG2%X+_`r)zV+*z=bYd9 zeZTj-{myMtJ9eTY*6&1{GMvUp#!gKY`HmdxMbO&T-MiKhhu&NhO$goAirK%Cf_ zIHn8x>p|X%dntlJJSq^d4f8M*zi(iEt>mllE(RJxHEDlUF~&<_HmgDj_fzC+Cm=kFO&Ex=ZdW_#kkM)1H3{+rT}GE< zZzbm$=#9?Zbs$f0J;r=1%y3zB8r|(n>nLCahGXolMUEGu)7?6fCwLHJUr0A*r(=68 zZ#6(b5_5ey0VTA>`tt?|coEB$n3gA?70t2U*8l+@VmT9Ylg8$h!$2hdE1ZOSV|uFo zr<{Q0!bbU{{%DEiP&ok!4r7gQhxg#)B#GN_0DI#1vnXO57U7k#3FeD%oz{xY=+DIL z$HF}4E5>KIMb0tDu&E$eQD3bX7xSuo zwS8(|f+VqJ?ONV|#dwqBJSe2-TCfFQGx1&v8y=}E5kGJ-4(Jo!f^(vC7dGGtK2;!H zhGW=>%feCqEo{gh91%_eDz9ye@V?uZYI}&A!t=ZrvoT9ZGVQ`YrsRh$s6ud6=oH>{ zm7e8^_2Otfh_l#?^LQ*wYeG021zy5#W0$rNlQ~|^!XAO28k0Z%1N;MqRo4Jna3(eY O0000 \ No newline at end of file diff --git a/img/circles.png b/img/circles.png deleted file mode 100644 index b6612d72ccb4c990d158e1846f707b7514f87a4e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 782 zcmV+p1M&QcP)k!RwnlZ)V=iwCTWb z=iYnXIp^K`?hjK!0Ns+hTy@mUMw4nKF~30}uKz3ZBLVX~x=Je~H*N%afU%eW1C{D7 zEyK7$(rHPTC2cH0pLfsnN@_H-yOjotnx}xL-W$#VFJngFAg~(9y83-!O;Ypiz(*&P z1%`o5uJ3BV{EF){V9;xy1U6J^-r|}61bPCTPT-pRbq4xR0Y99^IFKsWya9OTneVA6 z{bH?lAmg+im-|qkH|$4~ntOV^-gKNOMQ#Mrjyzngxu<*2X-<$^RYi$CjyRY9;A#|L zD=_c055y6N9O+4|%suVrPJ762j}FHnS3azD08evYFo2tzHdlR9hX8L~xeZuS5I|B& z3tRJ49RhrE<#I`@@{Rskka5O;B&F*RV43%Swjh9+Wq>V`Ftb_J9?h=I1_O9F3+$FO zDe1PEeXhn8Xp?kC(s9@H+RU;cVk_`2a=?58+N&_{0H!0F)4OVY*q;c}W>Fy9BJ4bV0do zeoWGUnauXivf)eGO8@`> M07*qoM6N<$f-@#mqyPW_ diff --git a/img/circles.svg b/img/circles.svg index caf45591..6264e746 100644 --- a/img/circles.svg +++ b/img/circles.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/img/closed.png b/img/closed.png deleted file mode 100644 index 687e5aa125b0c7a7c1d03a72aa998b44bedb15ab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 796 zcmV+%1LOROP)IC3ht!@y6~_}0_!jl-SPJ|Os-aZK3+zmZd|~u`0YrJ_~H1i2B%WvuQ0Q} z;!{)NpM|y0Vl9qFTbuK}8J{A@GhsF>LM`s6#257=@hn#0Yvj6BY0zG!Y2Pvc@dQmu z%dw-#c@)~C^MyeWPjEGIwh1%bCmNNiebyi*Fc-fg_nLB!XQI=c3P?v{ANFH(1^y2r z_nGuyUB+pBeBP*l@KPkK6V`caf&UGx!qUDRYVk`2(}WTD8O6uM_Ynm#n>4V7dmrVor4U zSwL0|CdFrWnm=2FgvwqZoZ%ORSs4gsU^lkM-%n!_2#q7bG~o!Imm2#ZoDHoR(p`Et zm=3gL##Z8{&><6i6dK*zY^Imxx7arMGgX9IrG}QZY@%xLz7OX=SW-m-4Q2SgN6jAF zutwh~_pMs=;%t$hZKvv&AZct_yOI|$9WQd6yMz{94OR<9m*#se6g+w!pI>k`26PH{ z!ST_#3Cr*p?+Qd`;}DkPys(vj2nBf&2ZY^); \ No newline at end of file diff --git a/img/colored.png b/img/colored.png deleted file mode 100644 index 6630ffc40ffdc90b00b90f2c4bd563197df6ef67..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1262 zcmVvPsB zcrDf@sI@tsj%9aTz}5O3kAa{=}V!{|L zl#)bT$^vZL)_V{Bx;Q9-_kjB^Uw0>s6@>vPeyZYWB|5#qU-k9v@>_j5i+nF<|MvS; zKkzy*8t563<{W-(a{E1r;x+26mOxpj3aLXtS?;81)AFVk>}oxE8Ni3P98j#u_H;BfZ>_qfM13BymP$|`D)Cj^my9Q25zg|yIM$`) zM+Lb+0HM6GuBs+B=E}}-#XxCfyES`WM`Nu2i3LlZ6=5AP3OH%3v{}tH>#y8afNk4) zPfJ@9FdGOMnBBa+>Tt3z=nIc~D`zUD>H#;Xy2kBaJb81>Ej6Is6P^c_14fiAYTjPG zI~8((wzEer9@uB7yN20}-UshJuTl~EO4jed_ z4ax=JXx%>40xZpi$Z~jl_pnh>du%W0QqXQ7G$J&zb*KdxOAW&j0J3yuFlz6;f%^K5 zU2ZFF;y)Q(`E_-l1{35M6r{&wMV8L+;hnwt{Z)r+cy6R032<-f#PgznB&~w{E1y-_Ow(#H&6k#Z5vTi z30#YF2xpvO*79B{@rP>M*Ik*fDq*S<3U;14T01uw{Oh4epkFCx#V-HG6MYeTd@tno zIIdT;GF=V+>Xk*`l;3MvYAM2akYjFF#%DFY_1y^t+>F8ni?h-sZ5>b+W8N>YO~Wx` zbSsvVsZnktYKFoTgYps?bc~fYHqjUsi+&YXv3H3N#cE(mf8v2QQL?JZU%mczfdi`U zlKC$c8tqhqo(}RLkREXfa0=uHQK~lE-L) \ No newline at end of file diff --git a/img/join.svg b/img/join.svg deleted file mode 100644 index 2bf0b07a..00000000 --- a/img/join.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/img/link-group.svg b/img/link-group.svg deleted file mode 100644 index 3f219829..00000000 --- a/img/link-group.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - diff --git a/img/personal.png b/img/personal.png deleted file mode 100644 index 385f76b3670e20f87ceb48f53e35f72b311a8ffb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 690 zcmV;j0!{siP)sH@ZVImbYoFM?OLC!E)WqUB4MXA5-UWo zL#-tK5jKs4wnA)0L`(b`659F*+7%XML&sR0bKN`b+?hL_>53;gnX`D`=XuV1&O7(z zU&opja!c5Z4JhMRTO8Fv7lts3_ffEtSu+@mF>Bi?+<|kLT_RX-y~X92+Y);5GDG|m zQ@D;J*p2NtjB9wNx-u`&w^H$4(o_G&1O^J^4d7nPsYH$0|89 ziYC~E&bXgn1q0tR`*q2tb4kEF7KN*5H_DlPZYT6${VIsVacPJBJ$Pr0zzY}@KDqZX z*Cqpl@pne3@-l3}Yt^6CuQ=2u1Cx>SZeGBHCF04NRl8EnU_jboL$v}*_>yCwg1s#o zcqAQEY96K}lsnJBz81vKWO&Zk3w)R({yEQe0qhsryMiZ;g8MLC!@z \ No newline at end of file diff --git a/img/secret.png b/img/secret.png deleted file mode 100644 index ab6eca89e177d261bc37bc4cdd1b5db1453d3ad4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 826 zcmV-A1I7G_P)_zzO*>!VV-&B zdCt9a=jy629G-K}`Tf4%-+B3+b8b!ZcnzCl{i|3W8a~ARLiylfiN9JRo|VlBzXf9v z2Jk~7fc+0bxD9V%A|afWkD|{YhFT%sh0{5KX?&XqU=x<&Zv1^5Pc|#Q8kZu`U5ub7 z_U$PV-xd36_&C=-foJC{zC0&>LswBbxn{DpZ0Uc`Fb zidh!jmX@7kI;u!|bEXN!5j2B@%8jrLN)Go-o2P zbmEwhs=a2zf$B_f>`~aMA1w=DKj47SWE!6QUXVFje535|(Waj+%SJWv5qa zgjHxWbDSkbtKYZb=#@nRDJ^d|WJj+(R5u$CZ8^)-t*oMXzPoz(miWEWepd|KwP z62FufPYYLcGuR-U8+pE;g$<9{`FInDqQj){7JMQa58`Fv \ No newline at end of file diff --git a/lib/Activity/Filter.php b/lib/Activity/Filter.php index b3d06ba9..0535515d 100644 --- a/lib/Activity/Filter.php +++ b/lib/Activity/Filter.php @@ -51,7 +51,7 @@ class Filter implements IFilter { */ public function getIcon() { return $this->url->getAbsoluteURL( - $this->url->imagePath(Application::APP_ID, 'black_circle.svg') + $this->url->imagePath(Application::APP_ID, 'circles.svg') ); } diff --git a/lib/Model/ShareWrapper.php b/lib/Model/ShareWrapper.php index 4b3f0a38..fd3aab10 100644 --- a/lib/Model/ShareWrapper.php +++ b/lib/Model/ShareWrapper.php @@ -656,7 +656,7 @@ class ShareWrapper extends ManagedModel implements IDeserializable, INC22QueryRo $share->setSharedWithDisplayName($display); $icon = $urlGenerator->getAbsoluteURL( - $urlGenerator->imagePath(Application::APP_ID, 'black_circle.svg') + $urlGenerator->imagePath(Application::APP_ID, 'circles.svg') ); $share->setSharedWithAvatar($icon); diff --git a/lib/Notification/Notifier.php b/lib/Notification/Notifier.php index b8611684..1858c64d 100644 --- a/lib/Notification/Notifier.php +++ b/lib/Notification/Notifier.php @@ -144,7 +144,7 @@ class Notifier implements INotifier { throw new InvalidArgumentException(); } - $iconPath = $this->urlGenerator->imagePath(Application::APP_ID, 'black_circle.svg'); + $iconPath = $this->urlGenerator->imagePath(Application::APP_ID, 'circles.svg'); $notification->setIcon($this->urlGenerator->getAbsoluteURL($iconPath)); if ($notification->getObjectType() === 'member') { diff --git a/lib/Service/CirclesService.php b/lib/Service/CirclesService.php index cee7b1ff..84ff133b 100644 --- a/lib/Service/CirclesService.php +++ b/lib/Service/CirclesService.php @@ -589,12 +589,12 @@ class CirclesService { ); case DeprecatedCircle::CIRCLES_PUBLIC: return $urlGen->getAbsoluteURL( - $urlGen->imagePath(Application::APP_ID, 'black_circle' . $ext) + $urlGen->imagePath(Application::APP_ID, 'circles' . $ext) ); } return $urlGen->getAbsoluteURL( - $urlGen->imagePath(Application::APP_ID, 'black_circle' . $ext) + $urlGen->imagePath(Application::APP_ID, 'circles' . $ext) ); }