Skip to content

Commit 8d339a0

Browse files
Vegita2Vegita2
committed
updated angular material to v12
1 parent f50d875 commit 8d339a0

File tree

25 files changed

+126
-116
lines changed

25 files changed

+126
-116
lines changed

‎webapp/package-lock.json

Lines changed: 39 additions & 37 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎webapp/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
"@angular-eslint/eslint-plugin-template": "^0.3.0-beta.1",
7070
"@angular-eslint/template-parser": "^0.3.0-beta.1",
7171
"@angular/animations": "^12.0.0",
72-
"@angular/cdk": "^11.2.12",
72+
"@angular/cdk": "^12.0.0",
7373
"@angular/cli": "^12.0.0",
7474
"@angular/common": "^12.0.0",
7575
"@angular/compiler": "^12.0.0",
@@ -78,7 +78,7 @@
7878
"@angular/flex-layout": "^10.0.0-beta.32",
7979
"@angular/forms": "^12.0.0",
8080
"@angular/language-service": "^12.0.0",
81-
"@angular/material": "^11.2.12",
81+
"@angular/material": "^12.0.0",
8282
"@angular/platform-browser": "^12.0.0",
8383
"@angular/platform-browser-dynamic": "^12.0.0",
8484
"@angular/router": "^12.0.0",

‎webapp/src/app/components/babylon/babylon.component.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import "~@angular/material/theming";
1+
@use '~@angular/material' as mat;
22

33
canvas {
44
width: 100%;
@@ -11,7 +11,7 @@ canvas {
1111
left: 0;
1212
width: 100%;
1313
height: 100%;
14-
background-color: mat-color($mat-gray, 700);
14+
background-color: mat.get-color-from-palette(mat.$gray-palette, 700);
1515

1616
.loading {
1717
width: 100%;

‎webapp/src/app/components/dialogs/map-settings/map-content-settings/map-content-settings.component.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
@import "~@angular/material/theming";
1+
@use '~@angular/material' as mat;
22
@import "theme";
33

4-
$config: mat-typography-config();
4+
$config: mat.define-typography-config();
55
$color: map_get($theme, accent);
66

77
.content-container {

‎webapp/src/app/components/dialogs/offset-map/offset-map.component.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
@import "~@angular/material/theming";
1+
@use '~@angular/material' as mat;
22

3-
$config: mat-typography-config();
3+
$config: mat.define-typography-config();
44

55
.dialog-container {
66
//width: 30vw;

‎webapp/src/app/components/dialogs/settings/settings.component.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import "~@angular/material/theming";
1+
@use '~@angular/material' as mat;
22

33
.content-container {
44
padding: 16px;
@@ -22,13 +22,13 @@
2222
}
2323

2424
.icon-undefined {
25-
color: mat-color($mat-blue, 500);
25+
color: mat.get-color-from-palette(mat.$blue-palette, 500);
2626
}
2727

2828
.icon-valid {
29-
color: mat-color($mat-green, 500);
29+
color: mat.get-color-from-palette(mat.$green-palette, 500);
3030
}
3131

3232
.icon-invalid {
33-
color: mat-color($mat-red, 500);
33+
color: mat.get-color-from-palette(mat.$red-palette, 500);
3434
}

‎webapp/src/app/components/entities/entities.component.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
@import "~@angular/material/theming";
1+
@use '~@angular/material' as mat;
22

3-
$config: mat-typography-config();
3+
$config: mat.define-typography-config();
44

55
h2 {
66
margin-left: 14px;

‎webapp/src/app/components/floating-window/floating-window.component.scss

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
@use '~@angular/material' as mat;
12
@import "theme";
23

34
$primary: map-get($theme, primary);
@@ -21,11 +22,11 @@ $toolbarHeight: 32px;
2122

2223
.toolbar {
2324
padding-left: 16px;
24-
background-color: mat-color(map-get($theme, background), app-bar);
25+
background-color: mat.get-color-from-palette(map-get($theme, background), app-bar);
2526
height: $toolbarHeight !important;
2627

2728
.toolbar-button {
28-
//background-color: mat-color($primary, 700);
29+
//background-color: mat.get-color-from-palette($primary, 700);
2930
width: $btnWidth;
3031
height: 100%;
3132
line-height: normal;

‎webapp/src/app/components/json-editor/json-editor.component.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11

2+
@use '~@angular/material' as mat;
23
@import "theme";
34
$primary: map-get($theme, primary);
45
$accent: map-get($theme, accent);
@@ -21,5 +22,5 @@ $accent: map-get($theme, accent);
2122
font-family: droid sans mono, consolas, monospace, courier new, courier, sans-serif;
2223
resize: none;
2324
color: white;
24-
background-color: mat-color($accent, 700);
25+
background-color: mat.get-color-from-palette($accent, 700);
2526
}

‎webapp/src/app/components/layers/layers.component.scss

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
@import "~@angular/material/theming";
1+
@use '~@angular/material' as mat;
22
@import "theme";
33

4-
$config: mat-typography-config();
4+
$config: mat.define-typography-config();
55
$background: map_get($theme, background);
66

77
mat-expansion-panel-header {
@@ -15,23 +15,23 @@ $type-hue: A200;
1515
$brightness: 60%;
1616

1717
.type-Background {
18-
background-color: mat-color($mat-green, $type-hue);
18+
background-color: mat.get-color-from-palette(mat.$green-palette, $type-hue);
1919
}
2020

2121
.type-Collision {
22-
background-color: mat-color($mat-red, $type-hue);
22+
background-color: mat.get-color-from-palette(mat.$red-palette, $type-hue);
2323
}
2424

2525
.type-Navigation {
26-
background-color: mat-color($mat-blue, $type-hue);
26+
background-color: mat.get-color-from-palette(mat.$blue-palette, $type-hue);
2727
}
2828

2929
.type-HeightMap {
30-
background-color: mat-color($mat-orange, $type-hue);
30+
background-color: mat.get-color-from-palette(mat.$orange-palette, $type-hue);
3131
}
3232

3333
.type-Light {
34-
background-color: mat-color($mat-yellow, $type-hue);
34+
background-color: mat.get-color-from-palette(mat.$yellow-palette, $type-hue);
3535
}
3636

3737
.item-selected-bg {
@@ -44,7 +44,7 @@ $brightness: 60%;
4444
}
4545

4646
.item-selected {
47-
background-color: mat-color($mat-grey, 700);
47+
background-color: mat.get-color-from-palette(mat.$grey-palette, 700);
4848
}
4949

5050
mat-nav-list {

0 commit comments

Comments
 (0)