This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a commit to branch DLAB-1358 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 1fe7bbae3561417d1a477e324e666c9ad6cf902a Author: Andriana Kovalyshyn <andriana_kovalys...@epam.com> AuthorDate: Wed Dec 4 15:49:51 2019 +0200 [DLAB-1358]: adjusted confirmation messages for edge node on projects list --- .../src/app/administration/project/project.component.ts | 3 +-- .../notification-dialog/notification-dialog.component.ts | 14 ++++++++------ .../resources/webapp/src/assets/styles/_variables.scss | 2 ++ .../self-service/src/main/resources/webapp/src/styles.scss | 8 +++++--- 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts index a14969d..1669152 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts @@ -115,12 +115,11 @@ export class ProjectComponent implements OnInit, OnDestroy { public toggleStatus($event) { const data = { 'project_name': $event.project.name, endpoint: $event.endpoint.name }; - if ($event.action === 'stop' || $event.action === 'terminate') { this.dialog.open(NotificationDialogComponent, { data: { type: 'confirmation', - template: `Endpoint <b>${$event.endpoint.name}</b> will be ${$event.action === 'stop' ? 'stopped' : 'terminated'}`, + template: `Edge node in endpoint <b>${$event.endpoint.name}</b> will be ${$event.action === 'stop' ? 'stopped' : 'terminated'} for <b>${$event.project.name}</b>`, item: $event.endpoint, action: $event.action === 'stop' ? 'stopped' : 'terminated' }, panelClass: 'modal-sm' }) diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts index c14dfed..40e7b65 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts @@ -58,13 +58,13 @@ import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; {{ data.item.name }}</span> will be {{ data.action || 'decommissioned' }}. </p> </ng-template> - <mat-list class="endpoints-list" *ngIf="data.item.endpoints?.length"> - <mat-list-item class="list-header"> - <div class="endpoint">Endpoint</div> + <mat-list *ngIf="data.item.endpoints?.length"> + <mat-list-item class="list-header sans"> + <div class="endpoint">Edge node in endpoint</div> <div class="status">Further status</div> </mat-list-item> <div class="scrolling-content"> - <mat-list-item *ngFor="let endpoint of data.item.endpoints"> + <mat-list-item *ngFor="let endpoint of data.item.endpoints" class="sans node"> <div class="endpoint ellipsis">{{endpoint.name}}</div> <div class="status terminated">Terminated</div> </mat-list-item> @@ -90,9 +90,11 @@ import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; header a:hover i { color: #35afd5; cursor: pointer; } .plur { font-style: normal; } .label-name { display: inline-block; width: 100% } - .scrolling-content{overflow-y: auto; max-height: 200px;} - .endpoint { width: 70%;text-align: left;} + .scrolling-content{overflow-y: auto; max-height: 200px; } + .endpoint { width: 70%; text-align: left; color: #577289;} .status { width: 30%;text-align: right;} + .label { font-size: 15px; font-weight: 500; font-family: "Open Sans",sans-serif;} + .node { font-weight: 300;} `] }) export class NotificationDialogComponent { diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_variables.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_variables.scss index ebfdfb1..63d8202 100644 --- a/services/self-service/src/main/resources/webapp/src/assets/styles/_variables.scss +++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_variables.scss @@ -23,3 +23,5 @@ $modal-header-color: #f6fafe; $brand-color: #4ab8dc; $blue-grey-color: #718ba6; $dark-grey-color: #455c74; + +$default-font-size: 14px; 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 a4a32c0..1305465 100644 --- a/services/self-service/src/main/resources/webapp/src/styles.scss +++ b/services/self-service/src/main/resources/webapp/src/styles.scss @@ -27,6 +27,10 @@ @import '_theme.scss'; @import '_dialogs.scss'; +.sans { + font-family: 'Open Sans', sans-serif !important; +} + .mat-tab-label { font-family: 'Open Sans', sans-serif !important; color: #455c74; @@ -459,11 +463,9 @@ input[type='number'] { } } -.dialog-max-width{ +.dialog-max-width { margin: 0 auto; max-width: 350px; overflow: hidden; text-overflow: ellipsis; } - - --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org