From 345b4a22a8432cfd8c9c9f24634821d58c215b9a Mon Sep 17 00:00:00 2001 From: Kim <1877318+kimsible@users.noreply.github.com> Date: Thu, 23 Jul 2020 14:42:06 +0200 Subject: [PATCH] Update my-account sub-menus icons (#2977) * Update user sub-menus icons * Update admin sub-menu icons * Add solendp to credits Co-authored-by: kimsible --- client/src/app/+admin/admin.component.ts | 4 ++-- .../app/+my-account/my-account.component.ts | 8 ++++---- .../shared-icons/global-icon.component.ts | 3 ++- client/src/assets/images/feather/server.svg | 1 - client/src/assets/images/feather/user-x.svg | 1 + client/src/assets/images/misc/peertube-x.svg | 20 +++++++++++++++++++ scripts/generate-code-contributors.ts | 1 + 7 files changed, 30 insertions(+), 8 deletions(-) delete mode 100644 client/src/assets/images/feather/server.svg create mode 100644 client/src/assets/images/feather/user-x.svg create mode 100644 client/src/assets/images/misc/peertube-x.svg diff --git a/client/src/app/+admin/admin.component.ts b/client/src/app/+admin/admin.component.ts index 4345d1945..319d50cda 100644 --- a/client/src/app/+admin/admin.component.ts +++ b/client/src/app/+admin/admin.component.ts @@ -63,14 +63,14 @@ export class AdminComponent implements OnInit { moderationItems.children.push({ label: this.i18n('Muted accounts'), routerLink: '/admin/moderation/blocklist/accounts', - iconName: 'user' + iconName: 'user-x' }) } if (this.hasServersBlocklistRight()) { moderationItems.children.push({ label: this.i18n('Muted servers'), routerLink: '/admin/moderation/blocklist/servers', - iconName: 'server' + iconName: 'peertube-x' }) } diff --git a/client/src/app/+my-account/my-account.component.ts b/client/src/app/+my-account/my-account.component.ts index abc823c62..07cab37fc 100644 --- a/client/src/app/+my-account/my-account.component.ts +++ b/client/src/app/+my-account/my-account.component.ts @@ -45,7 +45,7 @@ export class MyAccountComponent implements OnInit { { label: this.i18n('My subscriptions'), routerLink: '/my-account/subscriptions', - iconName: 'inbox-full' + iconName: 'subscriptions' }, { label: this.i18n('My history'), @@ -69,17 +69,17 @@ export class MyAccountComponent implements OnInit { { label: this.i18n('Muted accounts'), routerLink: '/my-account/blocklist/accounts', - iconName: 'user' + iconName: 'user-x' }, { label: this.i18n('Muted servers'), routerLink: '/my-account/blocklist/servers', - iconName: 'server' + iconName: 'peertube-x' }, { label: this.i18n('Ownership changes'), routerLink: '/my-account/ownership', - iconName: 'ownership-change' + iconName: 'download' } ] } diff --git a/client/src/app/shared/shared-icons/global-icon.component.ts b/client/src/app/shared/shared-icons/global-icon.component.ts index 6527c27a6..66adb7579 100644 --- a/client/src/app/shared/shared-icons/global-icon.component.ts +++ b/client/src/app/shared/shared-icons/global-icon.component.ts @@ -7,6 +7,7 @@ const icons = { 'language': require('!!raw-loader?!../../../assets/images/misc/language.svg').default, 'video-lang': require('!!raw-loader?!../../../assets/images/misc/video-lang.svg').default, 'support': require('!!raw-loader?!../../../assets/images/misc/support.svg').default, + 'peertube-x': require('!!raw-loader?!../../../assets/images/misc/peertube-x.svg').default, 'robot': require('!!raw-loader?!../../../assets/images/misc/miscellaneous_services.svg').default, // material ui 'videos': require('!!raw-loader?!../../../assets/images/misc/video_library.svg').default, // material ui 'history': require('!!raw-loader?!../../../assets/images/misc/history.svg').default, // material ui @@ -42,9 +43,9 @@ const icons = { 'share': require('!!raw-loader?!../../../assets/images/feather/share-2.svg').default, 'channel': require('!!raw-loader?!../../../assets/images/feather/tv.svg').default, 'user': require('!!raw-loader?!../../../assets/images/feather/user.svg').default, + 'user-x': require('!!raw-loader?!../../../assets/images/feather/user-x.svg').default, 'users': require('!!raw-loader?!../../../assets/images/feather/users.svg').default, 'user-add': require('!!raw-loader?!../../../assets/images/feather/user-plus.svg').default, - 'server': require('!!raw-loader?!../../../assets/images/feather/server.svg').default, 'add': require('!!raw-loader?!../../../assets/images/feather/plus-circle.svg').default, 'cloud-error': require('!!raw-loader?!../../../assets/images/feather/cloud-off.svg').default, 'undo': require('!!raw-loader?!../../../assets/images/feather/corner-up-left.svg').default, diff --git a/client/src/assets/images/feather/server.svg b/client/src/assets/images/feather/server.svg deleted file mode 100644 index 54ce094a5..000000000 --- a/client/src/assets/images/feather/server.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/client/src/assets/images/feather/user-x.svg b/client/src/assets/images/feather/user-x.svg new file mode 100644 index 000000000..0c41a4819 --- /dev/null +++ b/client/src/assets/images/feather/user-x.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/assets/images/misc/peertube-x.svg b/client/src/assets/images/misc/peertube-x.svg new file mode 100644 index 000000000..0099e627d --- /dev/null +++ b/client/src/assets/images/misc/peertube-x.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + diff --git a/scripts/generate-code-contributors.ts b/scripts/generate-code-contributors.ts index c68e23bf9..53813e6ab 100755 --- a/scripts/generate-code-contributors.ts +++ b/scripts/generate-code-contributors.ts @@ -36,6 +36,7 @@ async function run () { console.log(' * `support` by Chocobozzz (CC-BY)') console.log(' * `language` by Aaron Jin (CC-BY)') console.log(' * `video-language` by Rigel Kent (CC-BY)') + console.log(' * `peertube-x` by Solen DP (CC-BY)') } }