Skip to content

Commit 301d29c

Browse files
committed
[NAE-2444] Upgrade Angular to 17
- commit some fixes
1 parent efb2ca7 commit 301d29c

7 files changed

Lines changed: 17 additions & 11 deletions

File tree

projects/netgrif-components-core/src/lib/data-fields/enumeration-field/enumeration-caseref-field/abstract-enumeration-caseref-field.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {Subscription} from 'rxjs';
55
import {AbstractCaseRefBaseFieldComponent} from '../../case-ref-field/model/abstract-case-ref-base-field-component';
66

77
@Component({
8-
selector: 'ncc-abstract-case-ref-default',
8+
selector: 'ncc-abstract-enumeration-case-ref-default',
99
template: ''
1010
})
1111
export abstract class AbstractEnumerationCaseRefComponent extends AbstractCaseRefBaseFieldComponent<EnumerationField> implements AfterViewInit, OnDestroy {

projects/netgrif-components-core/src/lib/data-fields/file-field/abstract-file-field.component.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import {
55
} from '@angular/core';
66
import {AbstractDataFieldComponent} from '../models/abstract-data-field-component';
77
import {NAE_INFORM_ABOUT_INVALID_DATA} from '../models/invalid-data-policy-token';
8+
import {FileField} from "./models/file-field";
89

910
/**
1011
* @deprecated

projects/netgrif-components/src/lib/navigation/navigation-double-drawer/navigation-double-drawer.component.html

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,8 @@
6666
<mat-icon>account_circle</mat-icon>
6767
</button>
6868

69-
<div *ngIf="includeLanguage" fxLayout="row" class="icon-container">
70-
<button mat-icon-button class="menu-button mat-typography menu-font-color">
71-
<nc-language-selector fxLayout="row"></nc-language-selector>
72-
</button>
69+
<div *ngIf="includeLanguage" [ngClass]="{'margin-bottom-x2 menu-button': !(hiddenCustomItems?.length > 0)}" fxLayout="row" class="icon-container">
70+
<nc-language-selector fxLayout="row" ></nc-language-selector>
7371
</div>
7472

7573
<mat-menu #railMenu="matMenu">
@@ -88,13 +86,11 @@
8886
<!-- </div>-->
8987
<button mat-icon-button *ngIf="hiddenCustomItems && hiddenCustomItems.length > 0"
9088
[matMenuTriggerFor]="railMenu"
91-
class="menu-button mat-typography menu-font-color"
89+
class="menu-button mat-typography menu-font-color margin-bottom-x2"
9290
[matTooltip]="'toolbar.menu.open' | translate"
9391
matTooltipPosition="right">
9492
<mat-icon>more_vert</mat-icon>
9593
</button>
96-
97-
<div class="margin-top-x2"></div>
9894
</div>
9995
</mat-sidenav>
10096

projects/netgrif-components/src/lib/navigation/navigation-double-drawer/navigation-double-drawer.component.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
}
1515

1616
.menu-button {
17-
margin-left: 1px;
18-
margin-right: 1px;
17+
margin: 0 auto;
1918
border-radius: 8px;
2019
}
2120

projects/netgrif-components/src/lib/navigation/navigation.theme.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,12 @@
5656
color: mat.get-color-from-palette($primary) !important;
5757
}
5858

59+
.menu-button {
60+
.mat-mdc-button-persistent-ripple {
61+
border-radius: 8px !important;
62+
}
63+
}
64+
5965
.quick-panel-menu {
6066
.mat-mdc-menu-item-text {
6167
flex-direction: row;

projects/netgrif-components/src/lib/navigation/quick-panel/components/language-selector/language-selector.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</button>
77
</mat-menu>
88

9-
<button mat-icon-button [matMenuTriggerFor]="languageMenu">
9+
<button mat-icon-button [matMenuTriggerFor]="languageMenu" class="icon-button-height">
1010
<div [innerHTML]="getLangIcon(getCurrentLang())"
1111
alt="Country icon" class="icon-medium-dimensions">
1212
</div>

projects/netgrif-components/src/lib/navigation/quick-panel/components/language-selector/language-selector.component.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,7 @@
1111
height: 20px;
1212
line-height: normal;
1313
}
14+
15+
.icon-button-height {
16+
height: 40px;
17+
}

0 commit comments

Comments
 (0)