From 93c728a25a87cf6dae5fc49d42d6af52ff7f7ff2 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 13 Jun 2022 10:14:03 +0200 Subject: Replace all glyphicon icons --- .../shared-abuse-list/abuse-details.component.html | 6 +++-- .../shared-abuse-list/abuse-details.component.scss | 4 +++ .../abuse-list-table.component.html | 8 +++--- .../abuse-list-table.component.scss | 11 +++++--- .../advanced-input-filter.component.html | 2 +- .../shared/shared-forms/input-text.component.html | 5 ++-- .../shared/shared-forms/input-text.component.scss | 4 +-- .../shared/shared-forms/input-text.component.ts | 7 ++++++ .../shared/shared-icons/global-icon.component.ts | 5 ++++ .../shared-instance/feature-boolean.component.html | 5 ++-- .../shared-instance/feature-boolean.component.scss | 4 +-- .../instance-statistics.component.html | 18 +++++++------- .../instance-statistics.component.scss | 29 +++++++++++----------- .../shared-instance/shared-instance.module.ts | 2 ++ .../shared/shared-main/loaders/loader.component.ts | 2 +- .../misc/simple-search-input.component.html | 2 +- .../misc/simple-search-input.component.scss | 6 ++++- .../shared-share-modal/video-share.component.html | 4 +-- .../shared-share-modal/video-share.component.scss | 4 --- .../shared-tables/table-expander-icon.component.ts | 2 +- .../shared/shared-tables/video-cell.component.scss | 7 ------ .../video-download.component.html | 4 +-- .../video-download.component.scss | 4 --- 23 files changed, 77 insertions(+), 68 deletions(-) (limited to 'client/src/app/shared') diff --git a/client/src/app/shared/shared-abuse-list/abuse-details.component.html b/client/src/app/shared/shared-abuse-list/abuse-details.component.html index bb87279d7..b04d46e32 100644 --- a/client/src/app/shared/shared-abuse-list/abuse-details.component.html +++ b/client/src/app/shared/shared-abuse-list/abuse-details.component.html @@ -19,7 +19,8 @@ - {abuse.countReportsForReporter, plural, =1 {1 report} other {{{ abuse.countReportsForReporter }} reports}} + {abuse.countReportsForReporter, plural, =1 {1 report} other {{{ abuse.countReportsForReporter }} reports}} + @@ -39,7 +40,8 @@ - {abuse.countReportsForReportee, plural, =1 {1 report} other {{{ abuse.countReportsForReportee }} reports}} + {abuse.countReportsForReportee, plural, =1 {1 report} other {{{ abuse.countReportsForReportee }} reports}} + diff --git a/client/src/app/shared/shared-abuse-list/abuse-details.component.scss b/client/src/app/shared/shared-abuse-list/abuse-details.component.scss index 37bf4cc56..bd43ed459 100644 --- a/client/src/app/shared/shared-abuse-list/abuse-details.component.scss +++ b/client/src/app/shared/shared-abuse-list/abuse-details.component.scss @@ -15,3 +15,7 @@ .abuse-details-links { @include disable-default-a-behaviour; } + +my-global-icon[iconName=flag] { + width: 15px; +} diff --git a/client/src/app/shared/shared-abuse-list/abuse-list-table.component.html b/client/src/app/shared/shared-abuse-list/abuse-list-table.component.html index 6d1de808d..f79054d03 100644 --- a/client/src/app/shared/shared-abuse-list/abuse-list-table.component.html +++ b/client/src/app/shared/shared-abuse-list/abuse-list-table.component.html @@ -70,7 +70,7 @@ - + @@ -80,7 +80,7 @@
{{ abuse.video.name }} - +
by {{ abuse.video.channel?.displayName }} on {{ abuse.video.channel?.host }}
@@ -116,8 +116,8 @@ {{ abuse.createdAt | date: 'short' }} - - + + diff --git a/client/src/app/shared/shared-abuse-list/abuse-list-table.component.scss b/client/src/app/shared/shared-abuse-list/abuse-list-table.component.scss index 2d8acae58..4852f2e8b 100644 --- a/client/src/app/shared/shared-abuse-list/abuse-list-table.component.scss +++ b/client/src/app/shared/shared-abuse-list/abuse-list-table.component.scss @@ -7,10 +7,6 @@ color: var(--greyForegroundColor); } -.abuse-states .glyphicon-comment { - @include margin-left(0.5rem); -} - .abuse-messages { my-global-icon { @include margin-left(3px); @@ -20,3 +16,10 @@ top: -2px; } } + +.table-video-text my-global-icon, +my-video-cell my-global-icon { + width: 15px; + position: relative; + top: -2px; +} diff --git a/client/src/app/shared/shared-forms/advanced-input-filter.component.html b/client/src/app/shared/shared-forms/advanced-input-filter.component.html index 1d6b3df7e..e4f318385 100644 --- a/client/src/app/shared/shared-forms/advanced-input-filter.component.html +++ b/client/src/app/shared/shared-forms/advanced-input-filter.component.html @@ -25,5 +25,5 @@ (keyup)="onInputSearch($event)" > - + diff --git a/client/src/app/shared/shared-forms/input-text.component.html b/client/src/app/shared/shared-forms/input-text.component.html index f7f9ce403..669b5f32e 100644 --- a/client/src/app/shared/shared-forms/input-text.component.html +++ b/client/src/app/shared/shared-forms/input-text.component.html @@ -5,8 +5,9 @@ #input (click)="input.select()" (input)="update()" (change)="update()" [type]="inputType" class="form-control" /> -