Skip to content

Commit

Permalink
Update my-account sub-menus icons (#2977)
Browse files Browse the repository at this point in the history
* Update user sub-menus icons

* Update admin sub-menu icons

* Add solendp to credits

Co-authored-by: kimsible <[email protected]>
  • Loading branch information
kimsible and kimsible authored Jul 23, 2020
1 parent 8110705 commit 345b4a2
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 8 deletions.
4 changes: 2 additions & 2 deletions client/src/app/+admin/admin.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'
})
}

Expand Down
8 changes: 4 additions & 4 deletions client/src/app/+my-account/my-account.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand All @@ -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'
}
]
}
Expand Down
3 changes: 2 additions & 1 deletion client/src/app/shared/shared-icons/global-icon.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down
1 change: 0 additions & 1 deletion client/src/assets/images/feather/server.svg

This file was deleted.

1 change: 1 addition & 0 deletions client/src/assets/images/feather/user-x.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 20 additions & 0 deletions client/src/assets/images/misc/peertube-x.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions scripts/generate-code-contributors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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)')
}
}

Expand Down

0 comments on commit 345b4a2

Please sign in to comment.