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 3c78764031a0b246d8b1981af9a95d7f2d010594 Author: Andriana Kovalyshyn <[email protected]> AuthorDate: Thu May 30 13:28:03 2019 +0300 [DLAB-631]: added roles to navigation --- .../src/app/shared/navbar/navbar.component.html | 15 +++++++--- .../src/app/shared/navbar/navbar.component.scss | 34 +++++++++++++++------- 2 files changed, 34 insertions(+), 15 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html index 9afd109..3fd9218 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html @@ -83,15 +83,15 @@ <span *ngIf="isExpanded; else resources">List of Resources</span> <ng-template #resources><i class="material-icons">dashboard</i></ng-template> </a> - <a class="nav-item has-children"> + <a class="nav-item has-children" *ngIf="healthStatus?.admin"> <span *ngIf="isExpanded">Administration</span> <a class="sub-nav-item" [style.margin-left.px]="isExpanded ? '30' : '0'" - [routerLink]="['/environment_management']" + [routerLink]="['/roles']" [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}"> - <span *ngIf="isExpanded; else env">Environment Management</span> - <ng-template #env><i class="material-icons">account_box</i></ng-template> + <span *ngIf="isExpanded; else roles">Roles</span> + <ng-template #roles><i class="material-icons">account_box</i></ng-template> </a> <a class="sub-nav-item" [style.margin-left.px]="isExpanded ? '30' : '0'" [routerLink]="['/projects']" @@ -100,6 +100,13 @@ <span *ngIf="isExpanded; else projects">Projects</span> <ng-template #projects><i class="material-icons">dns</i></ng-template> </a> + <a class="sub-nav-item" [style.margin-left.px]="isExpanded ? '30' : '0'" + [routerLink]="['/environment_management']" + [routerLinkActive]="['active']" + [routerLinkActiveOptions]="{exact:true}"> + <span *ngIf="isExpanded; else env">Environment Management</span> + <ng-template #env><i class="material-icons">settings</i></ng-template> + </a> </a> <a *ngIf="healthStatus?.billingEnabled" class="nav-item" [routerLink]="['/billing_report']" 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 ac83142..823bf8e 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 @@ -57,11 +57,15 @@ } .ok { color: #81b44a; - &:hover { color: #618738; } + &:hover { + color: #618738; + } } .warning { color: #f7b500; - &:hover { color: #bd8d0a; } + &:hover { + color: #bd8d0a; + } } .error { color: #ef5c4b; @@ -136,9 +140,10 @@ a.nav-item { vertical-align: middle; padding-left: 8px; } - &:not(.has-children):hover { + &:not(.has-children):hover i, + &:not(.has-children):hover span { background: none !important; - color: #36afd5; + color: #36afd5 !important; } &:not(:last-child)::after { content: ' '; @@ -151,7 +156,7 @@ a.nav-item { background: #edf1f5; } &.active { - color: #36afd5; + color: #36afd5 !important; } &.has-children { height: auto; @@ -167,10 +172,17 @@ a.nav-item { background: none !important; color: #36afd5 !important; } + &.active { + color: #36afd5 !important; + } } - } +} -.ok, .warning, .error, .user-name, .meta { +.ok, +.warning, +.error, +.user-name, +.meta { transition: all .35s ease-in-out; } @@ -184,7 +196,7 @@ a.nav-item { cursor: pointer; border-radius: 0; transition: all .45s ease-in-out; - .line{ + .line { width: 22px; height: 2px; display: block; @@ -215,14 +227,14 @@ a.nav-item { } } -.hamburger:hover .line:nth-child(1){ +.hamburger:hover .line:nth-child(1) { -webkit-transform: translateY(8px) translateX(-6px) rotate(45deg); -ms-transform: translateY(8px) translateX(-6px) rotate(45deg); -o-transform: translateY(8px) translateX(-6px) rotate(45deg); transform: translateY(8px) translateX(-6px) rotate(45deg); } -.hamburger:hover .line:nth-child(3){ +.hamburger:hover .line:nth-child(3) { -webkit-transform: translateY(-4px) translateX(6px) rotate(-45deg); -ms-transform: translateY(-4px) translateX(6px) rotate(-45deg); -o-transform: translateY(-4px) translateX(6px) rotate(-45deg); @@ -233,4 +245,4 @@ mat-sidenav-content { &.mat-drawer-content { transition: all 0.35s ease-out; } -} \ No newline at end of file +} --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
