diff options
| author | Chocobozzz <me@florianbigard.com> | 2020-07-20 17:00:58 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2020-07-20 17:00:58 +0200 |
| commit | ec903c010ecc54ec2acad0bf2cf10e7fbf6a0fa2 (patch) | |
| tree | 255a1f176f5f18a9205d2c7c8ce5f562f0e5ab31 /client/src/app/shared/shared-main | |
| parent | 677ea3c084508a1c3949b9f4b3da3c21bac8ff52 (diff) | |
| parent | 2170f1db6ee40531f9d08b711d8b7b00254c0031 (diff) | |
| download | PeerTube-ec903c010ecc54ec2acad0bf2cf10e7fbf6a0fa2.tar.gz PeerTube-ec903c010ecc54ec2acad0bf2cf10e7fbf6a0fa2.tar.zst PeerTube-ec903c010ecc54ec2acad0bf2cf10e7fbf6a0fa2.zip | |
Merge branch 'release/2.3.0' into develop
Diffstat (limited to 'client/src/app/shared/shared-main')
| -rw-r--r-- | client/src/app/shared/shared-main/buttons/button.component.html | 2 | ||||
| -rw-r--r-- | client/src/app/shared/shared-main/buttons/delete-button.component.html | 2 |
2 files changed, 2 insertions, 2 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 a7dd4bb10..8eccd5c3c 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]="getClasses()" [title]="getTitle()"> | 1 | <span class="action-button" [ngClass]="getClasses()" [title]="getTitle()" tabindex="0"> |
| 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/delete-button.component.html b/client/src/app/shared/shared-main/buttons/delete-button.component.html index 398b6db1e..6643e6013 100644 --- a/client/src/app/shared/shared-main/buttons/delete-button.component.html +++ b/client/src/app/shared/shared-main/buttons/delete-button.component.html | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <span class="action-button action-button-delete grey-button" [title]="title" role="button"> | 1 | <span class="action-button action-button-delete grey-button" [title]="title" role="button" tabindex="0"> |
| 2 | <my-global-icon iconName="delete" aria-hidden="true"></my-global-icon> | 2 | <my-global-icon iconName="delete" aria-hidden="true"></my-global-icon> |
| 3 | 3 | ||
| 4 | <span class="button-label" *ngIf="label">{{ label }}</span> | 4 | <span class="button-label" *ngIf="label">{{ label }}</span> |