nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TSK-450 Fix navigation menu bug when load application for first time.

This commit is contained in:
Martin Rojas Miguel Angel 2018-04-23 08:49:49 +02:00 committed by Mustapha Zorgati
parent fa8bc9cb69
commit 16712aa859
5 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
web/src/app/administration/workbasket/details/distribution-targets/dual-list/dual-list.component.scss
View File

@ -87,4 +87,11 @@ dt > i {
li > div.row > dl {
margin-bottom: 0px;
}
}
li.list-group-item:hover, {
color: #555;
text-decoration: none;
background-color: #f5f5f5;
}

1
web/src/app/administration/workbasket/master/list/pagination/pagination.component.scss
View File

@ -7,5 +7,6 @@ input.pagination{
}
ul.pagination{
cursor: pointer;
overflow: hidden;
}

12
web/src/app/administration/workbasket/master/list/workbasket-list.component.scss
View File

@ -39,3 +39,15 @@ li > div.row > dl:first-child {
border-top: none;
padding: 0px
}
li.list-group-item:hover, {
color: #555;
text-decoration: none;
background-color: #f5f5f5;
}
li.list-group-item.active:hover, {
color: #fff;
background-color: #337ab7;
border-color: #337ab7;
}

4
web/src/app/app-routing.module.ts
View File

@ -59,6 +59,10 @@ const appRoutes: Routes = [
path: '',
redirectTo: 'administration/workbaskets',
pathMatch: 'full'
},
{
path: 'administration',
redirectTo: 'administration/workbaskets',
}
];
@NgModule({

2
web/src/app/shared/nav-bar/nav-bar.component.html
View File

@ -49,7 +49,7 @@
<div class="nav-content">
<div class="row menu">
<span routerLink="administration/workbaskets" aria-controls="administration" routerLinkActive="active">Administration</span>
<div class="row submenu" [ngClass]="{'selected': selectedRoute.indexOf('workbaskets') !== -1}">
<div class="row submenu" [ngClass]="{'selected': (selectedRoute.indexOf('workbaskets') !== -1 || selectedRoute === '')}">
<span class="col-xs-6" routerLink="administration/workbaskets" aria-controls="Workbaskets" routerLinkActive="active">Workbaskets</span>
</div>
<div class="row submenu" [ngClass]="{'selected': selectedRoute.indexOf('classifications') !== -1}">