From c41c0e28ed444fdb427f9803d2f123ba6f535fb9 Mon Sep 17 00:00:00 2001 From: Rigel Kent Date: Tue, 30 Jun 2020 11:21:04 +0200 Subject: [PATCH] switch from softies to feathericons also organize icons in folders per origin --- CREDITS.md | 9 +- .../my-account-videos.component.html | 2 +- .../app/+my-account/my-account.component.ts | 6 +- client/src/app/+search/search.component.scss | 2 +- .../video-import-torrent.component.html | 2 +- .../video-import-url.component.html | 2 +- .../video-upload.component.html | 2 +- .../+video-edit/video-update.component.html | 2 +- .../+video-watch/video-watch.component.scss | 2 +- client/src/app/app.component.scss | 2 +- .../header/search-typeahead.component.html | 2 +- .../header/search-typeahead.component.scss | 8 +- .../src/app/header/suggestion.component.html | 2 +- client/src/app/menu/menu.component.html | 2 +- client/src/app/menu/menu.component.scss | 2 +- .../modal/quick-settings-modal.component.scss | 2 +- .../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 +- client/src/assets/images/feather/airplay.svg | 1 + client/src/assets/images/feather/alert.svg | 1 + .../assets/images/feather/arrow-up-right.svg | 1 + .../assets/images/feather/check-circle.svg | 1 + client/src/assets/images/feather/check.svg | 1 + client/src/assets/images/feather/clock.svg | 1 + .../{global => feather}/cloud-download.svg | 0 .../src/assets/images/feather/cloud-off.svg | 1 + client/src/assets/images/feather/cog.svg | 1 + .../assets/images/feather/corner-up-left.svg | 1 + client/src/assets/images/feather/delete.svg | 1 + client/src/assets/images/feather/dislike.svg | 1 + client/src/assets/images/feather/download.svg | 1 + client/src/assets/images/feather/edit-2.svg | 1 + client/src/assets/images/feather/eye-off.svg | 1 + client/src/assets/images/feather/eye.svg | 1 + client/src/assets/images/feather/film.svg | 1 + client/src/assets/images/feather/filter.svg | 1 + client/src/assets/images/feather/flag.svg | 1 + client/src/assets/images/feather/globe.svg | 1 + client/src/assets/images/feather/help.svg | 1 + client/src/assets/images/feather/home.svg | 1 + .../src/assets/images/feather/inbox-full.svg | 1 + client/src/assets/images/feather/like.svg | 1 + client/src/assets/images/feather/list.svg | 1 + client/src/assets/images/feather/log-out.svg | 1 + client/src/assets/images/feather/maximize.svg | 1 + client/src/assets/images/feather/minimize.svg | 1 + .../assets/images/feather/more-horizontal.svg | 1 + .../assets/images/feather/more-vertical.svg | 1 + client/src/assets/images/feather/no.svg | 1 + client/src/assets/images/feather/play.svg | 1 + .../src/assets/images/feather/plus-circle.svg | 1 + .../assets/images/feather/recently-added.svg | 1 + .../src/assets/images/feather/refresh-cw.svg | 1 + client/src/assets/images/feather/repeat.svg | 1 + client/src/assets/images/feather/search.svg | 1 + client/src/assets/images/feather/server.svg | 1 + client/src/assets/images/feather/share-2.svg | 1 + client/src/assets/images/feather/share.svg | 1 + .../{menu => feather}/subscriptions.svg | 0 .../src/assets/images/feather/syndication.svg | 1 + client/src/assets/images/feather/trending.svg | 1 + client/src/assets/images/feather/tv.svg | 1 + client/src/assets/images/feather/upload.svg | 1 + .../src/assets/images/feather/user-plus.svg | 1 + client/src/assets/images/feather/user.svg | 1 + client/src/assets/images/feather/users.svg | 1 + client/src/assets/images/feather/x.svg | 1 + client/src/assets/images/global/add.svg | 8 -- client/src/assets/images/global/alert.svg | 8 -- .../src/assets/images/global/circle-tick.svg | 7 -- client/src/assets/images/global/clock.svg | 8 -- .../src/assets/images/global/cloud-error.svg | 6 - client/src/assets/images/global/cog.svg | 4 - client/src/assets/images/global/cross.svg | 6 - client/src/assets/images/global/delete.svg | 9 -- client/src/assets/images/global/download.svg | 7 -- client/src/assets/images/global/edit.svg | 7 -- .../assets/images/global/exit-fullscreen.svg | 7 -- client/src/assets/images/global/folder.svg | 7 -- client/src/assets/images/global/forward.svg | 4 - .../src/assets/images/global/fullscreen.svg | 7 -- client/src/assets/images/global/help.svg | 7 -- client/src/assets/images/global/history.svg | 8 -- .../src/assets/images/global/inbox-full.svg | 8 -- .../assets/images/global/more-horizontal.svg | 4 - .../assets/images/global/more-vertical.svg | 4 - client/src/assets/images/global/no.svg | 7 -- client/src/assets/images/global/play.svg | 4 - client/src/assets/images/global/playlists.svg | 4 - client/src/assets/images/global/refresh.svg | 4 - client/src/assets/images/global/repeat.svg | 7 -- client/src/assets/images/global/robot.svg | 11 -- client/src/assets/images/global/search.svg | 7 -- client/src/assets/images/global/server.svg | 11 -- client/src/assets/images/global/sign-out.svg | 4 - client/src/assets/images/global/sparkle.svg | 6 - .../src/assets/images/global/syndication.svg | 4 - client/src/assets/images/global/tick.svg | 6 - client/src/assets/images/global/undo.svg | 4 - client/src/assets/images/global/user-add.svg | 8 -- client/src/assets/images/global/user.svg | 7 -- client/src/assets/images/global/users.svg | 8 -- client/src/assets/images/global/validate.svg | 7 -- client/src/assets/images/global/videos.svg | 9 -- client/src/assets/images/header/search.svg | 7 -- client/src/assets/images/menu/eye-closed.svg | 7 -- client/src/assets/images/menu/eye.svg | 8 -- client/src/assets/images/menu/globe.svg | 7 -- client/src/assets/images/menu/go.svg | 7 -- client/src/assets/images/menu/home.svg | 7 -- client/src/assets/images/menu/p2p.svg | 7 -- .../src/assets/images/menu/recently-added.svg | 8 -- client/src/assets/images/menu/trending.svg | 8 -- client/src/assets/images/misc/history.svg | 1 + .../assets/images/{menu => misc}/keyboard.png | Bin .../assets/images/{menu => misc}/language.svg | 0 .../assets/images/{header => misc}/menu.svg | 0 .../images/misc/miscellaneous_services.svg | 1 + .../assets/images/{global => misc}/npm.svg | 0 .../images/{video => misc}/playlist-add.svg | 0 .../src/assets/images/misc/subscriptions.svg | 1 + .../assets/images/{video => misc}/support.svg | 0 .../images/{global => misc}/video-lang.svg | 0 .../src/assets/images/misc/video_library.svg | 1 + client/src/assets/images/search/filter.svg | 9 -- client/src/assets/images/video/dislike.svg | 7 -- client/src/assets/images/video/like.svg | 7 -- client/src/assets/images/video/share.svg | 7 -- client/src/assets/images/video/upload.svg | 8 -- client/src/sass/include/_mixins.scss | 5 + 132 files changed, 146 insertions(+), 432 deletions(-) create mode 100644 client/src/assets/images/feather/airplay.svg create mode 100644 client/src/assets/images/feather/alert.svg create mode 100644 client/src/assets/images/feather/arrow-up-right.svg create mode 100644 client/src/assets/images/feather/check-circle.svg create mode 100644 client/src/assets/images/feather/check.svg create mode 100644 client/src/assets/images/feather/clock.svg rename client/src/assets/images/{global => feather}/cloud-download.svg (100%) create mode 100644 client/src/assets/images/feather/cloud-off.svg create mode 100644 client/src/assets/images/feather/cog.svg create mode 100644 client/src/assets/images/feather/corner-up-left.svg create mode 100644 client/src/assets/images/feather/delete.svg create mode 100644 client/src/assets/images/feather/dislike.svg create mode 100644 client/src/assets/images/feather/download.svg create mode 100644 client/src/assets/images/feather/edit-2.svg create mode 100644 client/src/assets/images/feather/eye-off.svg create mode 100644 client/src/assets/images/feather/eye.svg create mode 100644 client/src/assets/images/feather/film.svg create mode 100644 client/src/assets/images/feather/filter.svg create mode 100644 client/src/assets/images/feather/flag.svg create mode 100644 client/src/assets/images/feather/globe.svg create mode 100644 client/src/assets/images/feather/help.svg create mode 100644 client/src/assets/images/feather/home.svg create mode 100644 client/src/assets/images/feather/inbox-full.svg create mode 100644 client/src/assets/images/feather/like.svg create mode 100644 client/src/assets/images/feather/list.svg create mode 100644 client/src/assets/images/feather/log-out.svg create mode 100644 client/src/assets/images/feather/maximize.svg create mode 100644 client/src/assets/images/feather/minimize.svg create mode 100644 client/src/assets/images/feather/more-horizontal.svg create mode 100644 client/src/assets/images/feather/more-vertical.svg create mode 100644 client/src/assets/images/feather/no.svg create mode 100644 client/src/assets/images/feather/play.svg create mode 100644 client/src/assets/images/feather/plus-circle.svg create mode 100644 client/src/assets/images/feather/recently-added.svg create mode 100644 client/src/assets/images/feather/refresh-cw.svg create mode 100644 client/src/assets/images/feather/repeat.svg create mode 100644 client/src/assets/images/feather/search.svg create mode 100644 client/src/assets/images/feather/server.svg create mode 100644 client/src/assets/images/feather/share-2.svg create mode 100644 client/src/assets/images/feather/share.svg rename client/src/assets/images/{menu => feather}/subscriptions.svg (100%) create mode 100644 client/src/assets/images/feather/syndication.svg create mode 100644 client/src/assets/images/feather/trending.svg create mode 100644 client/src/assets/images/feather/tv.svg create mode 100644 client/src/assets/images/feather/upload.svg create mode 100644 client/src/assets/images/feather/user-plus.svg create mode 100644 client/src/assets/images/feather/user.svg create mode 100644 client/src/assets/images/feather/users.svg create mode 100644 client/src/assets/images/feather/x.svg delete mode 100644 client/src/assets/images/global/add.svg delete mode 100644 client/src/assets/images/global/alert.svg delete mode 100644 client/src/assets/images/global/circle-tick.svg delete mode 100644 client/src/assets/images/global/clock.svg delete mode 100644 client/src/assets/images/global/cloud-error.svg delete mode 100644 client/src/assets/images/global/cog.svg delete mode 100644 client/src/assets/images/global/cross.svg delete mode 100644 client/src/assets/images/global/delete.svg delete mode 100644 client/src/assets/images/global/download.svg delete mode 100644 client/src/assets/images/global/edit.svg delete mode 100644 client/src/assets/images/global/exit-fullscreen.svg delete mode 100644 client/src/assets/images/global/folder.svg delete mode 100644 client/src/assets/images/global/forward.svg delete mode 100644 client/src/assets/images/global/fullscreen.svg delete mode 100644 client/src/assets/images/global/help.svg delete mode 100644 client/src/assets/images/global/history.svg delete mode 100644 client/src/assets/images/global/inbox-full.svg delete mode 100644 client/src/assets/images/global/more-horizontal.svg delete mode 100644 client/src/assets/images/global/more-vertical.svg delete mode 100644 client/src/assets/images/global/no.svg delete mode 100644 client/src/assets/images/global/play.svg delete mode 100644 client/src/assets/images/global/playlists.svg delete mode 100644 client/src/assets/images/global/refresh.svg delete mode 100644 client/src/assets/images/global/repeat.svg delete mode 100644 client/src/assets/images/global/robot.svg delete mode 100644 client/src/assets/images/global/search.svg delete mode 100644 client/src/assets/images/global/server.svg delete mode 100644 client/src/assets/images/global/sign-out.svg delete mode 100644 client/src/assets/images/global/sparkle.svg delete mode 100644 client/src/assets/images/global/syndication.svg delete mode 100644 client/src/assets/images/global/tick.svg delete mode 100644 client/src/assets/images/global/undo.svg delete mode 100644 client/src/assets/images/global/user-add.svg delete mode 100644 client/src/assets/images/global/user.svg delete mode 100644 client/src/assets/images/global/users.svg delete mode 100644 client/src/assets/images/global/validate.svg delete mode 100644 client/src/assets/images/global/videos.svg delete mode 100644 client/src/assets/images/header/search.svg delete mode 100644 client/src/assets/images/menu/eye-closed.svg delete mode 100644 client/src/assets/images/menu/eye.svg delete mode 100644 client/src/assets/images/menu/globe.svg delete mode 100644 client/src/assets/images/menu/go.svg delete mode 100644 client/src/assets/images/menu/home.svg delete mode 100644 client/src/assets/images/menu/p2p.svg delete mode 100644 client/src/assets/images/menu/recently-added.svg delete mode 100644 client/src/assets/images/menu/trending.svg create mode 100644 client/src/assets/images/misc/history.svg rename client/src/assets/images/{menu => misc}/keyboard.png (100%) rename client/src/assets/images/{menu => misc}/language.svg (100%) rename client/src/assets/images/{header => misc}/menu.svg (100%) create mode 100644 client/src/assets/images/misc/miscellaneous_services.svg rename client/src/assets/images/{global => misc}/npm.svg (100%) rename client/src/assets/images/{video => misc}/playlist-add.svg (100%) create mode 100644 client/src/assets/images/misc/subscriptions.svg rename client/src/assets/images/{video => misc}/support.svg (100%) rename client/src/assets/images/{global => misc}/video-lang.svg (100%) create mode 100644 client/src/assets/images/misc/video_library.svg delete mode 100644 client/src/assets/images/search/filter.svg delete mode 100644 client/src/assets/images/video/dislike.svg delete mode 100644 client/src/assets/images/video/like.svg delete mode 100644 client/src/assets/images/video/share.svg delete mode 100644 client/src/assets/images/video/upload.svg diff --git a/CREDITS.md b/CREDITS.md index 93fe2cb7b..85a094496 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -387,7 +387,8 @@ # Icons - * [Robbie Pearce](https://robbiepearce.com/softies/) - * [Fork-Awesome](https://github.com/ForkAwesome/Fork-Awesome) - * `playlist add` by Material UI - * `language` by Aaron Jin + * [Feather Icons](feathericons.com/) (MIT) + * `playlist add`, `history`, `subscriptions`, `miscellaneous_services` by Material UI (Apache 2.0) + * `support` by Chocobozzz (CC-BY) + * `language` by Aaron Jin (CC-BY) + * `video-language` by Rigel Kent (CC-BY) diff --git a/client/src/app/+my-account/my-account-videos/my-account-videos.component.html b/client/src/app/+my-account/my-account-videos/my-account-videos.component.html index b6047645d..cb149b607 100644 --- a/client/src/app/+my-account/my-account-videos/my-account-videos.component.html +++ b/client/src/app/+my-account/my-account-videos/my-account-videos.component.html @@ -31,7 +31,7 @@ diff --git a/client/src/app/+my-account/my-account.component.ts b/client/src/app/+my-account/my-account.component.ts index 4040ab4f8..85b2795c5 100644 --- a/client/src/app/+my-account/my-account.component.ts +++ b/client/src/app/+my-account/my-account.component.ts @@ -30,7 +30,7 @@ export class MyAccountComponent implements OnInit { { label: this.i18n('My channels'), routerLink: '/my-account/video-channels', - iconName: 'folder' + iconName: 'channel' }, { label: this.i18n('My videos'), @@ -45,7 +45,7 @@ export class MyAccountComponent implements OnInit { { label: this.i18n('My subscriptions'), routerLink: '/my-account/subscriptions', - iconName: 'subscriptions' + iconName: 'inbox-full' }, { label: this.i18n('My history'), @@ -79,7 +79,7 @@ export class MyAccountComponent implements OnInit { { label: this.i18n('Ownership changes'), routerLink: '/my-account/ownership', - iconName: 'forward' + iconName: 'ownership-change' } ] } diff --git a/client/src/app/+search/search.component.scss b/client/src/app/+search/search.component.scss index 6e59adb60..64927fa4b 100644 --- a/client/src/app/+search/search.component.scss +++ b/client/src/app/+search/search.component.scss @@ -31,7 +31,7 @@ position: relative; top: -1px; margin-right: 5px; - background-image: url('../../assets/images/search/filter.svg'); + background-image: url('../../assets/images/feather/filter.svg'); } } } diff --git a/client/src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.html b/client/src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.html index 7287f799d..5678f548f 100644 --- a/client/src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.html +++ b/client/src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.html @@ -69,7 +69,7 @@ (click)="updateSecondStep()" [ngClass]="{ disabled: !form.valid || isUpdatingVideo === true }" > - + diff --git a/client/src/app/+videos/+video-edit/video-add-components/video-import-url.component.html b/client/src/app/+videos/+video-edit/video-add-components/video-import-url.component.html index 1910da403..2e434271e 100644 --- a/client/src/app/+videos/+video-edit/video-add-components/video-import-url.component.html +++ b/client/src/app/+videos/+video-edit/video-add-components/video-import-url.component.html @@ -65,7 +65,7 @@ (click)="updateSecondStep()" [ngClass]="{ disabled: !form.valid || isUpdatingVideo === true }" > - + diff --git a/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.html b/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.html index dad88a661..2c40892ee 100644 --- a/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.html +++ b/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.html @@ -83,7 +83,7 @@ (click)="updateSecondStep()" [ngClass]="{ disabled: isPublishingButtonDisabled() }" > - + diff --git a/client/src/app/+videos/+video-edit/video-update.component.html b/client/src/app/+videos/+video-edit/video-update.component.html index fbc642db9..1517d4991 100644 --- a/client/src/app/+videos/+video-edit/video-update.component.html +++ b/client/src/app/+videos/+video-edit/video-update.component.html @@ -14,7 +14,7 @@
- +
diff --git a/client/src/app/+videos/+video-watch/video-watch.component.scss b/client/src/app/+videos/+video-watch/video-watch.component.scss index 2e083982e..c7f91f4a0 100644 --- a/client/src/app/+videos/+video-watch/video-watch.component.scss +++ b/client/src/app/+videos/+video-watch/video-watch.component.scss @@ -249,7 +249,7 @@ $video-info-margin-left: 44px; filter: brightness(120%); .count { - margin-right: 5px; + margin: 0 5px; } } diff --git a/client/src/app/app.component.scss b/client/src/app/app.component.scss index a2180e19d..d121ebad2 100644 --- a/client/src/app/app.component.scss +++ b/client/src/app/app.component.scss @@ -39,7 +39,7 @@ &.icon-menu { background-color: pvar(--mainForegroundColor); - mask-image: url('../assets/images/header/menu.svg'); + mask-image: url('../assets/images/misc/menu.svg'); margin: 0 18px 0 20px; } } diff --git a/client/src/app/header/search-typeahead.component.html b/client/src/app/header/search-typeahead.component.html index 4355b67af..548da59bb 100644 --- a/client/src/app/header/search-typeahead.component.html +++ b/client/src/app/header/search-typeahead.component.html @@ -4,7 +4,7 @@ [(ngModel)]="search" (ngModelChange)="onSearchChange()" (keydown)="handleKey($event)" (keydown.enter)="doSearch()" aria-label="Search" autocomplete="off" > - +
diff --git a/client/src/app/header/search-typeahead.component.scss b/client/src/app/header/search-typeahead.component.scss index 920aa61ae..87e8b8c70 100644 --- a/client/src/app/header/search-typeahead.component.scss +++ b/client/src/app/header/search-typeahead.component.scss @@ -16,15 +16,13 @@ .icon.icon-search { @include icon(25px); - height: 21px; - - background-color: pvar(--mainForegroundColor); - mask: url('../../assets/images/header/search.svg') no-repeat 50% 50%; + height: 18px; // yolo position: absolute; margin-left: -35px; - margin-top: 5px; + margin-top: 3.5px; + right: 10px; } .jump-to-suggestions { diff --git a/client/src/app/header/suggestion.component.html b/client/src/app/header/suggestion.component.html index ab4b4b678..4ac9809e1 100644 --- a/client/src/app/header/suggestion.component.html +++ b/client/src/app/header/suggestion.component.html @@ -11,7 +11,7 @@ >
- In this instance + In this instance's network In the vidiverse
diff --git a/client/src/app/menu/menu.component.html b/client/src/app/menu/menu.component.html index a8d34088c..7f3bff170 100644 --- a/client/src/app/menu/menu.component.html +++ b/client/src/app/menu/menu.component.html @@ -26,7 +26,7 @@ - Channels settings + Channels settings
diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss index 8f8c31417..407d79725 100644 --- a/client/src/app/menu/menu.component.scss +++ b/client/src/app/menu/menu.component.scss @@ -296,7 +296,7 @@ menu { top: -1px; margin-right: 10px; - background-image: url('../../assets/images/menu/keyboard.png'); + background-image: url('../../assets/images/misc/keyboard.png'); } } diff --git a/client/src/app/modal/quick-settings-modal.component.scss b/client/src/app/modal/quick-settings-modal.component.scss index ef21542f3..afc8460d0 100644 --- a/client/src/app/modal/quick-settings-modal.component.scss +++ b/client/src/app/modal/quick-settings-modal.component.scss @@ -30,7 +30,7 @@ top: -1px; margin-right: 4px; - background-image: url('../../assets/images/menu/keyboard.png'); + background-image: url('../../assets/images/misc/keyboard.png'); } } 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 diff --git a/client/src/assets/images/feather/airplay.svg b/client/src/assets/images/feather/airplay.svg new file mode 100644 index 000000000..7ce730225 --- /dev/null +++ b/client/src/assets/images/feather/airplay.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/assets/images/feather/alert.svg b/client/src/assets/images/feather/alert.svg new file mode 100644 index 000000000..6dcb09632 --- /dev/null +++ b/client/src/assets/images/feather/alert.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/assets/images/feather/arrow-up-right.svg b/client/src/assets/images/feather/arrow-up-right.svg new file mode 100644 index 000000000..95678e00b --- /dev/null +++ b/client/src/assets/images/feather/arrow-up-right.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/assets/images/feather/check-circle.svg b/client/src/assets/images/feather/check-circle.svg new file mode 100644 index 000000000..f2f4fd1af --- /dev/null +++ b/client/src/assets/images/feather/check-circle.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/assets/images/feather/check.svg b/client/src/assets/images/feather/check.svg new file mode 100644 index 000000000..1c209899d --- /dev/null +++ b/client/src/assets/images/feather/check.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/assets/images/feather/clock.svg b/client/src/assets/images/feather/clock.svg new file mode 100644 index 000000000..ea3f5e507 --- /dev/null +++ b/client/src/assets/images/feather/clock.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/assets/images/global/cloud-download.svg b/client/src/assets/images/feather/cloud-download.svg similarity index 100% rename from client/src/assets/images/global/cloud-download.svg rename to client/src/assets/images/feather/cloud-download.svg diff --git a/client/src/assets/images/feather/cloud-off.svg b/client/src/assets/images/feather/cloud-off.svg new file mode 100644 index 000000000..1e1e7d60b --- /dev/null +++ b/client/src/assets/images/feather/cloud-off.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/assets/images/feather/cog.svg b/client/src/assets/images/feather/cog.svg new file mode 100644 index 000000000..19c27265a --- /dev/null +++ b/client/src/assets/images/feather/cog.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/assets/images/feather/corner-up-left.svg b/client/src/assets/images/feather/corner-up-left.svg new file mode 100644 index 000000000..0a1ffd613 --- /dev/null +++ b/client/src/assets/images/feather/corner-up-left.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/assets/images/feather/delete.svg b/client/src/assets/images/feather/delete.svg new file mode 100644 index 000000000..f24d55bf6 --- /dev/null +++ b/client/src/assets/images/feather/delete.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/assets/images/feather/dislike.svg b/client/src/assets/images/feather/dislike.svg new file mode 100644 index 000000000..3e7bcd6d9 --- /dev/null +++ b/client/src/assets/images/feather/dislike.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/assets/images/feather/download.svg b/client/src/assets/images/feather/download.svg new file mode 100644 index 000000000..76767a924 --- /dev/null +++ b/client/src/assets/images/feather/download.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/assets/images/feather/edit-2.svg b/client/src/assets/images/feather/edit-2.svg new file mode 100644 index 000000000..06830c9d0 --- /dev/null +++ b/client/src/assets/images/feather/edit-2.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/assets/images/feather/eye-off.svg b/client/src/assets/images/feather/eye-off.svg new file mode 100644 index 000000000..77c54cb41 --- /dev/null +++ b/client/src/assets/images/feather/eye-off.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/assets/images/feather/eye.svg b/client/src/assets/images/feather/eye.svg new file mode 100644 index 000000000..9cde24372 --- /dev/null +++ b/client/src/assets/images/feather/eye.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/assets/images/feather/film.svg b/client/src/assets/images/feather/film.svg new file mode 100644 index 000000000..ac46360d2 --- /dev/null +++ b/client/src/assets/images/feather/film.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/assets/images/feather/filter.svg b/client/src/assets/images/feather/filter.svg new file mode 100644 index 000000000..38a47e043 --- /dev/null +++ b/client/src/assets/images/feather/filter.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/assets/images/feather/flag.svg b/client/src/assets/images/feather/flag.svg new file mode 100644 index 000000000..037737cb6 --- /dev/null +++ b/client/src/assets/images/feather/flag.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/assets/images/feather/globe.svg b/client/src/assets/images/feather/globe.svg new file mode 100644 index 000000000..0a0586d36 --- /dev/null +++ b/client/src/assets/images/feather/globe.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/assets/images/feather/help.svg b/client/src/assets/images/feather/help.svg new file mode 100644 index 000000000..51fddd80d --- /dev/null +++ b/client/src/assets/images/feather/help.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/assets/images/feather/home.svg b/client/src/assets/images/feather/home.svg new file mode 100644 index 000000000..7bb31b23d --- /dev/null +++ b/client/src/assets/images/feather/home.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/assets/images/feather/inbox-full.svg b/client/src/assets/images/feather/inbox-full.svg new file mode 100644 index 000000000..03a13b4e4 --- /dev/null +++ b/client/src/assets/images/feather/inbox-full.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/assets/images/feather/like.svg b/client/src/assets/images/feather/like.svg new file mode 100644 index 000000000..226c44d85 --- /dev/null +++ b/client/src/assets/images/feather/like.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/assets/images/feather/list.svg b/client/src/assets/images/feather/list.svg new file mode 100644 index 000000000..5ce38eaa9 --- /dev/null +++ b/client/src/assets/images/feather/list.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/assets/images/feather/log-out.svg b/client/src/assets/images/feather/log-out.svg new file mode 100644 index 000000000..c9002c903 --- /dev/null +++ b/client/src/assets/images/feather/log-out.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/assets/images/feather/maximize.svg b/client/src/assets/images/feather/maximize.svg new file mode 100644 index 000000000..fc3051894 --- /dev/null +++ b/client/src/assets/images/feather/maximize.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/assets/images/feather/minimize.svg b/client/src/assets/images/feather/minimize.svg new file mode 100644 index 000000000..46d611969 --- /dev/null +++ b/client/src/assets/images/feather/minimize.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/assets/images/feather/more-horizontal.svg b/client/src/assets/images/feather/more-horizontal.svg new file mode 100644 index 000000000..dc6a85564 --- /dev/null +++ b/client/src/assets/images/feather/more-horizontal.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/assets/images/feather/more-vertical.svg b/client/src/assets/images/feather/more-vertical.svg new file mode 100644 index 000000000..cba6958f2 --- /dev/null +++ b/client/src/assets/images/feather/more-vertical.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/assets/images/feather/no.svg b/client/src/assets/images/feather/no.svg new file mode 100644 index 000000000..f4131b85f --- /dev/null +++ b/client/src/assets/images/feather/no.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/assets/images/feather/play.svg b/client/src/assets/images/feather/play.svg new file mode 100644 index 000000000..fd76e30d6 --- /dev/null +++ b/client/src/assets/images/feather/play.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/assets/images/feather/plus-circle.svg b/client/src/assets/images/feather/plus-circle.svg new file mode 100644 index 000000000..4291ff052 --- /dev/null +++ b/client/src/assets/images/feather/plus-circle.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/assets/images/feather/recently-added.svg b/client/src/assets/images/feather/recently-added.svg new file mode 100644 index 000000000..4291ff052 --- /dev/null +++ b/client/src/assets/images/feather/recently-added.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/assets/images/feather/refresh-cw.svg b/client/src/assets/images/feather/refresh-cw.svg new file mode 100644 index 000000000..06c358dd0 --- /dev/null +++ b/client/src/assets/images/feather/refresh-cw.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/assets/images/feather/repeat.svg b/client/src/assets/images/feather/repeat.svg new file mode 100644 index 000000000..c7657b08e --- /dev/null +++ b/client/src/assets/images/feather/repeat.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/assets/images/feather/search.svg b/client/src/assets/images/feather/search.svg new file mode 100644 index 000000000..8710306dd --- /dev/null +++ b/client/src/assets/images/feather/search.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/assets/images/feather/server.svg b/client/src/assets/images/feather/server.svg new file mode 100644 index 000000000..54ce094a5 --- /dev/null +++ b/client/src/assets/images/feather/server.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/assets/images/feather/share-2.svg b/client/src/assets/images/feather/share-2.svg new file mode 100644 index 000000000..09b1c7bcd --- /dev/null +++ b/client/src/assets/images/feather/share-2.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/assets/images/feather/share.svg b/client/src/assets/images/feather/share.svg new file mode 100644 index 000000000..df38c14d6 --- /dev/null +++ b/client/src/assets/images/feather/share.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/assets/images/menu/subscriptions.svg b/client/src/assets/images/feather/subscriptions.svg similarity index 100% rename from client/src/assets/images/menu/subscriptions.svg rename to client/src/assets/images/feather/subscriptions.svg diff --git a/client/src/assets/images/feather/syndication.svg b/client/src/assets/images/feather/syndication.svg new file mode 100644 index 000000000..8d5e9d4f4 --- /dev/null +++ b/client/src/assets/images/feather/syndication.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/assets/images/feather/trending.svg b/client/src/assets/images/feather/trending.svg new file mode 100644 index 000000000..52026a4df --- /dev/null +++ b/client/src/assets/images/feather/trending.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/assets/images/feather/tv.svg b/client/src/assets/images/feather/tv.svg new file mode 100644 index 000000000..955bbfff0 --- /dev/null +++ b/client/src/assets/images/feather/tv.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/assets/images/feather/upload.svg b/client/src/assets/images/feather/upload.svg new file mode 100644 index 000000000..a1db297c5 --- /dev/null +++ b/client/src/assets/images/feather/upload.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/assets/images/feather/user-plus.svg b/client/src/assets/images/feather/user-plus.svg new file mode 100644 index 000000000..21460f6ec --- /dev/null +++ b/client/src/assets/images/feather/user-plus.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/assets/images/feather/user.svg b/client/src/assets/images/feather/user.svg new file mode 100644 index 000000000..7bb5f2911 --- /dev/null +++ b/client/src/assets/images/feather/user.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/assets/images/feather/users.svg b/client/src/assets/images/feather/users.svg new file mode 100644 index 000000000..aacf6b08e --- /dev/null +++ b/client/src/assets/images/feather/users.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/assets/images/feather/x.svg b/client/src/assets/images/feather/x.svg new file mode 100644 index 000000000..7d5875ca8 --- /dev/null +++ b/client/src/assets/images/feather/x.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/assets/images/global/add.svg b/client/src/assets/images/global/add.svg deleted file mode 100644 index 4e6955192..000000000 --- a/client/src/assets/images/global/add.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/client/src/assets/images/global/alert.svg b/client/src/assets/images/global/alert.svg deleted file mode 100644 index 7571f5e99..000000000 --- a/client/src/assets/images/global/alert.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/client/src/assets/images/global/circle-tick.svg b/client/src/assets/images/global/circle-tick.svg deleted file mode 100644 index 5121a674f..000000000 --- a/client/src/assets/images/global/circle-tick.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/client/src/assets/images/global/clock.svg b/client/src/assets/images/global/clock.svg deleted file mode 100644 index b4cc42751..000000000 --- a/client/src/assets/images/global/clock.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/client/src/assets/images/global/cloud-error.svg b/client/src/assets/images/global/cloud-error.svg deleted file mode 100644 index cddbf192e..000000000 --- a/client/src/assets/images/global/cloud-error.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/client/src/assets/images/global/cog.svg b/client/src/assets/images/global/cog.svg deleted file mode 100644 index 36d9bab38..000000000 --- a/client/src/assets/images/global/cog.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/client/src/assets/images/global/cross.svg b/client/src/assets/images/global/cross.svg deleted file mode 100644 index 3b8b2d30d..000000000 --- a/client/src/assets/images/global/cross.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/client/src/assets/images/global/delete.svg b/client/src/assets/images/global/delete.svg deleted file mode 100644 index 522934703..000000000 --- a/client/src/assets/images/global/delete.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/client/src/assets/images/global/download.svg b/client/src/assets/images/global/download.svg deleted file mode 100644 index 5cecec139..000000000 --- a/client/src/assets/images/global/download.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/client/src/assets/images/global/edit.svg b/client/src/assets/images/global/edit.svg deleted file mode 100644 index 39cedd063..000000000 --- a/client/src/assets/images/global/edit.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/client/src/assets/images/global/exit-fullscreen.svg b/client/src/assets/images/global/exit-fullscreen.svg deleted file mode 100644 index 10cb4cc62..000000000 --- a/client/src/assets/images/global/exit-fullscreen.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/client/src/assets/images/global/folder.svg b/client/src/assets/images/global/folder.svg deleted file mode 100644 index 4bd701c05..000000000 --- a/client/src/assets/images/global/folder.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/client/src/assets/images/global/forward.svg b/client/src/assets/images/global/forward.svg deleted file mode 100644 index 2b3b9d9a1..000000000 --- a/client/src/assets/images/global/forward.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/client/src/assets/images/global/fullscreen.svg b/client/src/assets/images/global/fullscreen.svg deleted file mode 100644 index 823b53dc6..000000000 --- a/client/src/assets/images/global/fullscreen.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/client/src/assets/images/global/help.svg b/client/src/assets/images/global/help.svg deleted file mode 100644 index f89cd5908..000000000 --- a/client/src/assets/images/global/help.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/client/src/assets/images/global/history.svg b/client/src/assets/images/global/history.svg deleted file mode 100644 index e2a9ba4b2..000000000 --- a/client/src/assets/images/global/history.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/client/src/assets/images/global/inbox-full.svg b/client/src/assets/images/global/inbox-full.svg deleted file mode 100644 index f9c67bdf0..000000000 --- a/client/src/assets/images/global/inbox-full.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/client/src/assets/images/global/more-horizontal.svg b/client/src/assets/images/global/more-horizontal.svg deleted file mode 100644 index 5bb0cfc8b..000000000 --- a/client/src/assets/images/global/more-horizontal.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/client/src/assets/images/global/more-vertical.svg b/client/src/assets/images/global/more-vertical.svg deleted file mode 100644 index 42f868af2..000000000 --- a/client/src/assets/images/global/more-vertical.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/client/src/assets/images/global/no.svg b/client/src/assets/images/global/no.svg deleted file mode 100644 index f8e409646..000000000 --- a/client/src/assets/images/global/no.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/client/src/assets/images/global/play.svg b/client/src/assets/images/global/play.svg deleted file mode 100644 index 37f0f0834..000000000 --- a/client/src/assets/images/global/play.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/client/src/assets/images/global/playlists.svg b/client/src/assets/images/global/playlists.svg deleted file mode 100644 index 22d377cf8..000000000 --- a/client/src/assets/images/global/playlists.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/client/src/assets/images/global/refresh.svg b/client/src/assets/images/global/refresh.svg deleted file mode 100644 index e85a495e3..000000000 --- a/client/src/assets/images/global/refresh.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/client/src/assets/images/global/repeat.svg b/client/src/assets/images/global/repeat.svg deleted file mode 100644 index 2b886a914..000000000 --- a/client/src/assets/images/global/repeat.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/client/src/assets/images/global/robot.svg b/client/src/assets/images/global/robot.svg deleted file mode 100644 index 46db9baef..000000000 --- a/client/src/assets/images/global/robot.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/client/src/assets/images/global/search.svg b/client/src/assets/images/global/search.svg deleted file mode 100644 index 1583c437b..000000000 --- a/client/src/assets/images/global/search.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/client/src/assets/images/global/server.svg b/client/src/assets/images/global/server.svg deleted file mode 100644 index f0deabf07..000000000 --- a/client/src/assets/images/global/server.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/client/src/assets/images/global/sign-out.svg b/client/src/assets/images/global/sign-out.svg deleted file mode 100644 index 551c10df9..000000000 --- a/client/src/assets/images/global/sign-out.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/client/src/assets/images/global/sparkle.svg b/client/src/assets/images/global/sparkle.svg deleted file mode 100644 index c313e0b07..000000000 --- a/client/src/assets/images/global/sparkle.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/client/src/assets/images/global/syndication.svg b/client/src/assets/images/global/syndication.svg deleted file mode 100644 index a2ce11f64..000000000 --- a/client/src/assets/images/global/syndication.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/client/src/assets/images/global/tick.svg b/client/src/assets/images/global/tick.svg deleted file mode 100644 index f34040bab..000000000 --- a/client/src/assets/images/global/tick.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/client/src/assets/images/global/undo.svg b/client/src/assets/images/global/undo.svg deleted file mode 100644 index dd7e8face..000000000 --- a/client/src/assets/images/global/undo.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/client/src/assets/images/global/user-add.svg b/client/src/assets/images/global/user-add.svg deleted file mode 100644 index b52f5fe26..000000000 --- a/client/src/assets/images/global/user-add.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/client/src/assets/images/global/user.svg b/client/src/assets/images/global/user.svg deleted file mode 100644 index cb37e6060..000000000 --- a/client/src/assets/images/global/user.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/client/src/assets/images/global/users.svg b/client/src/assets/images/global/users.svg deleted file mode 100644 index 58c1640c1..000000000 --- a/client/src/assets/images/global/users.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/client/src/assets/images/global/validate.svg b/client/src/assets/images/global/validate.svg deleted file mode 100644 index 5121a674f..000000000 --- a/client/src/assets/images/global/validate.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/client/src/assets/images/global/videos.svg b/client/src/assets/images/global/videos.svg deleted file mode 100644 index 29ec768a0..000000000 --- a/client/src/assets/images/global/videos.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/client/src/assets/images/header/search.svg b/client/src/assets/images/header/search.svg deleted file mode 100644 index 55c851014..000000000 --- a/client/src/assets/images/header/search.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/client/src/assets/images/menu/eye-closed.svg b/client/src/assets/images/menu/eye-closed.svg deleted file mode 100644 index 1ec9b3090..000000000 --- a/client/src/assets/images/menu/eye-closed.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/client/src/assets/images/menu/eye.svg b/client/src/assets/images/menu/eye.svg deleted file mode 100644 index 4bacaffd7..000000000 --- a/client/src/assets/images/menu/eye.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/client/src/assets/images/menu/globe.svg b/client/src/assets/images/menu/globe.svg deleted file mode 100644 index d62ab0439..000000000 --- a/client/src/assets/images/menu/globe.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/client/src/assets/images/menu/go.svg b/client/src/assets/images/menu/go.svg deleted file mode 100644 index 1ae945b61..000000000 --- a/client/src/assets/images/menu/go.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/client/src/assets/images/menu/home.svg b/client/src/assets/images/menu/home.svg deleted file mode 100644 index 4e5a5caf9..000000000 --- a/client/src/assets/images/menu/home.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/client/src/assets/images/menu/p2p.svg b/client/src/assets/images/menu/p2p.svg deleted file mode 100644 index b570b8500..000000000 --- a/client/src/assets/images/menu/p2p.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/client/src/assets/images/menu/recently-added.svg b/client/src/assets/images/menu/recently-added.svg deleted file mode 100644 index 4e6955192..000000000 --- a/client/src/assets/images/menu/recently-added.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/client/src/assets/images/menu/trending.svg b/client/src/assets/images/menu/trending.svg deleted file mode 100644 index 8f821f3d7..000000000 --- a/client/src/assets/images/menu/trending.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/client/src/assets/images/misc/history.svg b/client/src/assets/images/misc/history.svg new file mode 100644 index 000000000..0386fae1c --- /dev/null +++ b/client/src/assets/images/misc/history.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/assets/images/menu/keyboard.png b/client/src/assets/images/misc/keyboard.png similarity index 100% rename from client/src/assets/images/menu/keyboard.png rename to client/src/assets/images/misc/keyboard.png diff --git a/client/src/assets/images/menu/language.svg b/client/src/assets/images/misc/language.svg similarity index 100% rename from client/src/assets/images/menu/language.svg rename to client/src/assets/images/misc/language.svg diff --git a/client/src/assets/images/header/menu.svg b/client/src/assets/images/misc/menu.svg similarity index 100% rename from client/src/assets/images/header/menu.svg rename to client/src/assets/images/misc/menu.svg diff --git a/client/src/assets/images/misc/miscellaneous_services.svg b/client/src/assets/images/misc/miscellaneous_services.svg new file mode 100644 index 000000000..0b7487026 --- /dev/null +++ b/client/src/assets/images/misc/miscellaneous_services.svg @@ -0,0 +1 @@ + diff --git a/client/src/assets/images/global/npm.svg b/client/src/assets/images/misc/npm.svg similarity index 100% rename from client/src/assets/images/global/npm.svg rename to client/src/assets/images/misc/npm.svg diff --git a/client/src/assets/images/video/playlist-add.svg b/client/src/assets/images/misc/playlist-add.svg similarity index 100% rename from client/src/assets/images/video/playlist-add.svg rename to client/src/assets/images/misc/playlist-add.svg diff --git a/client/src/assets/images/misc/subscriptions.svg b/client/src/assets/images/misc/subscriptions.svg new file mode 100644 index 000000000..3a37266be --- /dev/null +++ b/client/src/assets/images/misc/subscriptions.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/assets/images/video/support.svg b/client/src/assets/images/misc/support.svg similarity index 100% rename from client/src/assets/images/video/support.svg rename to client/src/assets/images/misc/support.svg diff --git a/client/src/assets/images/global/video-lang.svg b/client/src/assets/images/misc/video-lang.svg similarity index 100% rename from client/src/assets/images/global/video-lang.svg rename to client/src/assets/images/misc/video-lang.svg diff --git a/client/src/assets/images/misc/video_library.svg b/client/src/assets/images/misc/video_library.svg new file mode 100644 index 000000000..f5f623a44 --- /dev/null +++ b/client/src/assets/images/misc/video_library.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/src/assets/images/search/filter.svg b/client/src/assets/images/search/filter.svg deleted file mode 100644 index 7de5b8b9a..000000000 --- a/client/src/assets/images/search/filter.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/client/src/assets/images/video/dislike.svg b/client/src/assets/images/video/dislike.svg deleted file mode 100644 index b192cd05a..000000000 --- a/client/src/assets/images/video/dislike.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/client/src/assets/images/video/like.svg b/client/src/assets/images/video/like.svg deleted file mode 100644 index bacd6272c..000000000 --- a/client/src/assets/images/video/like.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/client/src/assets/images/video/share.svg b/client/src/assets/images/video/share.svg deleted file mode 100644 index 092c02a1f..000000000 --- a/client/src/assets/images/video/share.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/client/src/assets/images/video/upload.svg b/client/src/assets/images/video/upload.svg deleted file mode 100644 index 7ab533c9f..000000000 --- a/client/src/assets/images/video/upload.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss index 6a1deac76..ab9f982a2 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss @@ -48,6 +48,11 @@ } @mixin apply-svg-color ($color) { + ::ng-deep .feather, + ::ng-deep .material { + color: $color; + } + ::ng-deep svg { path[fill="#000"], g[fill="#000"],