Merge branch 'pr/1340' into taskana-md

This commit is contained in:
Franzi321 2020-11-16 23:15:41 +01:00
commit 596a6fa952
3 changed files with 14 additions and 4 deletions

View File

@ -51,7 +51,8 @@
<tr>
<th class="align-left">
<taskana-shared-sort [sortingFields]="sortingFields" (performSorting)="sorting($event)"
menuPosition="left">
menuPosition="left" defaultSortBy="access-id">
</th>
</taskana-shared-sort>
</th>
<th>

View File

@ -1,8 +1,8 @@
<div class="sort">
<button mat-stroked-button style="color: #555;" [matMenuTriggerFor]="sortMenu" matTooltip="Sort workbaskets">
<button class="sort__button" mat-stroked-button [matMenuTriggerFor]="sortMenu" matTooltip="Sort workbaskets">
<mat-icon>sort</mat-icon>
<mat-menu #sortMenu="matMenu">
<mat-menu #sortMenu="matMenu" >
<button mat-menu-item [matMenuTriggerFor]="sortDirection">Sort direction</button>
<button mat-menu-item [matMenuTriggerFor]="sortValue">Sort value</button>
</mat-menu>
@ -38,7 +38,7 @@
<mat-menu #sortValue="matMenu">
<button mat-menu-item *ngFor="let sortingField of sortingFields | mapValues"
(click)="changeSortBy(sortingField.key)">
<span *ngIf="sortingField.value.toLowerCase() === sort.sortBy; else coloredValue" class="sort__selected-value">
<span class="{{sortingField.key === sort.sortBy ? 'sort__selected-value' : ''}}">
{{sortingField.value}}
</span>
<ng-template #coloredValue>

View File

@ -4,3 +4,12 @@
color: $aquamarine;
font-weight: bold;
}
.sort__button {
outline: none;
color: #555;
}
.mat-menu-item {
outline: none;
}