diff options
author | Kim <1877318+kimsible@users.noreply.github.com> | 2020-07-23 14:42:06 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-23 14:42:06 +0200 |
commit | 345b4a22a8432cfd8c9c9f24634821d58c215b9a (patch) | |
tree | 253b5b3d3ba797ca496226a200800fafabbcf143 /client | |
parent | 8110705d020a0025ce307a9c8ee5ba9bfe8e9323 (diff) | |
download | PeerTube-345b4a22a8432cfd8c9c9f24634821d58c215b9a.tar.gz PeerTube-345b4a22a8432cfd8c9c9f24634821d58c215b9a.tar.zst PeerTube-345b4a22a8432cfd8c9c9f24634821d58c215b9a.zip |
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 <kimsible@users.noreply.github.com>
Diffstat (limited to 'client')
-rw-r--r-- | client/src/app/+admin/admin.component.ts | 4 | ||||
-rw-r--r-- | client/src/app/+my-account/my-account.component.ts | 8 | ||||
-rw-r--r-- | client/src/app/shared/shared-icons/global-icon.component.ts | 3 | ||||
-rw-r--r-- | client/src/assets/images/feather/server.svg | 1 | ||||
-rw-r--r-- | client/src/assets/images/feather/user-x.svg | 1 | ||||
-rw-r--r-- | client/src/assets/images/misc/peertube-x.svg | 20 |
6 files changed, 29 insertions, 8 deletions
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 { | |||
63 | moderationItems.children.push({ | 63 | moderationItems.children.push({ |
64 | label: this.i18n('Muted accounts'), | 64 | label: this.i18n('Muted accounts'), |
65 | routerLink: '/admin/moderation/blocklist/accounts', | 65 | routerLink: '/admin/moderation/blocklist/accounts', |
66 | iconName: 'user' | 66 | iconName: 'user-x' |
67 | }) | 67 | }) |
68 | } | 68 | } |
69 | if (this.hasServersBlocklistRight()) { | 69 | if (this.hasServersBlocklistRight()) { |
70 | moderationItems.children.push({ | 70 | moderationItems.children.push({ |
71 | label: this.i18n('Muted servers'), | 71 | label: this.i18n('Muted servers'), |
72 | routerLink: '/admin/moderation/blocklist/servers', | 72 | routerLink: '/admin/moderation/blocklist/servers', |
73 | iconName: 'server' | 73 | iconName: 'peertube-x' |
74 | }) | 74 | }) |
75 | } | 75 | } |
76 | 76 | ||
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 { | |||
45 | { | 45 | { |
46 | label: this.i18n('My subscriptions'), | 46 | label: this.i18n('My subscriptions'), |
47 | routerLink: '/my-account/subscriptions', | 47 | routerLink: '/my-account/subscriptions', |
48 | iconName: 'inbox-full' | 48 | iconName: 'subscriptions' |
49 | }, | 49 | }, |
50 | { | 50 | { |
51 | label: this.i18n('My history'), | 51 | label: this.i18n('My history'), |
@@ -69,17 +69,17 @@ export class MyAccountComponent implements OnInit { | |||
69 | { | 69 | { |
70 | label: this.i18n('Muted accounts'), | 70 | label: this.i18n('Muted accounts'), |
71 | routerLink: '/my-account/blocklist/accounts', | 71 | routerLink: '/my-account/blocklist/accounts', |
72 | iconName: 'user' | 72 | iconName: 'user-x' |
73 | }, | 73 | }, |
74 | { | 74 | { |
75 | label: this.i18n('Muted servers'), | 75 | label: this.i18n('Muted servers'), |
76 | routerLink: '/my-account/blocklist/servers', | 76 | routerLink: '/my-account/blocklist/servers', |
77 | iconName: 'server' | 77 | iconName: 'peertube-x' |
78 | }, | 78 | }, |
79 | { | 79 | { |
80 | label: this.i18n('Ownership changes'), | 80 | label: this.i18n('Ownership changes'), |
81 | routerLink: '/my-account/ownership', | 81 | routerLink: '/my-account/ownership', |
82 | iconName: 'ownership-change' | 82 | iconName: 'download' |
83 | } | 83 | } |
84 | ] | 84 | ] |
85 | } | 85 | } |
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 = { | |||
7 | 'language': require('!!raw-loader?!../../../assets/images/misc/language.svg').default, | 7 | 'language': require('!!raw-loader?!../../../assets/images/misc/language.svg').default, |
8 | 'video-lang': require('!!raw-loader?!../../../assets/images/misc/video-lang.svg').default, | 8 | 'video-lang': require('!!raw-loader?!../../../assets/images/misc/video-lang.svg').default, |
9 | 'support': require('!!raw-loader?!../../../assets/images/misc/support.svg').default, | 9 | 'support': require('!!raw-loader?!../../../assets/images/misc/support.svg').default, |
10 | 'peertube-x': require('!!raw-loader?!../../../assets/images/misc/peertube-x.svg').default, | ||
10 | 'robot': require('!!raw-loader?!../../../assets/images/misc/miscellaneous_services.svg').default, // material ui | 11 | 'robot': require('!!raw-loader?!../../../assets/images/misc/miscellaneous_services.svg').default, // material ui |
11 | 'videos': require('!!raw-loader?!../../../assets/images/misc/video_library.svg').default, // material ui | 12 | 'videos': require('!!raw-loader?!../../../assets/images/misc/video_library.svg').default, // material ui |
12 | 'history': require('!!raw-loader?!../../../assets/images/misc/history.svg').default, // material ui | 13 | 'history': require('!!raw-loader?!../../../assets/images/misc/history.svg').default, // material ui |
@@ -42,9 +43,9 @@ const icons = { | |||
42 | 'share': require('!!raw-loader?!../../../assets/images/feather/share-2.svg').default, | 43 | 'share': require('!!raw-loader?!../../../assets/images/feather/share-2.svg').default, |
43 | 'channel': require('!!raw-loader?!../../../assets/images/feather/tv.svg').default, | 44 | 'channel': require('!!raw-loader?!../../../assets/images/feather/tv.svg').default, |
44 | 'user': require('!!raw-loader?!../../../assets/images/feather/user.svg').default, | 45 | 'user': require('!!raw-loader?!../../../assets/images/feather/user.svg').default, |
46 | 'user-x': require('!!raw-loader?!../../../assets/images/feather/user-x.svg').default, | ||
45 | 'users': require('!!raw-loader?!../../../assets/images/feather/users.svg').default, | 47 | 'users': require('!!raw-loader?!../../../assets/images/feather/users.svg').default, |
46 | 'user-add': require('!!raw-loader?!../../../assets/images/feather/user-plus.svg').default, | 48 | 'user-add': require('!!raw-loader?!../../../assets/images/feather/user-plus.svg').default, |
47 | 'server': require('!!raw-loader?!../../../assets/images/feather/server.svg').default, | ||
48 | 'add': require('!!raw-loader?!../../../assets/images/feather/plus-circle.svg').default, | 49 | 'add': require('!!raw-loader?!../../../assets/images/feather/plus-circle.svg').default, |
49 | 'cloud-error': require('!!raw-loader?!../../../assets/images/feather/cloud-off.svg').default, | 50 | 'cloud-error': require('!!raw-loader?!../../../assets/images/feather/cloud-off.svg').default, |
50 | 'undo': require('!!raw-loader?!../../../assets/images/feather/corner-up-left.svg').default, | 51 | '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 @@ | |||
1 | <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-server"><rect x="2" y="2" width="20" height="8" rx="2" ry="2"></rect><rect x="2" y="14" width="20" height="8" rx="2" ry="2"></rect><line x1="6" y1="6" x2="6.01" y2="6"></line><line x1="6" y1="18" x2="6.01" y2="18"></line></svg> \ 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 @@ | |||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-user-x"><path d="M16 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2"></path><circle cx="8.5" cy="7" r="4"></circle><line x1="18" y1="8" x2="23" y2="13"></line><line x1="23" y1="8" x2="18" y2="13"></line></svg> \ 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 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | ||
2 | <!-- Generator: Adobe Illustrator 23.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> | ||
3 | <svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" | ||
4 | viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve"> | ||
5 | <style type="text/css"> | ||
6 | .st0{fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;} | ||
7 | .st1{fill:#211F20;} | ||
8 | </style> | ||
9 | <line class="st0" x1="17.1" y1="9.5" x2="22.1" y2="14.5"/> | ||
10 | <line class="st0" x1="22.1" y1="9.5" x2="17.1" y2="14.5"/> | ||
11 | <g> | ||
12 | <g> | ||
13 | <g> | ||
14 | <path class="st1" d="M2,2.6V12l6.9-4.3"/> | ||
15 | <path class="st1" d="M2,12v9.4l6.9-5.2"/> | ||
16 | <path class="st1" d="M8.9,7.7v8.6l6.9-4.3"/> | ||
17 | </g> | ||
18 | </g> | ||
19 | </g> | ||
20 | </svg> | ||