Merge remote-tracking branch 'origin/master' into RED-9747
This commit is contained in:
commit
c1fc52223b
@ -9,7 +9,7 @@
|
||||
<redaction-breadcrumbs></redaction-breadcrumbs>
|
||||
</div>
|
||||
|
||||
<a [matTooltip]="'top-bar.navigation-items.back-to-dashboard' | translate" [routerLink]="['/']" class="logo">
|
||||
<a [matTooltip]="'top-bar.navigation-items.back-to-dashboard' | translate" [routerLink]="['/main']" class="logo">
|
||||
<div [attr.help-mode-key]="'home'" class="actions">
|
||||
<iqser-logo (iqserHiddenAction)="userPreferenceService.toggleDevFeatures()" icon="iqser:logo"></iqser-logo>
|
||||
<div class="app-name">{{ titleService.getTitle() }}</div>
|
||||
|
||||
@ -1,7 +1,5 @@
|
||||
<ng-container *ngIf="!filter.icon">
|
||||
<div *ngIf="filter.id === 'comment'">
|
||||
<mat-icon svgIcon="red:comment"></mat-icon>
|
||||
</div>
|
||||
<mat-icon *ngIf="filter.id === 'comment'" svgIcon="red:comment"></mat-icon>
|
||||
|
||||
<redaction-annotation-icon
|
||||
*ngIf="filter.id !== 'comment'"
|
||||
|
||||
@ -12,6 +12,6 @@
|
||||
height: 16px;
|
||||
margin-right: 8px;
|
||||
opacity: 50%;
|
||||
line-height: 16px;
|
||||
line-height: 8px;
|
||||
}
|
||||
}
|
||||
|
||||
@ -853,8 +853,8 @@
|
||||
"documine-export": {
|
||||
"document": "Document",
|
||||
"document-tooltip": "Document",
|
||||
"export": "Export",
|
||||
"export-tooltip": "Export"
|
||||
"export": "Component download",
|
||||
"export-tooltip": "Component download"
|
||||
},
|
||||
"dossier-attribute-types": {
|
||||
"date": "Datum",
|
||||
|
||||
@ -853,8 +853,8 @@
|
||||
"documine-export": {
|
||||
"document": "Document",
|
||||
"document-tooltip": "Document",
|
||||
"export": "Export",
|
||||
"export-tooltip": "Export"
|
||||
"export": "Component download",
|
||||
"export-tooltip": "Component download"
|
||||
},
|
||||
"dossier-attribute-types": {
|
||||
"date": "Date",
|
||||
|
||||
@ -1 +1 @@
|
||||
Subproject commit fb4b58a4968846e899f4e5aa33c75109302e4b4f
|
||||
Subproject commit 80fceb45dd4c860024e675d7d9ae77afd3482db9
|
||||
Loading…
x
Reference in New Issue
Block a user