You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by an...@apache.org on 2019/05/23 11:56:42 UTC
[incubator-dlab] 02/07: fixed detailed dialogs styles;
added variables
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 0859f8bfeb028bec28dfb174398605fd84867a0e
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Wed May 22 18:09:19 2019 +0300
fixed detailed dialogs styles; added variables
---
.../cluster-details/cluster-details.component.html | 6 ++++--
.../computational-resources-list.component.ts | 2 +-
.../exploratory/detail-dialog/detail-dialog.component.html | 2 +-
.../src/main/resources/webapp/src/assets/styles/_dialogs.scss | 11 +++++++----
4 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html
index 7420257..ef38a47 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html
@@ -17,8 +17,10 @@
~ under the License.
-->
-<div modalClass="detail-dialog modal-sm header-white">
- <header></header>
+<div class="detail-dialog dialog-box">
+ <header class="dialog-header header-white">
+ <button type="button" class="close" (click)="dialogRef.close()">×</button>
+ </header>
<div class="modal-content">
<div *ngIf="resource">
<table class="detail-header">
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 713b5ce..4004adf 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
@@ -82,7 +82,7 @@ export class ComputationalResourcesListComponent {
detailComputationalResources(environment, resource): void {
// this.detailComputationalResource.open({ isFooter: false }, environment, resource);
- this.dialog.open(DetailComputationalResourcesComponent, { data: { environment, resource }})
+ this.dialog.open(DetailComputationalResourcesComponent, { data: { environment, resource }, panelClass: 'modal-sm'})
.afterClosed().subscribe(() => this.rebuildGrid());
};
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 c90af34..4420236 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
@@ -17,7 +17,7 @@
~ under the License.
-->
-<div class="box detail-dialog">
+<div class="dialog-box detail-dialog">
<header class="dialog-header header-white">
<button type="button" class="close" (click)="dialogRef.close()">×</button>
</header>
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 4a21f02..6c3f9bb 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
@@ -17,6 +17,8 @@
* under the License.
*/
+ @import '_variables.scss';
+
.modal-xs { width: 375px; }
.modal-sm { width: 525px; }
.modal-md { width: 545px; }
@@ -29,10 +31,11 @@ mat-dialog-container {
&.mat-dialog-container {
padding: 0;
border-radius: 0;
- .box {
+ .dialog-box {
+ color: $modal-text-color;
.dialog-header {
padding-left: 30px;
- background: #f6fafe;
+ background: $modal-header-color;
height: 50px;
line-height: 50px;
position: relative;
@@ -45,7 +48,7 @@ mat-dialog-container {
font-weight: 600;
color: #455c74;
font-size: 18px;
- background: #f6fafe;
+ background: $modal-header-color;
i {
vertical-align: middle;
}
@@ -152,7 +155,7 @@ mat-dialog-container {
}
}
.info-label {
- font-size: 16px;
+ font-size: 15px;
margin-top: 20px;
}
.control-label {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org