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 184f25cedeff3cc5ea7796ee6c1583f6b8284294 Author: Andriana Kovalyshyn <[email protected]> AuthorDate: Tue May 28 13:48:59 2019 +0300 [DLAB-642]: conponents loading cleanup --- .../src/app/administration/management/management.component.html | 4 ---- .../main/resources/webapp/src/app/shared/navbar/navbar.component.html | 4 ++-- .../main/resources/webapp/src/app/shared/navbar/navbar.component.scss | 3 +-- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html index e14404e..44fbfb5 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html @@ -42,14 +42,10 @@ </management-grid> -<!-- <dlab-backup-dilog #backupDialog (backupOpts)="createBackup($event)"> -</dlab-backup-dilog> --> - <dlab-manage-env-dilog #manageEnvDialog (manageEnv)="manageEnvironment($event)" (setBudget)="setBudgetLimits($event)"> </dlab-manage-env-dilog> <progress-dialog #preloaderModal></progress-dialog> -<dlab-ssn-monitor #ssnMonitor></dlab-ssn-monitor> <dlab-manage-roles-groups #rolesGroupsModal (manageRolesGroupAction)="manageRolesGroups($event)"> </dlab-manage-roles-groups> \ No newline at end of file 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 b5fafec..9afd109 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 @@ -86,14 +86,14 @@ <a class="nav-item has-children"> <span *ngIf="isExpanded">Administration</span> - <a class="sub-nav-item" + <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">account_box</i></ng-template> </a> - <a class="sub-nav-item" + <a class="sub-nav-item" [style.margin-left.px]="isExpanded ? '30' : '0'" [routerLink]="['/projects']" [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}"> 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 2c17bd1..2f036fe 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 @@ -159,14 +159,13 @@ a.nav-item { .sub-nav-item { display: block; transition: all .45s ease-in-out; - margin-left: 30px; i { vertical-align: middle; padding-left: 12px; } &:hover { background: none !important; - color: #36afd5; + color: #36afd5 !important; } } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
