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 --- client/package.json | 1 - .../users/user-list/user-list.component.scss | 7 -- .../src/app/+admin/system/jobs/jobs.component.scss | 4 - .../my-follows/my-followers.component.scss | 6 - .../my-ownership/my-ownership.component.scss | 7 -- .../shared/comment/video-comments.component.html | 4 +- .../shared/comment/video-comments.component.scss | 8 -- .../src/app/header/search-typeahead.component.html | 2 - .../src/app/header/search-typeahead.component.scss | 4 - client/src/app/menu/menu.component.scss | 4 - client/src/app/menu/notification.component.html | 13 ++- client/src/app/menu/notification.component.scss | 4 + .../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 - client/src/assets/images/feather/skip-back.svg | 1 + client/src/assets/images/feather/skip-forward.svg | 1 + client/src/sass/application.scss | 26 +++-- client/src/sass/bootstrap.scss | 4 - client/src/sass/include/_icons.scss | 58 ++++++++++ client/src/sass/include/_mixins.scss | 39 ------- client/src/sass/player/settings-menu.scss | 1 + client/src/sass/primeng-custom.scss | 126 ++++++++++----------- client/yarn.lock | 5 - 44 files changed, 230 insertions(+), 240 deletions(-) create mode 100644 client/src/assets/images/feather/skip-back.svg create mode 100644 client/src/assets/images/feather/skip-forward.svg create mode 100644 client/src/sass/include/_icons.scss diff --git a/client/package.json b/client/package.json index 4441e84a2..46a1ec00a 100644 --- a/client/package.json +++ b/client/package.json @@ -47,7 +47,6 @@ "@angular/service-worker": "^13.0.0", "@babel/core": "^7.15.0", "@babel/preset-env": "^7.15.0", - "@neos21/bootstrap3-glyphicons": "^1.0.1", "@ng-bootstrap/ng-bootstrap": "^12.1.2", "@ng-select/ng-select": "^8.1.1", "@ngx-loading-bar/core": "^6.0.0", diff --git a/client/src/app/+admin/overview/users/user-list/user-list.component.scss b/client/src/app/+admin/overview/users/user-list/user-list.component.scss index 6449f5064..3c775cac5 100644 --- a/client/src/app/+admin/overview/users/user-list/user-list.component.scss +++ b/client/src/app/+admin/overview/users/user-list/user-list.component.scss @@ -28,13 +28,6 @@ tr.banned > td { @include margin-left(15px); } -.user-table-primary-text .glyphicon { - @include margin-left(0.1rem); - - font-size: 80%; - color: #808080; -} - p-tableCheckbox { position: relative; top: -2.5px; diff --git a/client/src/app/+admin/system/jobs/jobs.component.scss b/client/src/app/+admin/system/jobs/jobs.component.scss index eadaf7904..4a76f1783 100644 --- a/client/src/app/+admin/system/jobs/jobs.component.scss +++ b/client/src/app/+admin/system/jobs/jobs.component.scss @@ -44,10 +44,6 @@ } } -td .glyphicon { - @include margin-right(10px); -} - pre { font-size: 11px; } diff --git a/client/src/app/+my-library/my-follows/my-followers.component.scss b/client/src/app/+my-library/my-follows/my-followers.component.scss index fae4cd972..d8c5f9cff 100644 --- a/client/src/app/+my-library/my-follows/my-followers.component.scss +++ b/client/src/app/+my-library/my-follows/my-followers.component.scss @@ -16,11 +16,5 @@ input[type=text] { .actor-display-name { font-size: 16px; - - + .glyphicon { - @include margin-left(5px); - - font-size: 12px; - } } } diff --git a/client/src/app/+my-library/my-ownership/my-ownership.component.scss b/client/src/app/+my-library/my-ownership/my-ownership.component.scss index d32477270..a8450ff1b 100644 --- a/client/src/app/+my-library/my-ownership/my-ownership.component.scss +++ b/client/src/app/+my-library/my-ownership/my-ownership.component.scss @@ -55,13 +55,6 @@ color: pvar(--mainForegroundColor); line-height: 1rem; - div .glyphicon { - @include margin-left(0.1rem); - - font-size: 80%; - color: #808080; - } - div + div { font-size: 80%; } diff --git a/client/src/app/+videos/+video-watch/shared/comment/video-comments.component.html b/client/src/app/+videos/+video-watch/shared/comment/video-comments.component.html index eca821370..a54df97cd 100644 --- a/client/src/app/+videos/+video-watch/shared/comment/video-comments.component.html +++ b/client/src/app/+videos/+video-watch/shared/comment/video-comments.component.html @@ -65,7 +65,7 @@ [redraftValue]="commentReplyRedraftValue" >
- + @@ -80,7 +80,7 @@ View {comment.totalReplies, plural, =1 {1 reply} other {{{ comment.totalReplies }} replies}} - +
diff --git a/client/src/app/+videos/+video-watch/shared/comment/video-comments.component.scss b/client/src/app/+videos/+video-watch/shared/comment/video-comments.component.scss index 31aa73937..4b00683ab 100644 --- a/client/src/app/+videos/+video-watch/shared/comment/video-comments.component.scss +++ b/client/src/app/+videos/+video-watch/shared/comment/video-comments.component.scss @@ -11,14 +11,6 @@ cursor: pointer; } -.glyphicon, -.comment-thread-loading { - @include margin-right(5px); - - display: inline-block; - font-size: 13px; -} - .title-block { .title-page { @include margin-right(0); diff --git a/client/src/app/header/search-typeahead.component.html b/client/src/app/header/search-typeahead.component.html index d08e2f0fb..783b4b53b 100644 --- a/client/src/app/header/search-typeahead.component.html +++ b/client/src/app/header/search-typeahead.component.html @@ -26,7 +26,6 @@
using {{ serverConfig.search.searchIndex.url }} -
Results will be augmented with those of a third-party index. Only data necessary to make the query will be sent.
@@ -41,7 +40,6 @@ any instance only followed instances - diff --git a/client/src/app/header/search-typeahead.component.scss b/client/src/app/header/search-typeahead.component.scss index 5114ec3a7..e4c9c602c 100644 --- a/client/src/app/header/search-typeahead.component.scss +++ b/client/src/app/header/search-typeahead.component.scss @@ -129,10 +129,6 @@ li.suggestion { } } -.glyphicon { - top: 3px; -} - .advanced-search-status { height: max-content; cursor: default; diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss index c52af6c80..352682bfc 100644 --- a/client/src/app/menu/menu.component.scss +++ b/client/src/app/menu/menu.component.scss @@ -352,10 +352,6 @@ my-actor-avatar { display: flex; align-items: center; - i.glyphicon-menu-right { - opacity: .4; - } - &:hover { .hover-display-toggle { display: none; diff --git a/client/src/app/menu/notification.component.html b/client/src/app/menu/notification.component.html index 5aa834f36..890b086f1 100644 --- a/client/src/app/menu/notification.component.html +++ b/client/src/app/menu/notification.component.html @@ -24,14 +24,19 @@
+ > + + + + > + +
diff --git a/client/src/app/menu/notification.component.scss b/client/src/app/menu/notification.component.scss index 3515c3e19..7f72c98d1 100644 --- a/client/src/app/menu/notification.component.scss +++ b/client/src/app/menu/notification.component.scss @@ -119,6 +119,10 @@ color: rgba(20, 20, 20, 0.8); } } + + my-global-icon { + width: 20px; + } } .all-notifications { 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" /> -