aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/+my-account
diff options
context:
space:
mode:
authorRigel Kent <sendmemail@rigelk.eu>2020-07-01 02:08:58 +0200
committerRigel Kent <par@rigelk.eu>2020-07-01 17:03:48 +0200
commit1fe1e14cb30ac44299563f98ed0aee2805794493 (patch)
treece7066676a6aea5c022094bda4cc4068bd5f6fcf /client/src/app/+my-account
parentc41c0e28ed444fdb427f9803d2f123ba6f535fb9 (diff)
downloadPeerTube-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/+my-account')
-rw-r--r--client/src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.scss2
-rw-r--r--client/src/app/+my-account/my-account-settings/my-account-settings.component.html2
-rw-r--r--client/src/app/+my-account/my-account-settings/my-account-settings.component.scss4
-rw-r--r--client/src/app/+my-account/my-account-video-imports/my-account-video-imports.component.html6
4 files changed, 10 insertions, 4 deletions
diff --git a/client/src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.scss b/client/src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.scss
index 7f7806732..fe78a57a4 100644
--- a/client/src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.scss
+++ b/client/src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.scss
@@ -6,7 +6,7 @@
6 6
7 button { 7 button {
8 @include peertube-button; 8 @include peertube-button;
9 @include grey-button; 9 @include danger-button;
10 @include disable-outline; 10 @include disable-outline;
11 } 11 }
12} \ No newline at end of file 12} \ No newline at end of file
diff --git a/client/src/app/+my-account/my-account-settings/my-account-settings.component.html b/client/src/app/+my-account/my-account-settings/my-account-settings.component.html
index 185f13275..eb7bb0d6f 100644
--- a/client/src/app/+my-account/my-account-settings/my-account-settings.component.html
+++ b/client/src/app/+my-account/my-account-settings/my-account-settings.component.html
@@ -88,7 +88,7 @@
88 88
89<div class="form-row mt-5"> <!-- danger zone grid --> 89<div class="form-row mt-5"> <!-- danger zone grid -->
90 <div class="form-group col-12 col-lg-4 col-xl-3"> 90 <div class="form-group col-12 col-lg-4 col-xl-3">
91 <h2 i18n class="account-title">DANGER ZONE</h2> 91 <h2 i18n class="account-title account-title-danger">DANGER ZONE</h2>
92 </div> 92 </div>
93 93
94 <div class="form-group form-group-right col-12 col-lg-8 col-xl-9"> 94 <div class="form-group form-group-right col-12 col-lg-8 col-xl-9">
diff --git a/client/src/app/+my-account/my-account-settings/my-account-settings.component.scss b/client/src/app/+my-account/my-account-settings/my-account-settings.component.scss
index 3e1792e3e..1cdb1fab4 100644
--- a/client/src/app/+my-account/my-account-settings/my-account-settings.component.scss
+++ b/client/src/app/+my-account/my-account-settings/my-account-settings.component.scss
@@ -12,6 +12,10 @@
12 12
13.account-title { 13.account-title {
14 @include settings-big-title; 14 @include settings-big-title;
15
16 &.account-title-danger {
17 color: lighten($color: #c54130, $amount: 10);
18 }
15} 19}
16 20
17.progress { 21.progress {
diff --git a/client/src/app/+my-account/my-account-video-imports/my-account-video-imports.component.html b/client/src/app/+my-account/my-account-video-imports/my-account-video-imports.component.html
index c029aabba..3e07550c1 100644
--- a/client/src/app/+my-account/my-account-video-imports/my-account-video-imports.component.html
+++ b/client/src/app/+my-account/my-account-video-imports/my-account-video-imports.component.html
@@ -1,7 +1,9 @@
1<h1 class="sr-only" i18n>Imports</h1> 1<h1 class="sr-only" i18n>Imports</h1>
2<p-table 2<p-table
3 [value]="videoImports" [lazy]="true" [paginator]="totalRecords > 0" [totalRecords]="totalRecords" [rows]="rowsPerPage" 3 [value]="videoImports" [lazy]="true" [paginator]="totalRecords > 0" [totalRecords]="totalRecords" [rows]="rowsPerPage" [rowsPerPageOptions]="rowsPerPageOptions"
4 [sortField]="sort.field" [sortOrder]="sort.order" (onLazyLoad)="loadLazy($event)" dataKey="id" 4 [sortField]="sort.field" [sortOrder]="sort.order" (onLazyLoad)="loadLazy($event)" dataKey="id"
5 [showCurrentPageReport]="true" i18n-currentPageReportTemplate
6 currentPageReportTemplate="Showing {{'{first}'}} to {{'{last}'}} of {{'{totalRecords}'}} imports"
5 (onPage)="onPage($event)" [expandedRowKeys]="expandedRows" 7 (onPage)="onPage($event)" [expandedRowKeys]="expandedRows"
6> 8>
7 <ng-template pTemplate="header"> 9 <ng-template pTemplate="header">
@@ -11,7 +13,7 @@
11 <th style="width: 55%" i18n>Video</th> 13 <th style="width: 55%" i18n>Video</th>
12 <th style="width: 150px" i18n>State</th> 14 <th style="width: 150px" i18n>State</th>
13 <th style="width: 150px" i18n pSortableColumn="createdAt">Created <p-sortIcon field="createdAt"></p-sortIcon></th> 15 <th style="width: 150px" i18n pSortableColumn="createdAt">Created <p-sortIcon field="createdAt"></p-sortIcon></th>
14 <th style="width: 60px"></th> 16 <th style="width: 70px"></th>
15 </tr> 17 </tr>
16 </ng-template> 18 </ng-template>
17 19