diff options
author | Rigel Kent <sendmemail@rigelk.eu> | 2020-07-01 02:08:58 +0200 |
---|---|---|
committer | Rigel Kent <par@rigelk.eu> | 2020-07-01 17:03:48 +0200 |
commit | 1fe1e14cb30ac44299563f98ed0aee2805794493 (patch) | |
tree | ce7066676a6aea5c022094bda4cc4068bd5f6fcf /client/src/app/shared | |
parent | c41c0e28ed444fdb427f9803d2f123ba6f535fb9 (diff) | |
download | PeerTube-1fe1e14cb30ac44299563f98ed0aee2805794493.tar.gz PeerTube-1fe1e14cb30ac44299563f98ed0aee2805794493.tar.zst PeerTube-1fe1e14cb30ac44299563f98ed0aee2805794493.zip |
fix video update button, add color to danger zone
Diffstat (limited to 'client/src/app/shared')
3 files changed, 11 insertions, 3 deletions
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 d2b0eb81a..43e2ca614 100644 --- a/client/src/app/shared/shared-main/buttons/button.component.html +++ b/client/src/app/shared/shared-main/buttons/button.component.html | |||
@@ -1,4 +1,4 @@ | |||
1 | <span class="action-button" [ngClass]="className" [title]="getTitle()"> | 1 | <span class="action-button" [ngClass]="getClasses()" [title]="getTitle()"> |
2 | <my-global-icon *ngIf="!loading" [iconName]="icon"></my-global-icon> | 2 | <my-global-icon *ngIf="!loading" [iconName]="icon"></my-global-icon> |
3 | <my-small-loader [loading]="loading"></my-small-loader> | 3 | <my-small-loader [loading]="loading"></my-small-loader> |
4 | 4 | ||
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 5b27af3f4..f37decdef 100644 --- a/client/src/app/shared/shared-main/buttons/button.component.scss +++ b/client/src/app/shared/shared-main/buttons/button.component.scss | |||
@@ -9,9 +9,9 @@ my-small-loader ::ng-deep .root { | |||
9 | 9 | ||
10 | .action-button { | 10 | .action-button { |
11 | @include peertube-button-link; | 11 | @include peertube-button-link; |
12 | @include button-with-icon(21px, 0, -2px); | 12 | @include button-with-icon(21px, 0, -1px); |
13 | 13 | ||
14 | > :nth-child(2) { | 14 | > span:nth-child(2) { |
15 | margin-left: 5px; | 15 | margin-left: 5px; |
16 | } | 16 | } |
17 | } | 17 | } |
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 e23b90945..1d2be0bf9 100644 --- a/client/src/app/shared/shared-main/buttons/button.component.ts +++ b/client/src/app/shared/shared-main/buttons/button.component.ts | |||
@@ -13,8 +13,16 @@ export class ButtonComponent { | |||
13 | @Input() icon: GlobalIconName = undefined | 13 | @Input() icon: GlobalIconName = undefined |
14 | @Input() title: string = undefined | 14 | @Input() title: string = undefined |
15 | @Input() loading = false | 15 | @Input() loading = false |
16 | @Input() disabled = false | ||
16 | 17 | ||
17 | getTitle () { | 18 | getTitle () { |
18 | return this.title || this.label | 19 | return this.title || this.label |
19 | } | 20 | } |
21 | |||
22 | getClasses () { | ||
23 | return { | ||
24 | [this.className]: true, | ||
25 | disabled: this.disabled | ||
26 | } | ||
27 | } | ||
20 | } | 28 | } |