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/20 22:04:16 UTC
[incubator-dlab] 03/03: fixed quota notification check
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 c72bfa1b66a4dcbd975ea809d944d089e0311085
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Tue May 21 01:03:59 2019 +0300
fixed quota notification check
---
.../resources/webapp/src/app/shared/navbar/navbar.component.scss | 9 +++++++--
.../resources/webapp/src/app/shared/navbar/navbar.component.ts | 2 +-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss
index a83cc77..b7b57a1 100644
--- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss
@@ -132,7 +132,7 @@ a.nav-item {
overflow: hidden;
color: #577289;
outline: none;
- &:hover {
+ &:not(.has-children):hover {
background: none !important;
color: #36afd5;
}
@@ -153,7 +153,12 @@ a.nav-item {
height: auto;
}
.sub-nav-item {
- display: block;
+ display: block;
+ transition: all .45s ease-in-out;
+ &:hover {
+ background: none !important;
+ color: #36afd5;
+ }
}
}
diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts
index c5b2e71..72d4c33 100644
--- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts
@@ -189,7 +189,7 @@ export class NavbarComponent implements OnInit, OnDestroy {
private refreshSchedulerData(): void {
this.schedulerService.getActiveSchcedulersData(this.CHECK_ACTIVE_SCHEDULE_PERIOD).subscribe((list: Array<any>) => {
if (list.length) {
- if (this.dialog.openDialogs.length > 0 || this.dialog.openDialogs.length > 0) return;
+ if (this.dialog.openDialogs.length > 0) return;
const filteredData = this.groupSchedulerData(list);
const dialogRef: MatDialogRef<NotificationDialogComponent> = this.dialog.open(NotificationDialogComponent, {
data: { template: filteredData, type: 'list' },
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org