This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a commit to branch feature/projects in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 721a5c0aab097faf8fd67610454ae3faa26cc062 Author: Andriana Kovalyshyn <[email protected]> AuthorDate: Mon May 27 16:09:40 2019 +0300 [DLAB-631]: modified backups --- .../backup-dilog/backup-dilog.component.html | 7 ++--- .../management/management.component.ts | 2 +- .../resources/webapp/src/assets/styles/_theme.scss | 30 ++++++++++------------ 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/backup-dilog/backup-dilog.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/backup-dilog/backup-dilog.component.html index f1f00f3..63be3b7 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/backup-dilog/backup-dilog.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/backup-dilog/backup-dilog.component.html @@ -17,11 +17,12 @@ ~ under the License. --> -<div modalClass="backup-dialog modal-sm"> - <header> +<div modalClass="backup-dialog" id="dialog-box"> + <header class="dialog-header"> <h4 class="modal-title">Backup options</h4> + <button type="button" class="close" (click)="dialogRef.close()">×</button> </header> - <div class="modal-content"> + <div class="dialog-content"> <div class="content-box" *ngIf="backupOptions"> <div class="hold-block"> <mat-slide-toggle diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts index 736078f..bf32a97 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts @@ -104,7 +104,7 @@ export class ManagementComponent implements OnInit, OnDestroy { showBackupDialog() { // if (!this.backupDialog.isOpened) this.backupDialog.open({ isFooter: false }); - this.dialog.open(BackupDilogComponent) + this.dialog.open(BackupDilogComponent, { panelClass: 'modal-sm' }) .afterClosed().subscribe(() => this.buildGrid()); } diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss index 66953f5..a298d0d 100644 --- a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss +++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss @@ -175,8 +175,7 @@ height: 34px; } -.backup-dialog span.mat-slide-toggle-content, -.scheduler-dialog span.mat-slide-toggle-content { + span.mat-slide-toggle-content { // font: 100 16px/24px 'Open Sans', sans-serif; font-style: normal; font-weight: 100; @@ -188,28 +187,23 @@ .scheduler-dialog .mat-slide-toggle { width: 100%; } -.backup-dialog .mat-slide-toggle-label-before .mat-slide-toggle-label { +.backup-dialog mat-slide-toggle { + display: initial; +} +.backup-dialog .mat-slide-toggle-label { justify-content: space-between; } .scheduler-dialog .mat-slide-toggle-label-before .mat-slide-toggle-label { justify-content: flex-end; } -.backup-dialog - .mat-slide-toggle.mat-checked:not(.mat-disabled) - .mat-slide-toggle-thumb, -.scheduler-dialog - .mat-slide-toggle.mat-checked:not(.mat-disabled) - .mat-slide-toggle-thumb { +.mat-slide-toggle.mat-checked:not(.mat-disabled) .mat-slide-toggle-thumb, +.scheduler-dialog .mat-slide-toggle.mat-checked:not(.mat-disabled) .mat-slide-toggle-thumb { background-color: #36afd5; } -.backup-dialog - .mat-slide-toggle.mat-checked:not(.mat-disabled) - .mat-slide-toggle-bar, -.scheduler-dialog - .mat-slide-toggle.mat-checked:not(.mat-disabled) - .mat-slide-toggle-bar { +.mat-slide-toggle.mat-checked:not(.mat-disabled) .mat-slide-toggle-bar, +.scheduler-dialog .mat-slide-toggle.mat-checked:not(.mat-disabled) .mat-slide-toggle-bar { background-color: rgba(54, 175, 213, 0.3); } @@ -218,6 +212,9 @@ .mat-raised-button.mat-accent { background-color: #36afd5; } +.mat-slide-toggle.mat-checked .mat-ripple-element { + background-color: #36afd5; +} .mat-calendar-body-cell-content.mat-calendar-body-selected { background: #36afd5; @@ -231,7 +228,8 @@ white-space: pre-line !important; word-break: break-all; } -.manage-roles-dialog, .project-form { +.manage-roles-dialog, +.project-form { .mat-form-field { width: 100%; } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
