Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update my-account sub-menus icons #2977

Merged
merged 3 commits into from
Jul 23, 2020
Merged

Update my-account sub-menus icons #2977

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
575c548
Update user sub-menus icons
kimsible Jul 17, 2020
074e3d5
Update admin sub-menu icons
kimsible Jul 17, 2020
dc408d0
Add solendp to credits
kimsible Jul 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions client/src/app/+admin/admin.component.ts
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions client/src/assets/images/feather/user-x.svg
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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