This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch project_grid
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 29a76a04645368aca5a4ea0458a1b3451c3b9da0
Author: Andriana Kovalyshyn <andriana_kovalys...@epam.com>
AuthorDate: Thu May 23 17:12:46 2019 +0300
fixed dialogs styles; extended classes
---
.../computational-resources-list.component.ts | 2 +-
.../ami-create-dialog.component.html | 7 ++++---
.../detail-dialog/detail-dialog.component.html | 2 +-
...ratory-environment-create-dialog.component.html | 7 ++++---
.../install-libraries.component.html | 10 +++++-----
.../manage-ungit/manage-ungit.component.html | 7 ++++---
.../resources-grid/resources-grid.component.ts | 10 +++++-----
.../src/app/resources/resources.component.ts | 4 ++--
.../resources/scheduler/scheduler.component.html | 7 ++++---
.../app/shared/modal-dialog/modal.component.scss | 21 +++++++++++++++++++++
.../webapp/src/assets/styles/_dialogs.scss | 22 +---------------------
.../src/main/resources/webapp/src/styles.scss | 10 +++++-----
12 files changed, 57 insertions(+), 52 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.ts
b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.ts
index 4004adf..89e3992 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.ts
@@ -88,7 +88,7 @@ export class ComputationalResourcesListComponent {
openScheduleDialog(resource) {
// this.clusterScheduler.open({ isFooter: false }, this.environment,
'СOMPUTATIONAL', resource);
- this.dialog.open(SchedulerComponent, { data: {notebook: this.environment,
type: 'СOMPUTATIONAL', resource} })
+ this.dialog.open(SchedulerComponent, { data: {notebook: this.environment,
type: 'СOMPUTATIONAL', resource}, panelClass: 'modal-xl-s' })
.afterClosed().subscribe(() => this.rebuildGrid());
}
}
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/ami-create-dialog/ami-create-dialog.component.html
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/ami-create-dialog/ami-create-dialog.component.html
index 2fe3ecf..e9474fe 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/ami-create-dialog/ami-create-dialog.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/ami-create-dialog/ami-create-dialog.component.html
@@ -17,11 +17,12 @@
~ under the License.
-->
-<div modalClass="ami-dialog modal-sm">
- <header>
+<div class="ami-dialog dialog-box">
+ <header class="dialog-header">
<h4 class="modal-title" id="myModalLabel">Create {{ DICTIONARY.image
}}</h4>
+ <button type="button" class="close"
(click)="dialogRef.close()">×</button>
</header>
- <div class="modal-content">
+ <div class="dialog-content">
<div class="content-box" *ngIf="notebook">
<form [formGroup]="createAMIForm" novalidate>
<div class="control-group">
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html
index 4420236..1efa05a 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html
@@ -21,7 +21,7 @@
<header class="dialog-header header-white">
<button type="button" class="close"
(click)="dialogRef.close()">×</button>
</header>
- <div class="modal-content">
+ <div class="dialog-content">
<div *ngIf="data">
<table class="detail-header">
<tr>
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.html
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.html
index 20625dc..0e92d01 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.html
@@ -17,11 +17,12 @@
~ under the License.
-->
-<div modalClass="modal-lg">
- <header>
+<div class="dialog-box">
+ <header class="dialog-header">
<h4 class="modal-title" id="myModalLabel">Create analytical tool</h4>
+ <button type="button" class="close"
(click)="dialogRef.close()">×</button>
</header>
- <div class="modal-content">
+ <div class="dialog-content">
<div class="content-box">
<form [formGroup]="createExploratoryEnvironmentForm"
(submit)="createExploratoryEnvironment_btnClick($event,
createExploratoryEnvironmentForm.value)"
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
index e752cae..a219233 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
@@ -17,12 +17,12 @@
~ under the License.
-->
-<div #bindDialog modalClass="install-libraries modal-xl">
- <header>
- <h4 class="modal-title" id="myModalLabel">Manage
- <b>{{ notebook?.name }}</b> Libraries</h4>
+<div class="install-libraries dialog-box">
+ <header class="dialog-header">
+ <h4 class="modal-title" id="myModalLabel">Manage <b>{{ notebook?.name
}}</b> Libraries</h4>
+ <button type="button" class="close"
(click)="dialogRef.close()">×</button>
</header>
- <div class="modal-content">
+ <div class="dialog-content">
<div class="aligner">
<div class="info" *ngIf="notebook?.status !== 'running'">
<p class=" message">Cannot install libraries: Exploratory
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.html
b/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.html
index a8a46dd..4f94b88 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.html
@@ -17,11 +17,12 @@
~ under the License.
-->
-<div modalClass="manage-ungit modal-xxl">
- <header>
+<div class="manage-ungit dialog-box">
+ <header class="dialog-header">
<h4 class="modal-title" id="myModalLabel">Manage Git Credentials</h4>
+ <button type="button" class="close"
(click)="dialogRef.close()">×</button>
</header>
- <div class="manage-ungit modal-content">
+ <div class="manage-ungit dialog-content">
<mat-tab-group mat-stretch-tabs #tabGroup class="content-box">
<mat-tab label="LIST">
<button mat-raised-button class="butt add-creds"
(click)="tabGroup.selectedIndex = 1">
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts
b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts
index e6b4676..bf08ec5 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts
@@ -288,7 +288,7 @@ export class ResourcesGridComponent implements OnInit {
printCostDetails(data): void {
// this.costDetailsDialog.open({ isFooter: false }, data);
- this.dialog.open(CostDetailsDialogComponent, { data: data })
+ this.dialog.open(CostDetailsDialogComponent, { data: data, panelClass:
'modal-lg' })
.afterClosed().subscribe(() => this.buildGrid());
}
@@ -297,7 +297,7 @@ export class ResourcesGridComponent implements OnInit {
this.notebookName = data.name;
// this.computationalResourceModal.open({ isFooter: false }, data,
this.environments);
- this.dialog.open(ComputationalResourceCreateDialogComponent, { data: {
notebook: data, full_list: this.environments}})
+ this.dialog.open(ComputationalResourceCreateDialogComponent, { data: {
notebook: data, full_list: this.environments}, panelClass: 'modal-xxl'})
.afterClosed().subscribe(() => this.buildGrid());
} else if (action === 'run') {
this.userResourceService
@@ -310,14 +310,14 @@ export class ResourcesGridComponent implements OnInit {
} else if (action === 'terminate') {
this.confirmationDialog.open({ isFooter: false }, data,
ConfirmationDialogType.TerminateExploratory);
} else if (action === 'install') {
- this.dialog.open(InstallLibrariesComponent, { data: data })
+ this.dialog.open(InstallLibrariesComponent, { data: data, panelClass:
'modal-fullscreen' })
.afterClosed().subscribe(() => this.buildGrid());
} else if (action === 'schedule') {
// this.scheduler.open({ isFooter: false }, data, 'EXPLORATORY');
- this.dialog.open(SchedulerComponent, { data: {notebook: data, type:
'EXPLORATORY'} })
+ this.dialog.open(SchedulerComponent, { data: {notebook: data, type:
'EXPLORATORY'}, panelClass: 'modal-xl-s' })
.afterClosed().subscribe(() => this.buildGrid());
} else if (action === 'ami') {
- this.dialog.open(AmiCreateDialogComponent, { data: data })
+ this.dialog.open(AmiCreateDialogComponent, { data: data, panelClass:
'modal-sm' })
.afterClosed().subscribe(() => this.buildGrid());
}
}
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.ts
b/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.ts
index e0c71a0..fd44bcf 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.ts
@@ -76,7 +76,7 @@ export class ResourcesComponent implements OnInit, OnDestroy {
if (this.userUploadAccessKeyState === HTTP_STATUS_CODES.OK) {
// if (!this.createAnalyticalModal.isOpened)
this.createAnalyticalModal.open({ isFooter: false });
- this.dialog.open(ExploratoryEnvironmentCreateComponent, { data:
this.resourcesGrid })
+ this.dialog.open(ExploratoryEnvironmentCreateComponent, { data:
this.resourcesGrid, panelClass: 'modal-lg' })
.afterClosed().subscribe(() => this.refreshGrid());
} else {
this.userAccessKeyService.initialUserAccessKeyCheck();
@@ -100,7 +100,7 @@ export class ResourcesComponent implements OnInit,
OnDestroy {
public manageUngit(): void {
// if (!this.manageUngitDialog.isOpened)
// this.manageUngitDialog.open({ isFooter: false });
- this.dialog.open(ManageUngitComponent)
+ this.dialog.open(ManageUngitComponent, {panelClass: 'modal-xxl'})
.afterClosed().subscribe(() => this.refreshGrid());
}
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.html
b/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.html
index 8d6ad16..fc6c9b6 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.html
@@ -17,16 +17,17 @@
~ under the License.
-->
-<div modalClass="scheduler-dialog modal-xl-s">
- <header>
+<div modalClass="scheduler-dialog dialog-box">
+ <header class="dialog-header">
<h4 class="modal-title">Scheduler
<span *ngIf="destination">for
<b *ngIf="destination.type === 'EXPLORATORY'; else resource">{{
destination.name }}</b>
<ng-template #resource><b>{{ destination.computational_name
}}</b></ng-template>
</span>
</h4>
+ <button type="button" class="close"
(click)="dialogRef.close()">×</button>
</header>
- <div class="modal-content">
+ <div class="dialog-content">
<div *ngIf="destination" class="content-box">
<form [formGroup]="schedulerForm">
<div class="enable-schedule">
diff --git
a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/modal.component.scss
b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/modal.component.scss
index 267fb39..6a6fc02 100644
---
a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/modal.component.scss
+++
b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/modal.component.scss
@@ -237,3 +237,24 @@
padding-left: 45px !important;
}
}
+
+.modal-content {
+ display: block;
+ position: relative;
+ background-color: #fff;
+ -webkit-background-clip: padding-box;
+ background-clip: padding-box;
+ border: 1px solid rgba(0,0,0,.2);
+ border-radius: 3px;
+ outline: 0;
+ -webkit-box-shadow: 0 3px 9px rgba(0,0,0,.5);
+ box-shadow: 0 3px 9px rgba(0,0,0,.5);
+ .danger_color {
+ padding-left: 5px;
+ font-size: 12px;
+ display: inline-block;
+ font-family: 'Open Sans', sans-serif;
+ font-weight: 300;
+ border-color: #d9534f !important;
+ }
+}
\ No newline at end of file
diff --git
a/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss
b/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss
index 6c3f9bb..d27cd73 100644
---
a/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss
+++
b/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss
@@ -26,6 +26,7 @@
.modal-xl-s { width: 660px; }
.modal-xl { width: 900px; }
.modal-xxl { width: 1000px; }
+ .modal-fullscreen { width: 100vw; height: 100vh;}
mat-dialog-container {
&.mat-dialog-container {
@@ -176,24 +177,3 @@ mat-dialog-container {
.content-box {
padding: 25px 30px 35px;
}
-
-// .modal-content {
-// display: block;
-// position: relative;
-// background-color: #fff;
-// -webkit-background-clip: padding-box;
-// background-clip: padding-box;
-// border: 1px solid rgba(0,0,0,.2);
-// border-radius: 3px;
-// outline: 0;
-// -webkit-box-shadow: 0 3px 9px rgba(0,0,0,.5);
-// box-shadow: 0 3px 9px rgba(0,0,0,.5);
-// .danger_color {
-// padding-left: 5px;
-// font-size: 12px;
-// display: inline-block;
-// font-family: 'Open Sans', sans-serif;
-// font-weight: 300;
-// border-color: #d9534f !important;
-// }
-// }
\ No newline at end of file
diff --git a/services/self-service/src/main/resources/webapp/src/styles.scss
b/services/self-service/src/main/resources/webapp/src/styles.scss
index 3650353..58269fa 100644
--- a/services/self-service/src/main/resources/webapp/src/styles.scss
+++ b/services/self-service/src/main/resources/webapp/src/styles.scss
@@ -22,10 +22,10 @@
@import './assets/fonts/Material_Icons/material-icons.css';
@import './assets/fonts/Open_Sans/open-sans.css';
-@import './assets/styles/_reset.scss';
-@import './assets/styles/_general.scss';
-@import './assets/styles/_theme.scss';
-@import './assets/styles/_dialogs.scss';
+@import '_reset.scss';
+@import '_general.scss';
+@import '_theme.scss';
+@import '_dialogs.scss';
.mat-tab-label {
font-family: 'Open Sans', sans-serif !important;
@@ -136,7 +136,7 @@ mat-chip.mat-chip strong {
text-align: center;
}
.info {
- font-size: 16px;
+ font-size: 15px;
font-weight: 300;
color: #35afd5;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
