Add style to cancel button

pull/213/merge
Chocobozzz 2018-01-23 15:15:03 +01:00
parent 531ab5b627
commit e494f91e67
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
3 changed files with 43 additions and 33 deletions

View File

@ -32,17 +32,15 @@
</div> </div>
</div> </div>
<div <div *ngIf="isUploadingVideo" class="upload-progress-cancel">
*ngIf="isUploadingVideo"
>
<p-progressBar <p-progressBar
[value]="videoUploadPercents" [value]="videoUploadPercents"
[ngClass]="{ processing: videoUploadPercents === 100 && videoUploaded === false }" [ngClass]="{ processing: videoUploadPercents === 100 && videoUploaded === false }"
></p-progressBar> ></p-progressBar>
<input type="button" value="Cancel" (click)="cancelUpload()" /> <input *ngIf="videoUploaded === false" type="button" value="Cancel" (click)="cancelUpload()" />
</div> </div>
<!-- Hidden because we need to load the component --> <!-- Hidden because we want to load the component -->
<form [hidden]="!isUploadingVideo" novalidate [formGroup]="form"> <form [hidden]="!isUploadingVideo" novalidate [formGroup]="form">
<my-video-edit <my-video-edit
[form]="form" [formErrors]="formErrors" [form]="form" [formErrors]="formErrors"

View File

@ -41,10 +41,15 @@
} }
} }
p-progressBar { .upload-progress-cancel {
display: flex;
margin-top: 25px;
margin-bottom: 40px;
p-progressBar {
flex-grow: 1;
/deep/ .ui-progressbar { /deep/ .ui-progressbar {
margin-top: 25px !important;
margin-bottom: 40px !important;
font-size: 15px !important; font-size: 15px !important;
color: #fff !important; color: #fff !important;
height: 30px !important; height: 30px !important;
@ -74,6 +79,13 @@ p-progressBar {
} }
} }
} }
}
input {
@include peertube-button;
@include grey-button;
margin-left: 10px;
}
} }

View File

@ -99,8 +99,8 @@ export class VideoAddComponent extends FormReactive implements OnInit {
this.videoUploadObservable.unsubscribe() this.videoUploadObservable.unsubscribe()
this.isUploadingVideo = false this.isUploadingVideo = false
this.videoUploadPercents = 0 this.videoUploadPercents = 0
this.notificationsService.error('Error', 'Upload cancelled')
this.videoUploadObservable = null this.videoUploadObservable = null
this.notificationsService.info('Info', 'Upload cancelled')
} }
} }