From c41c0e28ed444fdb427f9803d2f123ba6f535fb9 Mon Sep 17 00:00:00 2001 From: Rigel Kent Date: Tue, 30 Jun 2020 11:21:04 +0200 Subject: switch from softies to feathericons also organize icons in folders per origin --- .../shared/shared-icons/global-icon.component.ts | 115 +++++++++++---------- .../shared-main/buttons/button.component.scss | 4 + .../users/user-notifications.component.html | 4 +- .../video-actions-dropdown.component.ts | 2 +- 4 files changed, 66 insertions(+), 59 deletions(-) (limited to 'client/src/app/shared') 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 3de926293..75ab9e8f5 100644 --- a/client/src/app/shared/shared-icons/global-icon.component.ts +++ b/client/src/app/shared/shared-icons/global-icon.component.ts @@ -2,62 +2,65 @@ import { ChangeDetectionStrategy, Component, ElementRef, Input, OnInit } from '@ import { HooksService } from '@app/core/plugins/hooks.service' const icons = { - 'add': require('!!raw-loader?!../../../assets/images/global/add.svg').default, - 'user': require('!!raw-loader?!../../../assets/images/global/user.svg').default, - 'sign-out': require('!!raw-loader?!../../../assets/images/global/sign-out.svg').default, - 'syndication': require('!!raw-loader?!../../../assets/images/global/syndication.svg').default, - 'help': require('!!raw-loader?!../../../assets/images/global/help.svg').default, - 'sparkle': require('!!raw-loader?!../../../assets/images/global/sparkle.svg').default, - 'alert': require('!!raw-loader?!../../../assets/images/global/alert.svg').default, - 'cloud-error': require('!!raw-loader?!../../../assets/images/global/cloud-error.svg').default, - 'clock': require('!!raw-loader?!../../../assets/images/global/clock.svg').default, - 'user-add': require('!!raw-loader?!../../../assets/images/global/user-add.svg').default, - 'no': require('!!raw-loader?!../../../assets/images/global/no.svg').default, - 'cloud-download': require('!!raw-loader?!../../../assets/images/global/cloud-download.svg').default, - 'undo': require('!!raw-loader?!../../../assets/images/global/undo.svg').default, - 'history': require('!!raw-loader?!../../../assets/images/global/history.svg').default, - 'circle-tick': require('!!raw-loader?!../../../assets/images/global/circle-tick.svg').default, - 'cog': require('!!raw-loader?!../../../assets/images/global/cog.svg').default, - 'download': require('!!raw-loader?!../../../assets/images/global/download.svg').default, - 'go': require('!!raw-loader?!../../../assets/images/menu/go.svg').default, - 'edit': require('!!raw-loader?!../../../assets/images/global/edit.svg').default, - 'forward': require('!!raw-loader?!../../../assets/images/global/forward.svg').default, - 'delete': require('!!raw-loader?!../../../assets/images/global/delete.svg').default, - 'server': require('!!raw-loader?!../../../assets/images/global/server.svg').default, - 'cross': require('!!raw-loader?!../../../assets/images/global/cross.svg').default, - 'validate': require('!!raw-loader?!../../../assets/images/global/validate.svg').default, - 'tick': require('!!raw-loader?!../../../assets/images/global/tick.svg').default, - 'repeat': require('!!raw-loader?!../../../assets/images/global/repeat.svg').default, - 'inbox-full': require('!!raw-loader?!../../../assets/images/global/inbox-full.svg').default, - 'dislike': require('!!raw-loader?!../../../assets/images/video/dislike.svg').default, - 'support': require('!!raw-loader?!../../../assets/images/video/support.svg').default, - 'like': require('!!raw-loader?!../../../assets/images/video/like.svg').default, - 'more-horizontal': require('!!raw-loader?!../../../assets/images/global/more-horizontal.svg').default, - 'more-vertical': require('!!raw-loader?!../../../assets/images/global/more-vertical.svg').default, - 'share': require('!!raw-loader?!../../../assets/images/video/share.svg').default, - 'upload': require('!!raw-loader?!../../../assets/images/video/upload.svg').default, - 'playlist-add': require('!!raw-loader?!../../../assets/images/video/playlist-add.svg').default, - 'play': require('!!raw-loader?!../../../assets/images/global/play.svg').default, - 'playlists': require('!!raw-loader?!../../../assets/images/global/playlists.svg').default, - 'globe': require('!!raw-loader?!../../../assets/images/menu/globe.svg').default, - 'home': require('!!raw-loader?!../../../assets/images/menu/home.svg').default, - 'recently-added': require('!!raw-loader?!../../../assets/images/menu/recently-added.svg').default, - 'trending': require('!!raw-loader?!../../../assets/images/menu/trending.svg').default, - 'video-lang': require('!!raw-loader?!../../../assets/images/global/video-lang.svg').default, - 'videos': require('!!raw-loader?!../../../assets/images/global/videos.svg').default, - 'folder': require('!!raw-loader?!../../../assets/images/global/folder.svg').default, - 'subscriptions': require('!!raw-loader?!../../../assets/images/menu/subscriptions.svg').default, - 'language': require('!!raw-loader?!../../../assets/images/menu/language.svg').default, - 'unsensitive': require('!!raw-loader?!../../../assets/images/menu/eye.svg').default, - 'sensitive': require('!!raw-loader?!../../../assets/images/menu/eye-closed.svg').default, - 'p2p': require('!!raw-loader?!../../../assets/images/menu/p2p.svg').default, - 'users': require('!!raw-loader?!../../../assets/images/global/users.svg').default, - 'search': require('!!raw-loader?!../../../assets/images/global/search.svg').default, - 'refresh': require('!!raw-loader?!../../../assets/images/global/refresh.svg').default, - 'npm': require('!!raw-loader?!../../../assets/images/global/npm.svg').default, - 'fullscreen': require('!!raw-loader?!../../../assets/images/global/fullscreen.svg').default, - 'exit-fullscreen': require('!!raw-loader?!../../../assets/images/global/exit-fullscreen.svg').default, - 'robot': require('!!raw-loader?!../../../assets/images/global/robot.svg').default + // misc icons + 'npm': require('!!raw-loader?!../../../assets/images/misc/npm.svg').default, + '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, + '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 + 'subscriptions': require('!!raw-loader?!../../../assets/images/misc/subscriptions.svg').default, // material ui + 'playlist-add': require('!!raw-loader?!../../../assets/images/misc/playlist-add.svg').default, // material ui + + // feather icons + 'flag': require('!!raw-loader?!../../../assets/images/feather/flag.svg').default, + 'playlists': require('!!raw-loader?!../../../assets/images/feather/list.svg').default, + 'syndication': require('!!raw-loader?!../../../assets/images/feather/syndication.svg').default, + 'help': require('!!raw-loader?!../../../assets/images/feather/help.svg').default, + 'alert': require('!!raw-loader?!../../../assets/images/feather/alert.svg').default, + 'globe': require('!!raw-loader?!../../../assets/images/feather/globe.svg').default, + 'home': require('!!raw-loader?!../../../assets/images/feather/home.svg').default, + 'recently-added': require('!!raw-loader?!../../../assets/images/feather/recently-added.svg').default, + 'trending': require('!!raw-loader?!../../../assets/images/feather/trending.svg').default, + 'search': require('!!raw-loader?!../../../assets/images/feather/search.svg').default, + 'upload': require('!!raw-loader?!../../../assets/images/feather/upload.svg').default, + 'dislike': require('!!raw-loader?!../../../assets/images/feather/dislike.svg').default, + 'like': require('!!raw-loader?!../../../assets/images/feather/like.svg').default, + 'no': require('!!raw-loader?!../../../assets/images/feather/no.svg').default, + 'cloud-download': require('!!raw-loader?!../../../assets/images/feather/cloud-download.svg').default, + 'clock': require('!!raw-loader?!../../../assets/images/feather/clock.svg').default, + 'cog': require('!!raw-loader?!../../../assets/images/feather/cog.svg').default, + 'delete': require('!!raw-loader?!../../../assets/images/feather/delete.svg').default, + 'inbox-full': require('!!raw-loader?!../../../assets/images/feather/inbox-full.svg').default, + 'sign-out': require('!!raw-loader?!../../../assets/images/feather/log-out.svg').default, + 'download': require('!!raw-loader?!../../../assets/images/feather/download.svg').default, + 'ownership-change': require('!!raw-loader?!../../../assets/images/feather/share.svg').default, + '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, + '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, + 'circle-tick': require('!!raw-loader?!../../../assets/images/feather/check-circle.svg').default, + 'more-horizontal': require('!!raw-loader?!../../../assets/images/feather/more-horizontal.svg').default, + 'more-vertical': require('!!raw-loader?!../../../assets/images/feather/more-vertical.svg').default, + 'play': require('!!raw-loader?!../../../assets/images/feather/play.svg').default, + 'p2p': require('!!raw-loader?!../../../assets/images/feather/airplay.svg').default, + 'fullscreen': require('!!raw-loader?!../../../assets/images/feather/maximize.svg').default, + 'exit-fullscreen': require('!!raw-loader?!../../../assets/images/feather/minimize.svg').default, + 'film': require('!!raw-loader?!../../../assets/images/feather/film.svg').default, + 'edit': require('!!raw-loader?!../../../assets/images/feather/edit-2.svg').default, + 'sensitive': require('!!raw-loader?!../../../assets/images/feather/eye.svg').default, + 'unsensitive': require('!!raw-loader?!../../../assets/images/feather/eye-off.svg').default, + 'refresh': require('!!raw-loader?!../../../assets/images/feather/refresh-cw.svg').default, + 'go': require('!!raw-loader?!../../../assets/images/feather/arrow-up-right.svg').default, + 'cross': require('!!raw-loader?!../../../assets/images/feather/x.svg').default, + 'tick': require('!!raw-loader?!../../../assets/images/feather/check.svg').default, + 'repeat': require('!!raw-loader?!../../../assets/images/feather/repeat.svg').default } export type GlobalIconName = keyof typeof icons diff --git a/client/src/app/shared/shared-main/buttons/button.component.scss b/client/src/app/shared/shared-main/buttons/button.component.scss index 3ccfefd7e..5b27af3f4 100644 --- a/client/src/app/shared/shared-main/buttons/button.component.scss +++ b/client/src/app/shared/shared-main/buttons/button.component.scss @@ -10,6 +10,10 @@ my-small-loader ::ng-deep .root { .action-button { @include peertube-button-link; @include button-with-icon(21px, 0, -2px); + + > :nth-child(2) { + margin-left: 5px; + } } .orange-button { diff --git a/client/src/app/shared/shared-main/users/user-notifications.component.html b/client/src/app/shared/shared-main/users/user-notifications.component.html index 08771110d..d5be1470e 100644 --- a/client/src/app/shared/shared-main/users/user-notifications.component.html +++ b/client/src/app/shared/shared-main/users/user-notifications.component.html @@ -43,7 +43,7 @@ - +
A new video abuse has been created on video {{ notification.videoAbuse.video.name }} @@ -81,7 +81,7 @@ - +
Your video {{ notification.video.name }} has been published diff --git a/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts b/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts index 9bd0741df..3d1fc8690 100644 --- a/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts +++ b/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts @@ -283,7 +283,7 @@ export class VideoActionsDropdownComponent implements OnChanges { label: this.i18n('Report'), handler: () => this.showReportModal(), isDisplayed: () => this.authService.isLoggedIn() && this.displayOptions.report, - iconName: 'alert' + iconName: 'flag' } ], [ // actions regarding the account/its server -- cgit v1.2.3