diff options
7 files changed, 9 insertions, 17 deletions
diff --git a/client/src/app/core/menu/menu.service.ts b/client/src/app/core/menu/menu.service.ts index f0dc4fcaa..81837db7e 100644 --- a/client/src/app/core/menu/menu.service.ts +++ b/client/src/app/core/menu/menu.service.ts | |||
@@ -132,7 +132,7 @@ export class MenuService { | |||
132 | path: '/videos/trending' | 132 | path: '/videos/trending' |
133 | }, | 133 | }, |
134 | { | 134 | { |
135 | icon: 'recently-added' as 'recently-added', | 135 | icon: 'add' as 'add', |
136 | label: $localize`Recently added videos`, | 136 | label: $localize`Recently added videos`, |
137 | shortLabel: $localize`Recently added`, | 137 | shortLabel: $localize`Recently added`, |
138 | path: '/videos/recently-added' | 138 | path: '/videos/recently-added' |
diff --git a/client/src/app/menu/menu.component.html b/client/src/app/menu/menu.component.html index 3f00cac04..66ccb9870 100644 --- a/client/src/app/menu/menu.component.html +++ b/client/src/app/menu/menu.component.html | |||
@@ -50,8 +50,8 @@ | |||
50 | fragment="video-sensitive-content-policy" #settingsSensitiveContentPolicy | 50 | fragment="video-sensitive-content-policy" #settingsSensitiveContentPolicy |
51 | (click)="onActiveLinkScrollToAnchor(settingsSensitiveContentPolicy)" | 51 | (click)="onActiveLinkScrollToAnchor(settingsSensitiveContentPolicy)" |
52 | > | 52 | > |
53 | <my-global-icon class="hover-display-toggle" [hidden]="user.nsfwPolicy === 'display'" iconName="sensitive" aria-hidden="true"></my-global-icon> | 53 | <my-global-icon class="hover-display-toggle" [hidden]="user.nsfwPolicy === 'display'" iconName="eye-open" aria-hidden="true"></my-global-icon> |
54 | <my-global-icon class="hover-display-toggle" [hidden]="user.nsfwPolicy !== 'display'" iconName="unsensitive" aria-hidden="true"></my-global-icon> | 54 | <my-global-icon class="hover-display-toggle" [hidden]="user.nsfwPolicy !== 'display'" iconName="eye-close" aria-hidden="true"></my-global-icon> |
55 | <span i18n>Sensitive:</span> | 55 | <span i18n>Sensitive:</span> |
56 | <span class="ms-auto muted">{{ nsfwPolicy }}</span> | 56 | <span class="ms-auto muted">{{ nsfwPolicy }}</span> |
57 | </a> | 57 | </a> |
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 669b5f32e..f890c4f02 100644 --- a/client/src/app/shared/shared-forms/input-text.component.html +++ b/client/src/app/shared/shared-forms/input-text.component.html | |||
@@ -6,8 +6,8 @@ | |||
6 | /> | 6 | /> |
7 | 7 | ||
8 | <button *ngIf="withToggle" (click)="toggle()" type="button" class="btn btn-outline-secondary" [title]="toggleTitle"> | 8 | <button *ngIf="withToggle" (click)="toggle()" type="button" class="btn btn-outline-secondary" [title]="toggleTitle"> |
9 | <my-global-icon *ngIf="show" iconName="sensitive"></my-global-icon> | 9 | <my-global-icon *ngIf="show" iconName="eye-open"></my-global-icon> |
10 | <my-global-icon *ngIf="!show" iconName="unsensitive"></my-global-icon> | 10 | <my-global-icon *ngIf="!show" iconName="eye-close"></my-global-icon> |
11 | </button> | 11 | </button> |
12 | 12 | ||
13 | <button | 13 | <button |
diff --git a/client/src/app/shared/shared-forms/input-text.component.ts b/client/src/app/shared/shared-forms/input-text.component.ts index d9722e6c6..1e1da6771 100644 --- a/client/src/app/shared/shared-forms/input-text.component.ts +++ b/client/src/app/shared/shared-forms/input-text.component.ts | |||
@@ -1,7 +1,7 @@ | |||
1 | import { Component, forwardRef, Input } from '@angular/core' | 1 | import { Component, forwardRef, Input } from '@angular/core' |
2 | import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms' | 2 | import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms' |
3 | import { Notifier } from '@app/core' | 3 | import { Notifier } from '@app/core' |
4 | import { GlobalIconName } from '../shared-icons' | 4 | |
5 | 5 | ||
6 | @Component({ | 6 | @Component({ |
7 | selector: 'my-input-text', | 7 | selector: 'my-input-text', |
@@ -48,12 +48,6 @@ export class InputTextComponent implements ControlValueAccessor { | |||
48 | this.notifier.success($localize`Copied`) | 48 | this.notifier.success($localize`Copied`) |
49 | } | 49 | } |
50 | 50 | ||
51 | getEyeIcon (): GlobalIconName { | ||
52 | if (this.show) return 'sensitive' | ||
53 | |||
54 | return 'unsensitive' | ||
55 | } | ||
56 | |||
57 | propagateChange = (_: any) => { /* empty */ } | 51 | propagateChange = (_: any) => { /* empty */ } |
58 | 52 | ||
59 | writeValue (value: string) { | 53 | writeValue (value: string) { |
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 8b864fd5f..55eb45a75 100644 --- a/client/src/app/shared/shared-icons/global-icon.component.ts +++ b/client/src/app/shared/shared-icons/global-icon.component.ts | |||
@@ -29,7 +29,6 @@ const icons = { | |||
29 | alert: require('!!raw-loader?!../../../assets/images/feather/alert.svg').default, | 29 | alert: require('!!raw-loader?!../../../assets/images/feather/alert.svg').default, |
30 | globe: require('!!raw-loader?!../../../assets/images/feather/globe.svg').default, | 30 | globe: require('!!raw-loader?!../../../assets/images/feather/globe.svg').default, |
31 | home: require('!!raw-loader?!../../../assets/images/feather/home.svg').default, | 31 | home: require('!!raw-loader?!../../../assets/images/feather/home.svg').default, |
32 | 'recently-added': require('!!raw-loader?!../../../assets/images/feather/recently-added.svg').default, | ||
33 | trending: require('!!raw-loader?!../../../assets/images/feather/trending.svg').default, | 32 | trending: require('!!raw-loader?!../../../assets/images/feather/trending.svg').default, |
34 | search: require('!!raw-loader?!../../../assets/images/feather/search.svg').default, | 33 | search: require('!!raw-loader?!../../../assets/images/feather/search.svg').default, |
35 | upload: require('!!raw-loader?!../../../assets/images/feather/upload.svg').default, | 34 | upload: require('!!raw-loader?!../../../assets/images/feather/upload.svg').default, |
@@ -64,8 +63,8 @@ const icons = { | |||
64 | film: require('!!raw-loader?!../../../assets/images/feather/film.svg').default, | 63 | film: require('!!raw-loader?!../../../assets/images/feather/film.svg').default, |
65 | edit: require('!!raw-loader?!../../../assets/images/feather/edit-2.svg').default, | 64 | edit: require('!!raw-loader?!../../../assets/images/feather/edit-2.svg').default, |
66 | 'external-link': require('!!raw-loader?!../../../assets/images/feather/external-link.svg').default, | 65 | 'external-link': require('!!raw-loader?!../../../assets/images/feather/external-link.svg').default, |
67 | sensitive: require('!!raw-loader?!../../../assets/images/feather/eye.svg').default, | 66 | 'eye-open': require('!!raw-loader?!../../../assets/images/feather/eye.svg').default, |
68 | unsensitive: require('!!raw-loader?!../../../assets/images/feather/eye-off.svg').default, | 67 | 'eye-close': require('!!raw-loader?!../../../assets/images/feather/eye-off.svg').default, |
69 | refresh: require('!!raw-loader?!../../../assets/images/feather/refresh-cw.svg').default, | 68 | refresh: require('!!raw-loader?!../../../assets/images/feather/refresh-cw.svg').default, |
70 | command: require('!!raw-loader?!../../../assets/images/feather/command.svg').default, | 69 | command: require('!!raw-loader?!../../../assets/images/feather/command.svg').default, |
71 | go: require('!!raw-loader?!../../../assets/images/feather/arrow-up-right.svg').default, | 70 | go: require('!!raw-loader?!../../../assets/images/feather/arrow-up-right.svg').default, |
diff --git a/client/src/app/shared/shared-instance/instance-statistics.component.html b/client/src/app/shared/shared-instance/instance-statistics.component.html index 960520680..68b209990 100644 --- a/client/src/app/shared/shared-instance/instance-statistics.component.html +++ b/client/src/app/shared/shared-instance/instance-statistics.component.html | |||
@@ -30,7 +30,7 @@ | |||
30 | <p class="stat-value">{{ serverStats.totalLocalVideoViews | number }}</p> | 30 | <p class="stat-value">{{ serverStats.totalLocalVideoViews | number }}</p> |
31 | <p class="stat-label" i18n>views</p> | 31 | <p class="stat-label" i18n>views</p> |
32 | </div> | 32 | </div> |
33 | <my-global-icon iconName="sensitive"></my-global-icon> | 33 | <my-global-icon iconName="eye-open"></my-global-icon> |
34 | </div> | 34 | </div> |
35 | </div> | 35 | </div> |
36 | 36 | ||
diff --git a/client/src/assets/images/feather/recently-added.svg b/client/src/assets/images/feather/recently-added.svg deleted file mode 100644 index 4291ff052..000000000 --- a/client/src/assets/images/feather/recently-added.svg +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-plus-circle"><circle cx="12" cy="12" r="10"></circle><line x1="12" y1="8" x2="12" y2="16"></line><line x1="8" y1="12" x2="16" y2="12"></line></svg> \ No newline at end of file | ||