diff options
author | Chocobozzz <me@florianbigard.com> | 2019-01-29 08:42:12 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2019-01-29 08:42:12 +0100 |
commit | d4520481271087aa284913ff6c198a93c0b37c49 (patch) | |
tree | 25e4a2ca64f21d9d047ac7d147f7e781b1cdb80e /client | |
parent | 185a4abd23ba07ee252655574506755c0425c540 (diff) | |
parent | 2c0070c8f31e6a28b1d52ee6e9965e21471abd5b (diff) | |
download | PeerTube-d4520481271087aa284913ff6c198a93c0b37c49.tar.gz PeerTube-d4520481271087aa284913ff6c198a93c0b37c49.tar.zst PeerTube-d4520481271087aa284913ff6c198a93c0b37c49.zip |
Merge branch 'develop' into release/v1.2.0
Diffstat (limited to 'client')
-rw-r--r-- | client/src/app/+my-account/my-account-ownership/my-account-ownership.component.html | 4 | ||||
-rw-r--r-- | client/src/app/shared/icons/global-icon.component.ts | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/client/src/app/+my-account/my-account-ownership/my-account-ownership.component.html b/client/src/app/+my-account/my-account-ownership/my-account-ownership.component.html index 379fd8bb1..5709e9f54 100644 --- a/client/src/app/+my-account/my-account-ownership/my-account-ownership.component.html +++ b/client/src/app/+my-account/my-account-ownership/my-account-ownership.component.html | |||
@@ -40,10 +40,10 @@ | |||
40 | <td class="action-cell"> | 40 | <td class="action-cell"> |
41 | <ng-container *ngIf="videoChangeOwnership.status === 'WAITING'"> | 41 | <ng-container *ngIf="videoChangeOwnership.status === 'WAITING'"> |
42 | <my-button i18n label="Accept" | 42 | <my-button i18n label="Accept" |
43 | icon="icon-tick" | 43 | icon="tick" |
44 | (click)="openAcceptModal(videoChangeOwnership)"></my-button> | 44 | (click)="openAcceptModal(videoChangeOwnership)"></my-button> |
45 | <my-button i18n label="Refuse" | 45 | <my-button i18n label="Refuse" |
46 | icon="icon-cross" | 46 | icon="cross" |
47 | (click)="refuse(videoChangeOwnership)">Refuse</my-button> | 47 | (click)="refuse(videoChangeOwnership)">Refuse</my-button> |
48 | </ng-container> | 48 | </ng-container> |
49 | </td> | 49 | </td> |
diff --git a/client/src/app/shared/icons/global-icon.component.ts b/client/src/app/shared/icons/global-icon.component.ts index 5b9377e3e..e8ada0324 100644 --- a/client/src/app/shared/icons/global-icon.component.ts +++ b/client/src/app/shared/icons/global-icon.component.ts | |||
@@ -19,6 +19,7 @@ const icons = { | |||
19 | 'delete': require('../../../assets/images/global/delete.html'), | 19 | 'delete': require('../../../assets/images/global/delete.html'), |
20 | 'cross': require('../../../assets/images/global/cross.html'), | 20 | 'cross': require('../../../assets/images/global/cross.html'), |
21 | 'validate': require('../../../assets/images/global/validate.html'), | 21 | 'validate': require('../../../assets/images/global/validate.html'), |
22 | 'tick': require('../../../assets/images/global/tick.html'), | ||
22 | 'dislike': require('../../../assets/images/video/dislike.html'), | 23 | 'dislike': require('../../../assets/images/video/dislike.html'), |
23 | 'heart': require('../../../assets/images/video/heart.html'), | 24 | 'heart': require('../../../assets/images/video/heart.html'), |
24 | 'like': require('../../../assets/images/video/like.html'), | 25 | 'like': require('../../../assets/images/video/like.html'), |