diff options
author | Chocobozzz <me@florianbigard.com> | 2022-06-15 14:59:25 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2022-06-16 11:37:08 +0200 |
commit | 5b0ec7cddb1ae6dbd2057f067382866f846b882c (patch) | |
tree | 5751d96ec4ab0d49b793c4ff1c8edbc8daeab6ac /client/src/app/shared/shared-main | |
parent | b13a0a48bacb53e65e665774e621326452045294 (diff) | |
download | PeerTube-5b0ec7cddb1ae6dbd2057f067382866f846b882c.tar.gz PeerTube-5b0ec7cddb1ae6dbd2057f067382866f846b882c.tar.zst PeerTube-5b0ec7cddb1ae6dbd2057f067382866f846b882c.zip |
Increase global font size
Diffstat (limited to 'client/src/app/shared/shared-main')
9 files changed, 28 insertions, 46 deletions
diff --git a/client/src/app/shared/shared-main/buttons/action-dropdown.component.html b/client/src/app/shared/shared-main/buttons/action-dropdown.component.html index 10dae68f0..017355bd0 100644 --- a/client/src/app/shared/shared-main/buttons/action-dropdown.component.html +++ b/client/src/app/shared/shared-main/buttons/action-dropdown.component.html | |||
@@ -39,7 +39,7 @@ | |||
39 | </span> | 39 | </span> |
40 | 40 | ||
41 | <h6 | 41 | <h6 |
42 | *ngIf="!action.linkBuilder && action.isHeader" [ngClass]="{ 'with-icon': !!action.iconName }" | 42 | *ngIf="!action.linkBuilder && action.isHeader && areActionsDisplayed(actions, entry)" [ngClass]="{ 'with-icon': !!action.iconName }" |
43 | class="dropdown-header" tabindex="0" role="button" [title]="action.title || ''" (click)="action.handler(entry)" (keyup.enter)="action.handler(entry)" | 43 | class="dropdown-header" tabindex="0" role="button" [title]="action.title || ''" (click)="action.handler(entry)" (keyup.enter)="action.handler(entry)" |
44 | > | 44 | > |
45 | <ng-container *ngTemplateOutlet="templateActionLabel; context:{ $implicit: action }"></ng-container> | 45 | <ng-container *ngTemplateOutlet="templateActionLabel; context:{ $implicit: action }"></ng-container> |
diff --git a/client/src/app/shared/shared-main/buttons/action-dropdown.component.ts b/client/src/app/shared/shared-main/buttons/action-dropdown.component.ts index 67ac6e1aa..749773f8a 100644 --- a/client/src/app/shared/shared-main/buttons/action-dropdown.component.ts +++ b/client/src/app/shared/shared-main/buttons/action-dropdown.component.ts | |||
@@ -48,7 +48,7 @@ export class ActionDropdownComponent<T> { | |||
48 | return actions.some(a => { | 48 | return actions.some(a => { |
49 | if (Array.isArray(a)) return this.areActionsDisplayed(a, entry) | 49 | if (Array.isArray(a)) return this.areActionsDisplayed(a, entry) |
50 | 50 | ||
51 | return a.isDisplayed === undefined || a.isDisplayed(entry) | 51 | return a.isHeader !== true && (a.isDisplayed === undefined || a.isDisplayed(entry)) |
52 | }) | 52 | }) |
53 | } | 53 | } |
54 | } | 54 | } |
diff --git a/client/src/app/shared/shared-main/buttons/button.component.html b/client/src/app/shared/shared-main/buttons/button.component.html index 3e558bbb8..3e3728623 100644 --- a/client/src/app/shared/shared-main/buttons/button.component.html +++ b/client/src/app/shared/shared-main/buttons/button.component.html | |||
@@ -1,8 +1,8 @@ | |||
1 | <span *ngIf="!routerLink" class="action-button" [ngClass]="getClasses()" [ngbTooltip]="title" tabindex="0"> | 1 | <div *ngIf="!routerLink" class="action-button" [ngClass]="classes" [ngbTooltip]="title" tabindex="0"> |
2 | <ng-container *ngTemplateOutlet="content"></ng-container> | 2 | <ng-container *ngTemplateOutlet="content"></ng-container> |
3 | </span> | 3 | </div> |
4 | 4 | ||
5 | <a *ngIf="routerLink" class="action-button" [ngClass]="getClasses()" [ngbTooltip]="title" [routerLink]="routerLink"> | 5 | <a *ngIf="routerLink" class="action-button" [ngClass]="classes" [ngbTooltip]="title" [routerLink]="routerLink"> |
6 | <ng-container *ngTemplateOutlet="content"></ng-container> | 6 | <ng-container *ngTemplateOutlet="content"></ng-container> |
7 | </a> | 7 | </a> |
8 | 8 | ||
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 cdd75d525..7f0cdf1ed 100644 --- a/client/src/app/shared/shared-main/buttons/button.component.scss +++ b/client/src/app/shared/shared-main/buttons/button.component.scss | |||
@@ -16,7 +16,6 @@ | |||
16 | } | 16 | } |
17 | 17 | ||
18 | :host { | 18 | :host { |
19 | outline: none; | ||
20 | display: inline-block; | 19 | display: inline-block; |
21 | } | 20 | } |
22 | 21 | ||
diff --git a/client/src/app/shared/shared-main/buttons/button.component.ts b/client/src/app/shared/shared-main/buttons/button.component.ts index 476057823..10d67831f 100644 --- a/client/src/app/shared/shared-main/buttons/button.component.ts +++ b/client/src/app/shared/shared-main/buttons/button.component.ts | |||
@@ -1,4 +1,4 @@ | |||
1 | import { Component, Input } from '@angular/core' | 1 | import { Component, Input, OnChanges } from '@angular/core' |
2 | import { GlobalIconName } from '@app/shared/shared-icons' | 2 | import { GlobalIconName } from '@app/shared/shared-icons' |
3 | 3 | ||
4 | @Component({ | 4 | @Component({ |
@@ -7,7 +7,7 @@ import { GlobalIconName } from '@app/shared/shared-icons' | |||
7 | templateUrl: './button.component.html' | 7 | templateUrl: './button.component.html' |
8 | }) | 8 | }) |
9 | 9 | ||
10 | export class ButtonComponent { | 10 | export class ButtonComponent implements OnChanges { |
11 | @Input() label = '' | 11 | @Input() label = '' |
12 | @Input() className = 'grey-button' | 12 | @Input() className = 'grey-button' |
13 | @Input() icon: GlobalIconName = undefined | 13 | @Input() icon: GlobalIconName = undefined |
@@ -17,8 +17,10 @@ export class ButtonComponent { | |||
17 | @Input() disabled = false | 17 | @Input() disabled = false |
18 | @Input() responsiveLabel = false | 18 | @Input() responsiveLabel = false |
19 | 19 | ||
20 | getClasses () { | 20 | classes: { [id: string]: boolean } = {} |
21 | return { | 21 | |
22 | ngOnChanges () { | ||
23 | this.classes = { | ||
22 | [this.className]: true, | 24 | [this.className]: true, |
23 | disabled: this.disabled, | 25 | disabled: this.disabled, |
24 | 'icon-only': !this.label, | 26 | 'icon-only': !this.label, |
diff --git a/client/src/app/shared/shared-main/buttons/edit-button.component.ts b/client/src/app/shared/shared-main/buttons/edit-button.component.ts index 0049dfa64..28aacbbff 100644 --- a/client/src/app/shared/shared-main/buttons/edit-button.component.ts +++ b/client/src/app/shared/shared-main/buttons/edit-button.component.ts | |||
@@ -25,10 +25,6 @@ export class EditButtonComponent implements OnInit { | |||
25 | // <my-edit-button label /> Use default label | 25 | // <my-edit-button label /> Use default label |
26 | if (this.label === '') { | 26 | if (this.label === '') { |
27 | this.label = $localize`Update` | 27 | this.label = $localize`Update` |
28 | |||
29 | if (!this.title) { | ||
30 | this.title = this.label | ||
31 | } | ||
32 | } | 28 | } |
33 | } | 29 | } |
34 | } | 30 | } |
diff --git a/client/src/app/shared/shared-main/misc/channels-setup-message.component.scss b/client/src/app/shared/shared-main/misc/channels-setup-message.component.scss index 7dcba2ca5..2aa176e1b 100644 --- a/client/src/app/shared/shared-main/misc/channels-setup-message.component.scss +++ b/client/src/app/shared/shared-main/misc/channels-setup-message.component.scss | |||
@@ -5,28 +5,24 @@ | |||
5 | display: flex; | 5 | display: flex; |
6 | align-items: center; | 6 | align-items: center; |
7 | justify-content: center; | 7 | justify-content: center; |
8 | } | ||
8 | 9 | ||
9 | my-global-icon { | 10 | my-global-icon { |
10 | width: 32px; | 11 | @include apply-svg-color(pvar(--mainColor)); |
11 | align-self: flex-start; | ||
12 | 12 | ||
13 | ::ng-deep { | 13 | width: 32px; |
14 | svg { | 14 | align-self: flex-start; |
15 | fill: #0c5460; | ||
16 | } | ||
17 | } | ||
18 | 15 | ||
19 | + div { | 16 | + div { |
20 | margin-left: 10px; | 17 | margin-left: 10px; |
21 | text-align: center; | 18 | text-align: center; |
19 | } | ||
20 | } | ||
22 | 21 | ||
23 | a.channels-settings-link { | 22 | .channels-settings-link { |
24 | @include peertube-button-link; | 23 | @include peertube-button-link; |
25 | @include grey-button; | 24 | @include grey-button; |
26 | 25 | ||
27 | height: fit-content; | 26 | height: fit-content; |
28 | margin-top: 10px; | 27 | margin-top: 10px; |
29 | } | ||
30 | } | ||
31 | } | ||
32 | } | 28 | } |
diff --git a/client/src/app/shared/shared-main/misc/simple-search-input.component.html b/client/src/app/shared/shared-main/misc/simple-search-input.component.html index ae57ca5b7..386d26116 100644 --- a/client/src/app/shared/shared-main/misc/simple-search-input.component.html +++ b/client/src/app/shared/shared-main/misc/simple-search-input.component.html | |||
@@ -1,13 +1,7 @@ | |||
1 | <div class="root"> | 1 | <div class="root"> |
2 | <div class="input-group has-clear"> | 2 | <div class="input-group has-clear"> |
3 | <input | 3 | <input #ref type="text" class="last-in-group" |
4 | #ref | 4 | [(ngModel)]="value" (keyup.enter)="sendSearch()" [hidden]="!inputShown" [name]="name" [placeholder]="placeholder" |
5 | type="text" | ||
6 | [(ngModel)]="value" | ||
7 | (keyup.enter)="sendSearch()" | ||
8 | [hidden]="!inputShown" | ||
9 | [name]="name" | ||
10 | [placeholder]="placeholder" | ||
11 | > | 5 | > |
12 | 6 | ||
13 | <my-global-icon iconName="cross" role="button" class="form-control-clear" title="Clear filter" i18n-title (click)="onResetFilter()"></my-global-icon> | 7 | <my-global-icon iconName="cross" role="button" class="form-control-clear" title="Clear filter" i18n-title (click)="onResetFilter()"></my-global-icon> |
diff --git a/client/src/app/shared/shared-main/users/user-quota.component.scss b/client/src/app/shared/shared-main/users/user-quota.component.scss index 70571bde6..f3e86ce78 100644 --- a/client/src/app/shared/shared-main/users/user-quota.component.scss +++ b/client/src/app/shared/shared-main/users/user-quota.component.scss | |||
@@ -1,11 +1,6 @@ | |||
1 | @use '_variables' as *; | 1 | @use '_variables' as *; |
2 | @use '_mixins' as *; | 2 | @use '_mixins' as *; |
3 | 3 | ||
4 | label { | ||
5 | font-weight: $font-regular; | ||
6 | font-size: 100%; | ||
7 | } | ||
8 | |||
9 | .user-quota { | 4 | .user-quota { |
10 | label { | 5 | label { |
11 | @include margin-right(5px); | 6 | @include margin-right(5px); |