From 81fe3c67c5d70e69aa2d965a41afd7331cd4fb76 Mon Sep 17 00:00:00 2001 From: Rigel Kent Date: Tue, 2 Jun 2020 17:53:32 +0200 Subject: [PATCH] fix duplicate id in svg, empty alt in base email --- .../about-peertube.component.html | 4 +- client/src/app/app.component.ts | 15 +- ...stance-config-warning-modal.component.html | 6 +- client/src/assets/images/global/add.svg | 17 +- client/src/assets/images/global/alert.svg | 17 +- .../src/assets/images/global/circle-tick.svg | 15 +- client/src/assets/images/global/clock.svg | 19 +- .../assets/images/global/cloud-download.svg | 17 +- .../src/assets/images/global/cloud-error.svg | 15 +- client/src/assets/images/global/cog.svg | 11 +- client/src/assets/images/global/cross.svg | 14 +- client/src/assets/images/global/delete.svg | 19 +- client/src/assets/images/global/download.svg | 16 +- client/src/assets/images/global/edit.svg | 15 +- .../assets/images/global/exit-fullscreen.svg | 17 +- client/src/assets/images/global/folder.svg | 15 +- .../src/assets/images/global/fullscreen.svg | 18 +- client/src/assets/images/global/help.svg | 15 +- client/src/assets/images/global/history.svg | 17 +- .../src/assets/images/global/im-with-her.svg | 15 +- .../src/assets/images/global/inbox-full.svg | 23 +- .../assets/images/global/more-horizontal.svg | 11 +- .../assets/images/global/more-vertical.svg | 13 +- client/src/assets/images/global/no.svg | 15 +- client/src/assets/images/global/npm.svg | 2 +- client/src/assets/images/global/play.svg | 11 +- client/src/assets/images/global/playlists.svg | 11 +- client/src/assets/images/global/refresh.svg | 12 +- client/src/assets/images/global/repeat.svg | 19 +- client/src/assets/images/global/search.svg | 16 +- client/src/assets/images/global/server.svg | 24 +- client/src/assets/images/global/sign-out.svg | 5 +- client/src/assets/images/global/sparkle.svg | 15 +- .../src/assets/images/global/syndication.svg | 58 +-- client/src/assets/images/global/tick.svg | 12 +- client/src/assets/images/global/undo.svg | 11 +- client/src/assets/images/global/user-add.svg | 17 +- client/src/assets/images/global/user.svg | 15 +- client/src/assets/images/global/users.svg | 15 +- client/src/assets/images/global/validate.svg | 17 +- .../src/assets/images/global/video-lang.svg | 18 +- client/src/assets/images/global/videos.svg | 21 +- client/src/assets/images/header/menu.svg | 18 +- client/src/assets/images/header/search.svg | 17 +- client/src/assets/images/logo.svg | 123 +----- client/src/assets/images/mascot/arguing.svg | 383 ++---------------- client/src/assets/images/mascot/default.svg | 324 ++------------- client/src/assets/images/mascot/defeated.svg | 354 ++-------------- client/src/assets/images/mascot/happy.svg | 372 ++--------------- client/src/assets/images/mascot/oh.svg | 310 ++------------ client/src/assets/images/mascot/pointing.svg | 334 ++------------- client/src/assets/images/menu/eye-closed.svg | 20 +- client/src/assets/images/menu/eye.svg | 21 +- client/src/assets/images/menu/globe.svg | 19 +- client/src/assets/images/menu/go.svg | 17 +- client/src/assets/images/menu/home.svg | 16 +- client/src/assets/images/menu/language.svg | 17 +- client/src/assets/images/menu/p2p.svg | 14 +- .../src/assets/images/menu/recently-added.svg | 18 +- .../src/assets/images/menu/subscriptions.svg | 40 +- client/src/assets/images/menu/trending.svg | 18 +- client/src/assets/images/search/filter.svg | 26 +- client/src/assets/images/video/dislike.svg | 17 +- client/src/assets/images/video/like.svg | 15 +- .../src/assets/images/video/playlist-add.svg | 13 +- client/src/assets/images/video/share.svg | 16 +- client/src/assets/images/video/upload.svg | 17 +- .../src/assets/player/images/fullscreen.svg | 19 +- client/src/sass/include/_mixins.scss | 22 +- client/yarn.lock | 2 +- server/lib/emails/common/base.pug | 2 +- 71 files changed, 603 insertions(+), 2639 deletions(-) diff --git a/client/src/app/+about/about-peertube/about-peertube.component.html b/client/src/app/+about/about-peertube/about-peertube.component.html index e5a8b2097..1dbad3096 100644 --- a/client/src/app/+about/about-peertube/about-peertube.component.html +++ b/client/src/app/+about/about-peertube/about-peertube.component.html @@ -3,11 +3,11 @@ What is PeerTube? - mascot + mascot

- PeerTube is a self hosted federated (ActivityPub) video streaming platform using P2P directly in the web browser. + PeerTube is a self-hosted ActivityPub-federated video streaming platform using P2P directly in your web browser.

diff --git a/client/src/app/app.component.ts b/client/src/app/app.component.ts index aba91aad2..c77dc97de 100644 --- a/client/src/app/app.component.ts +++ b/client/src/app/app.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild, AfterViewInit, Inject } from '@angular/core' +import { Component, OnInit, ViewChild, AfterViewInit, Inject, LOCALE_ID } from '@angular/core' import { DomSanitizer, SafeHtml } from '@angular/platform-browser' import { Event, GuardsCheckStart, NavigationEnd, Router, Scroll } from '@angular/router' import { AuthService, RedirectService, ServerService, ThemeService } from '@app/core' @@ -43,6 +43,7 @@ export class AppComponent implements OnInit, AfterViewInit { constructor ( @Inject(DOCUMENT) private document: Document, + @Inject(LOCALE_ID) private localeId: string, private i18n: I18n, private viewportScroller: ViewportScroller, private router: Router, @@ -97,6 +98,8 @@ export class AppComponent implements OnInit, AfterViewInit { this.location.onPopState(() => this.modalService.dismissAll(POP_STATE_MODAL_DISMISS)) this.openModalsIfNeeded() + + this.document.documentElement.lang = getShortLocale(this.localeId) } ngAfterViewInit () { @@ -171,16 +174,6 @@ export class AppComponent implements OnInit, AfterViewInit { filter(pathname => !pathname || pathname === '/' || is18nPath(pathname)) ).subscribe(() => this.redirectService.redirectToHomepage(true)) - navigationEndEvent.pipe( - map(() => window.location.pathname), - ).subscribe(pathname => { - if (is18nPath(pathname)) { - this.document.documentElement.lang = getShortLocale(pathname.split('/')[1]) - } else { - this.document.documentElement.lang = 'en' - } - }) - navigationEndEvent.subscribe(e => { this.hooks.runAction('action:router.navigation-end', 'common', { path: e.url }) }) diff --git a/client/src/app/modal/instance-config-warning-modal.component.html b/client/src/app/modal/instance-config-warning-modal.component.html index 44c994bc8..5a8290cda 100644 --- a/client/src/app/modal/instance-config-warning-modal.component.html +++ b/client/src/app/modal/instance-config-warning-modal.component.html @@ -5,7 +5,7 @@

- mascot + mascot

Hello dear administrator. You enabled user registration on your instance but you did not configure the following fields:

@@ -22,8 +22,8 @@

- Please consider to configure these fields to help people to choose the appropriate instance. - Without them, your instance may not be referenced on JoinPeerTube website. + Please consider configuring these fields to help people to choose the appropriate instance. + Without them, your instance may not be referenced on the JoinPeerTube website.

diff --git a/client/src/assets/images/global/add.svg b/client/src/assets/images/global/add.svg index 34f497056..4e6955192 100644 --- a/client/src/assets/images/global/add.svg +++ b/client/src/assets/images/global/add.svg @@ -1,11 +1,8 @@ - - - - - - - - - - + + + + + + + diff --git a/client/src/assets/images/global/alert.svg b/client/src/assets/images/global/alert.svg index 7c8c02074..7571f5e99 100644 --- a/client/src/assets/images/global/alert.svg +++ b/client/src/assets/images/global/alert.svg @@ -1,11 +1,8 @@ - - - - - - - - - - + + + + + + + diff --git a/client/src/assets/images/global/circle-tick.svg b/client/src/assets/images/global/circle-tick.svg index 2327de6be..5121a674f 100644 --- a/client/src/assets/images/global/circle-tick.svg +++ b/client/src/assets/images/global/circle-tick.svg @@ -1,12 +1,7 @@ - - - - - - - - - - + + + + + diff --git a/client/src/assets/images/global/clock.svg b/client/src/assets/images/global/clock.svg index f2d4f0397..b4cc42751 100644 --- a/client/src/assets/images/global/clock.svg +++ b/client/src/assets/images/global/clock.svg @@ -1,11 +1,8 @@ - - - - - - - - - - - \ No newline at end of file + + + + + + + + diff --git a/client/src/assets/images/global/cloud-download.svg b/client/src/assets/images/global/cloud-download.svg index b2634fd1f..3a4e58df1 100644 --- a/client/src/assets/images/global/cloud-download.svg +++ b/client/src/assets/images/global/cloud-download.svg @@ -1,11 +1,8 @@ - - - - - - - - - - + + + + + + + diff --git a/client/src/assets/images/global/cloud-error.svg b/client/src/assets/images/global/cloud-error.svg index 1a3483805..cddbf192e 100644 --- a/client/src/assets/images/global/cloud-error.svg +++ b/client/src/assets/images/global/cloud-error.svg @@ -1,11 +1,6 @@ - - - - - - - - - - + + + + + diff --git a/client/src/assets/images/global/cog.svg b/client/src/assets/images/global/cog.svg index b74a180e7..36d9bab38 100644 --- a/client/src/assets/images/global/cog.svg +++ b/client/src/assets/images/global/cog.svg @@ -1,9 +1,4 @@ - - - - - - - - + + + diff --git a/client/src/assets/images/global/cross.svg b/client/src/assets/images/global/cross.svg index 962578487..3b8b2d30d 100644 --- a/client/src/assets/images/global/cross.svg +++ b/client/src/assets/images/global/cross.svg @@ -1,10 +1,6 @@ - - - - - - - - - + + + + + diff --git a/client/src/assets/images/global/delete.svg b/client/src/assets/images/global/delete.svg index a0d9a0cac..522934703 100644 --- a/client/src/assets/images/global/delete.svg +++ b/client/src/assets/images/global/delete.svg @@ -1,12 +1,9 @@ - - - - - - - - - - - + + + + + + + + diff --git a/client/src/assets/images/global/download.svg b/client/src/assets/images/global/download.svg index 259506f31..5cecec139 100644 --- a/client/src/assets/images/global/download.svg +++ b/client/src/assets/images/global/download.svg @@ -1,11 +1,7 @@ - - - - - - - - - - + + + + + + diff --git a/client/src/assets/images/global/edit.svg b/client/src/assets/images/global/edit.svg index f04183c2d..39cedd063 100644 --- a/client/src/assets/images/global/edit.svg +++ b/client/src/assets/images/global/edit.svg @@ -1,10 +1,7 @@ - - - - - - - - - + + + + + + diff --git a/client/src/assets/images/global/exit-fullscreen.svg b/client/src/assets/images/global/exit-fullscreen.svg index ba01f583c..10cb4cc62 100644 --- a/client/src/assets/images/global/exit-fullscreen.svg +++ b/client/src/assets/images/global/exit-fullscreen.svg @@ -1,16 +1,7 @@ - + - - - - - - - - - - - - + + + diff --git a/client/src/assets/images/global/folder.svg b/client/src/assets/images/global/folder.svg index 8443c15c6..4bd701c05 100644 --- a/client/src/assets/images/global/folder.svg +++ b/client/src/assets/images/global/folder.svg @@ -1,10 +1,7 @@ - - - - - - - - - + + + + + + diff --git a/client/src/assets/images/global/fullscreen.svg b/client/src/assets/images/global/fullscreen.svg index 4a9d67864..823b53dc6 100644 --- a/client/src/assets/images/global/fullscreen.svg +++ b/client/src/assets/images/global/fullscreen.svg @@ -1,17 +1,7 @@ - - - fullscreen - Created with Sketch. + - - - - - - - - - - + + + diff --git a/client/src/assets/images/global/help.svg b/client/src/assets/images/global/help.svg index 80cd40321..f89cd5908 100644 --- a/client/src/assets/images/global/help.svg +++ b/client/src/assets/images/global/help.svg @@ -1,10 +1,7 @@ - - - - - - - - - + + + + + + diff --git a/client/src/assets/images/global/history.svg b/client/src/assets/images/global/history.svg index dfb70b598..e2a9ba4b2 100644 --- a/client/src/assets/images/global/history.svg +++ b/client/src/assets/images/global/history.svg @@ -1,11 +1,8 @@ - - - - - - - - - - + + + + + + + diff --git a/client/src/assets/images/global/im-with-her.svg b/client/src/assets/images/global/im-with-her.svg index de2c62e96..9ab8b62bf 100644 --- a/client/src/assets/images/global/im-with-her.svg +++ b/client/src/assets/images/global/im-with-her.svg @@ -1,10 +1,7 @@ - - - - - - - - - + + + + + + diff --git a/client/src/assets/images/global/inbox-full.svg b/client/src/assets/images/global/inbox-full.svg index 949f761fc..f9c67bdf0 100644 --- a/client/src/assets/images/global/inbox-full.svg +++ b/client/src/assets/images/global/inbox-full.svg @@ -1,15 +1,8 @@ - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + diff --git a/client/src/assets/images/global/more-horizontal.svg b/client/src/assets/images/global/more-horizontal.svg index 39dcad10e..5bb0cfc8b 100644 --- a/client/src/assets/images/global/more-horizontal.svg +++ b/client/src/assets/images/global/more-horizontal.svg @@ -1,9 +1,4 @@ - - - - - - - - + + + diff --git a/client/src/assets/images/global/more-vertical.svg b/client/src/assets/images/global/more-vertical.svg index 9bff87a82..42f868af2 100644 --- a/client/src/assets/images/global/more-vertical.svg +++ b/client/src/assets/images/global/more-vertical.svg @@ -1,11 +1,4 @@ - - - - - - - - - - + + + diff --git a/client/src/assets/images/global/no.svg b/client/src/assets/images/global/no.svg index bb7b28514..f8e409646 100644 --- a/client/src/assets/images/global/no.svg +++ b/client/src/assets/images/global/no.svg @@ -1,10 +1,7 @@ - - - - - - - - - + + + + + + diff --git a/client/src/assets/images/global/npm.svg b/client/src/assets/images/global/npm.svg index ec8f41243..1d1d82784 100644 --- a/client/src/assets/images/global/npm.svg +++ b/client/src/assets/images/global/npm.svg @@ -1,5 +1,5 @@ - + diff --git a/client/src/assets/images/global/play.svg b/client/src/assets/images/global/play.svg index d00122de4..37f0f0834 100644 --- a/client/src/assets/images/global/play.svg +++ b/client/src/assets/images/global/play.svg @@ -1,9 +1,4 @@ - - - - - - - - + + + diff --git a/client/src/assets/images/global/playlists.svg b/client/src/assets/images/global/playlists.svg index 21b05009a..22d377cf8 100644 --- a/client/src/assets/images/global/playlists.svg +++ b/client/src/assets/images/global/playlists.svg @@ -1,9 +1,4 @@ - - - - - - - - + + + diff --git a/client/src/assets/images/global/refresh.svg b/client/src/assets/images/global/refresh.svg index 421ab343d..e85a495e3 100644 --- a/client/src/assets/images/global/refresh.svg +++ b/client/src/assets/images/global/refresh.svg @@ -1,12 +1,4 @@ - + - - - - - - - - - + diff --git a/client/src/assets/images/global/repeat.svg b/client/src/assets/images/global/repeat.svg index 6e6b22bda..2b886a914 100644 --- a/client/src/assets/images/global/repeat.svg +++ b/client/src/assets/images/global/repeat.svg @@ -1,12 +1,7 @@ - - - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/client/src/assets/images/global/search.svg b/client/src/assets/images/global/search.svg index 46ac5848b..55c851014 100644 --- a/client/src/assets/images/global/search.svg +++ b/client/src/assets/images/global/search.svg @@ -1,11 +1,7 @@ - - - - - - - - - - + + + + + + diff --git a/client/src/assets/images/global/server.svg b/client/src/assets/images/global/server.svg index 409026e1a..f0deabf07 100644 --- a/client/src/assets/images/global/server.svg +++ b/client/src/assets/images/global/server.svg @@ -1,15 +1,11 @@ - - - - - - - - - - - - - - + + + + + + + + + + diff --git a/client/src/assets/images/global/sign-out.svg b/client/src/assets/images/global/sign-out.svg index 4e316dc8b..551c10df9 100644 --- a/client/src/assets/images/global/sign-out.svg +++ b/client/src/assets/images/global/sign-out.svg @@ -1,3 +1,4 @@ - - + + + diff --git a/client/src/assets/images/global/sparkle.svg b/client/src/assets/images/global/sparkle.svg index 3b29fefb9..c313e0b07 100644 --- a/client/src/assets/images/global/sparkle.svg +++ b/client/src/assets/images/global/sparkle.svg @@ -1,11 +1,6 @@ - - - - - - - - - - + + + + + diff --git a/client/src/assets/images/global/syndication.svg b/client/src/assets/images/global/syndication.svg index e6c88a4db..a2ce11f64 100644 --- a/client/src/assets/images/global/syndication.svg +++ b/client/src/assets/images/global/syndication.svg @@ -1,56 +1,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/client/src/assets/images/global/tick.svg b/client/src/assets/images/global/tick.svg index 4784b4807..dd7e8face 100644 --- a/client/src/assets/images/global/tick.svg +++ b/client/src/assets/images/global/tick.svg @@ -1,10 +1,4 @@ - - - - - - - - - + + + diff --git a/client/src/assets/images/global/undo.svg b/client/src/assets/images/global/undo.svg index 228245c86..dd7e8face 100644 --- a/client/src/assets/images/global/undo.svg +++ b/client/src/assets/images/global/undo.svg @@ -1,9 +1,4 @@ - - - - - - - - + + + diff --git a/client/src/assets/images/global/user-add.svg b/client/src/assets/images/global/user-add.svg index 57df23c74..b52f5fe26 100644 --- a/client/src/assets/images/global/user-add.svg +++ b/client/src/assets/images/global/user-add.svg @@ -1,11 +1,8 @@ - - - - - - - - - - + + + + + + + diff --git a/client/src/assets/images/global/user.svg b/client/src/assets/images/global/user.svg index c7b9319b6..cb37e6060 100644 --- a/client/src/assets/images/global/user.svg +++ b/client/src/assets/images/global/user.svg @@ -1,10 +1,7 @@ - - - - - - - - - + + + + + + diff --git a/client/src/assets/images/global/users.svg b/client/src/assets/images/global/users.svg index 522883785..58c1640c1 100644 --- a/client/src/assets/images/global/users.svg +++ b/client/src/assets/images/global/users.svg @@ -1,11 +1,8 @@ - - - - - - - - - + + + + + + diff --git a/client/src/assets/images/global/validate.svg b/client/src/assets/images/global/validate.svg index 520624ff6..5121a674f 100644 --- a/client/src/assets/images/global/validate.svg +++ b/client/src/assets/images/global/validate.svg @@ -1,12 +1,7 @@ - - - - - - - - - - - + + + + + + diff --git a/client/src/assets/images/global/video-lang.svg b/client/src/assets/images/global/video-lang.svg index 8d7b6a016..5ffed18da 100644 --- a/client/src/assets/images/global/video-lang.svg +++ b/client/src/assets/images/global/video-lang.svg @@ -1,15 +1,7 @@ - - - - - - - - + + + + + - - - - - diff --git a/client/src/assets/images/global/videos.svg b/client/src/assets/images/global/videos.svg index 6e37f466f..29ec768a0 100644 --- a/client/src/assets/images/global/videos.svg +++ b/client/src/assets/images/global/videos.svg @@ -1,14 +1,9 @@ - - - - - - - - - - - - - + + + + + + + + diff --git a/client/src/assets/images/header/menu.svg b/client/src/assets/images/header/menu.svg index 7101bf73b..b8bb1b128 100644 --- a/client/src/assets/images/header/menu.svg +++ b/client/src/assets/images/header/menu.svg @@ -1,14 +1,4 @@ - - - - menu - Created with Sketch. - - - - - - - - - \ No newline at end of file + + + + diff --git a/client/src/assets/images/header/search.svg b/client/src/assets/images/header/search.svg index 489b59e9b..55c851014 100644 --- a/client/src/assets/images/header/search.svg +++ b/client/src/assets/images/header/search.svg @@ -1,12 +1,7 @@ - - - - - - - - - - - + + + + + + diff --git a/client/src/assets/images/logo.svg b/client/src/assets/images/logo.svg index 38992a565..6204d62d9 100644 --- a/client/src/assets/images/logo.svg +++ b/client/src/assets/images/logo.svg @@ -1,117 +1,12 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - + + + + + + + + + diff --git a/client/src/assets/images/mascot/arguing.svg b/client/src/assets/images/mascot/arguing.svg index eae51feda..d59472fc1 100644 --- a/client/src/assets/images/mascot/arguing.svg +++ b/client/src/assets/images/mascot/arguing.svg @@ -1,347 +1,54 @@ - - - - - - - - - + + + + + + + + - - - - + + + - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - + + - - - - + + + - - - - - + + + + + - - - - + + + diff --git a/client/src/assets/images/mascot/default.svg b/client/src/assets/images/mascot/default.svg index 17cff78d3..291b28159 100644 --- a/client/src/assets/images/mascot/default.svg +++ b/client/src/assets/images/mascot/default.svg @@ -1,293 +1,47 @@ - - - - - - - - - + + + + + + + - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - + + - - - - + + + - - - - - - + + + + + + diff --git a/client/src/assets/images/mascot/defeated.svg b/client/src/assets/images/mascot/defeated.svg index 57798334c..b8f6ad35a 100644 --- a/client/src/assets/images/mascot/defeated.svg +++ b/client/src/assets/images/mascot/defeated.svg @@ -1,324 +1,44 @@ - - - - - - - - - + + + + + + - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - + + - - - - - - - - - - - - - + + + + + + + + + + diff --git a/client/src/assets/images/mascot/happy.svg b/client/src/assets/images/mascot/happy.svg index 6e17af283..82661083e 100644 --- a/client/src/assets/images/mascot/happy.svg +++ b/client/src/assets/images/mascot/happy.svg @@ -1,336 +1,50 @@ - - - - - - - - - + + + + + + + - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + - - - - + + + - - - - - - - - - - - - + + + + + + + + diff --git a/client/src/assets/images/mascot/oh.svg b/client/src/assets/images/mascot/oh.svg index 19cd75ec9..5fd703ef5 100644 --- a/client/src/assets/images/mascot/oh.svg +++ b/client/src/assets/images/mascot/oh.svg @@ -1,278 +1,44 @@ - - - - - - - - - + + + + + + + + - - - - + + + - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/client/src/assets/images/mascot/pointing.svg b/client/src/assets/images/mascot/pointing.svg index a82f43430..ac4fcf4ea 100644 --- a/client/src/assets/images/mascot/pointing.svg +++ b/client/src/assets/images/mascot/pointing.svg @@ -1,308 +1,40 @@ - - - - - - - - - + + + + + + - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - + + + - - - - - + + + + + diff --git a/client/src/assets/images/menu/eye-closed.svg b/client/src/assets/images/menu/eye-closed.svg index 5c441e719..1ec9b3090 100644 --- a/client/src/assets/images/menu/eye-closed.svg +++ b/client/src/assets/images/menu/eye-closed.svg @@ -1,17 +1,7 @@ - + - - - - - - - - - - - - - + + + - \ No newline at end of file + diff --git a/client/src/assets/images/menu/eye.svg b/client/src/assets/images/menu/eye.svg index d1c3941f1..4bacaffd7 100644 --- a/client/src/assets/images/menu/eye.svg +++ b/client/src/assets/images/menu/eye.svg @@ -1,15 +1,8 @@ - - - - - - - - - - - - - + + + + + + - \ No newline at end of file + diff --git a/client/src/assets/images/menu/globe.svg b/client/src/assets/images/menu/globe.svg index cf8331256..d62ab0439 100644 --- a/client/src/assets/images/menu/globe.svg +++ b/client/src/assets/images/menu/globe.svg @@ -1,14 +1,7 @@ - - - - - - - - - - - - - + + + + + + diff --git a/client/src/assets/images/menu/go.svg b/client/src/assets/images/menu/go.svg index b16e794ec..1ae945b61 100644 --- a/client/src/assets/images/menu/go.svg +++ b/client/src/assets/images/menu/go.svg @@ -1,12 +1,7 @@ - - - - - - - - - - - + + + + + + diff --git a/client/src/assets/images/menu/home.svg b/client/src/assets/images/menu/home.svg index b7b8cb755..4e5a5caf9 100644 --- a/client/src/assets/images/menu/home.svg +++ b/client/src/assets/images/menu/home.svg @@ -1,11 +1,7 @@ - - - - - - - - - - + + + + + + diff --git a/client/src/assets/images/menu/language.svg b/client/src/assets/images/menu/language.svg index 0ac754c87..8fd1d0ba8 100644 --- a/client/src/assets/images/menu/language.svg +++ b/client/src/assets/images/menu/language.svg @@ -1,10 +1,7 @@ - - - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/client/src/assets/images/menu/p2p.svg b/client/src/assets/images/menu/p2p.svg index 744643010..b570b8500 100644 --- a/client/src/assets/images/menu/p2p.svg +++ b/client/src/assets/images/menu/p2p.svg @@ -1,11 +1,7 @@ - + - - - - - - - + + + - \ No newline at end of file + diff --git a/client/src/assets/images/menu/recently-added.svg b/client/src/assets/images/menu/recently-added.svg index d551bfb69..4e6955192 100644 --- a/client/src/assets/images/menu/recently-added.svg +++ b/client/src/assets/images/menu/recently-added.svg @@ -1,12 +1,8 @@ - - - - - - - - - - - + + + + + + + diff --git a/client/src/assets/images/menu/subscriptions.svg b/client/src/assets/images/menu/subscriptions.svg index 08322e520..c7216352a 100644 --- a/client/src/assets/images/menu/subscriptions.svg +++ b/client/src/assets/images/menu/subscriptions.svg @@ -1,23 +1,19 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/client/src/assets/images/menu/trending.svg b/client/src/assets/images/menu/trending.svg index f1ce11487..b21bb1e9f 100644 --- a/client/src/assets/images/menu/trending.svg +++ b/client/src/assets/images/menu/trending.svg @@ -1,12 +1,8 @@ - - - - - - - - - - - + + + + + + + diff --git a/client/src/assets/images/search/filter.svg b/client/src/assets/images/search/filter.svg index 218d6dee7..7de5b8b9a 100644 --- a/client/src/assets/images/search/filter.svg +++ b/client/src/assets/images/search/filter.svg @@ -1,17 +1,9 @@ - - - - filter-ios - Created with Sketch. - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + diff --git a/client/src/assets/images/video/dislike.svg b/client/src/assets/images/video/dislike.svg index acde951e2..b192cd05a 100644 --- a/client/src/assets/images/video/dislike.svg +++ b/client/src/assets/images/video/dislike.svg @@ -1,12 +1,7 @@ - - - - - - - - - - - + + + + + + diff --git a/client/src/assets/images/video/like.svg b/client/src/assets/images/video/like.svg index d0e71763b..bacd6272c 100644 --- a/client/src/assets/images/video/like.svg +++ b/client/src/assets/images/video/like.svg @@ -1,10 +1,7 @@ - - - - - - - - - + + + + + + diff --git a/client/src/assets/images/video/playlist-add.svg b/client/src/assets/images/video/playlist-add.svg index ada845c75..7ec77b851 100644 --- a/client/src/assets/images/video/playlist-add.svg +++ b/client/src/assets/images/video/playlist-add.svg @@ -1,10 +1,5 @@ - - - - - - - + + + + diff --git a/client/src/assets/images/video/share.svg b/client/src/assets/images/video/share.svg index 7759b37af..092c02a1f 100644 --- a/client/src/assets/images/video/share.svg +++ b/client/src/assets/images/video/share.svg @@ -1,11 +1,7 @@ - - - - - - - - - - + + + + + + diff --git a/client/src/assets/images/video/upload.svg b/client/src/assets/images/video/upload.svg index 3bc0d3a8a..7ab533c9f 100644 --- a/client/src/assets/images/video/upload.svg +++ b/client/src/assets/images/video/upload.svg @@ -1,11 +1,8 @@ - - - - - - - - - - + + + + + + + diff --git a/client/src/assets/player/images/fullscreen.svg b/client/src/assets/player/images/fullscreen.svg index 44e0041a4..8cdf478ed 100644 --- a/client/src/assets/player/images/fullscreen.svg +++ b/client/src/assets/player/images/fullscreen.svg @@ -1,17 +1,14 @@ - - fullscreen - Created with Sketch. - - - - - - - - + + + + + + + + diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss index 80a090159..0b558a3f5 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss @@ -49,23 +49,23 @@ @mixin apply-svg-color ($color) { ::ng-deep svg { - path[fill="#000000"], - g[fill="#000000"], - rect[fill="#000000"], - circle[fill="#000000"], - polygon[fill="#000000"] { + path[fill="#000"], + g[fill="#000"], + rect[fill="#000"], + circle[fill="#000"], + polygon[fill="#000"] { fill: $color; } - path[stroke="#000000"], - g[stroke="#000000"], - rect[stroke="#000000"], - circle[stroke="#000000"], - polygon[stroke="#000000"] { + path[stroke="#000"], + g[stroke="#000"], + rect[stroke="#000"], + circle[stroke="#000"], + polygon[stroke="#000"] { stroke: $color; } - stop[stop-color="#000000"] { + stop[stop-color="#000"] { stop-color: $color; } } diff --git a/client/yarn.lock b/client/yarn.lock index e1df516a2..ce5646c46 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -1199,7 +1199,7 @@ dependencies: tslib "^1.9.0" -"@ngx-meta/core@9.0.0": +"@ngx-meta/core@^9.0.0": version "9.0.0" resolved "https://registry.yarnpkg.com/@ngx-meta/core/-/core-9.0.0.tgz#2c3b27bd32d41f7aaf0712d4007e0afed8e5dd3f" integrity sha512-WL/HyKM+4gJPS3TNTO0M+46LlIvGTSyofL//8hxoozAyRPsiMyR0xrwUvPBJkVqFyD6j0iI5FaNcQ9d0JCVJhg== diff --git a/server/lib/emails/common/base.pug b/server/lib/emails/common/base.pug index 9a1894cab..b66a2a6d7 100644 --- a/server/lib/emails/common/base.pug +++ b/server/lib/emails/common/base.pug @@ -197,7 +197,7 @@ body(width="100%" style="margin: 0; padding: 0 !important; mso-line-height-rule: table(role="presentation" border="0" cellpadding="0" cellspacing="0" width="100%") tr td(width="40px") - img(src=`${WEBSERVER.URL}/client/assets/images/icons/icon-192x192.png` width="auto" height="30px" alt="icon" border="0" style="height: 30px; background: #ffffff; font-family: sans-serif; font-size: 15px; line-height: 15px; color: #555555;") + img(src=`${WEBSERVER.URL}/client/assets/images/icons/icon-192x192.png` width="auto" height="30px" alt="" border="0" style="height: 30px; background: #ffffff; font-family: sans-serif; font-size: 15px; line-height: 15px; color: #555555;") td h1(style='margin: 10px 0 10px 0; font-family: sans-serif; font-size: 25px; line-height: 30px; color: #333333; font-weight: normal;') block title -- 2.41.0