Skip to content

Commit

Permalink
chore(): migrate @angular/material to 18.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
inpercima committed Jun 2, 2024
1 parent 9a2d5b3 commit 7c64e44
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 34 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
],
"dependencies": {
"@angular/animations": "18.0.1",
"@angular/cdk": "17.3.10",
"@angular/cdk": "18.0.1",
"@angular/common": "18.0.1",
"@angular/compiler": "18.0.1",
"@angular/core": "18.0.1",
"@angular/forms": "18.0.1",
"@angular/material": "17.3.10",
"@angular/material": "18.0.1",
"@angular/platform-browser": "18.0.1",
"@angular/platform-browser-dynamic": "18.0.1",
"material-icons": "1.13.12",
Expand Down
48 changes: 24 additions & 24 deletions src/themes.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,72 +4,72 @@
mat.$theme-ignore-duplication-warnings: true;

.indigo-pink-theme {
$indigo-pink-theme: mat.define-light-theme((
$indigo-pink-theme: mat.m2-define-light-theme((
color: (
primary: mat.define-palette(mat.$indigo-palette, 500),
accent: mat.define-palette(mat.$pink-palette, A200, A100, A400),
primary: mat.m2-define-palette(mat.$m2-indigo-palette, 500),
accent: mat.m2-define-palette(mat.$m2-pink-palette, A200, A100, A400),
),
typography: mat.define-typography-config(),
typography: mat.m2-define-typography-config(),
));

@include mat.all-component-themes($indigo-pink-theme);
}

.deeppurple-amber-theme {
$deeppurple-amber-theme: mat.define-light-theme((
$deeppurple-amber-theme: mat.m2-define-light-theme((
color: (
primary: mat.define-palette(mat.$deep-purple-palette, 500),
accent: mat.define-palette(mat.$amber-palette, A200, A100, A400),
primary: mat.m2-define-palette(mat.$m2-deep-purple-palette, 500),
accent: mat.m2-define-palette(mat.$m2-amber-palette, A200, A100, A400),
),
typography: mat.define-typography-config(),
typography: mat.m2-define-typography-config(),
));

@include mat.all-component-themes($deeppurple-amber-theme);
}

.pink-bluegrey-theme {
$pink-bluegrey-theme: mat.define-dark-theme((
$pink-bluegrey-theme: mat.m2-define-dark-theme((
color: (
primary: mat.define-palette(mat.$pink-palette, 500),
accent: mat.define-palette(mat.$blue-grey-palette, A200, A100, A400),
primary: mat.m2-define-palette(mat.$m2-pink-palette, 500),
accent: mat.m2-define-palette(mat.$m2-blue-grey-palette, A200, A100, A400),
),
typography: mat.define-typography-config(),
typography: mat.m2-define-typography-config(),
));

@include mat.all-component-themes($pink-bluegrey-theme);
}

.purple-green-theme {
$purple-green-theme: mat.define-dark-theme((
$purple-green-theme: mat.m2-define-dark-theme((
color: (
primary: mat.define-palette(mat.$purple-palette, 500),
accent: mat.define-palette(mat.$green-palette, A200, A100, A400),
primary: mat.m2-define-palette(mat.$m2-purple-palette, 500),
accent: mat.m2-define-palette(mat.$m2-green-palette, A200, A100, A400),
),
typography: mat.define-typography-config(),
typography: mat.m2-define-typography-config(),
));

@include mat.all-component-themes($purple-green-theme);
}

.custom-light-theme {
$custom-light-theme: mat.define-light-theme((
$custom-light-theme: mat.m2-define-light-theme((
color: (
primary: mat.define-palette(mat.$light-blue-palette, 500),
accent: mat.define-palette(mat.$orange-palette, A200, A100, A400),
primary: mat.m2-define-palette(mat.$m2-light-blue-palette, 500),
accent: mat.m2-define-palette(mat.$m2-orange-palette, A200, A100, A400),
),
typography: mat.define-typography-config(),
typography: mat.m2-define-typography-config(),
));

@include mat.all-component-themes($custom-light-theme);
}

.custom-dark-theme {
$custom-dark-theme: mat.define-dark-theme((
$custom-dark-theme: mat.m2-define-dark-theme((
color: (
primary: mat.define-palette(mat.$grey-palette, 500),
accent: mat.define-palette(mat.$blue-palette, A200, A100, A400),
primary: mat.m2-define-palette(mat.$m2-grey-palette, 500),
accent: mat.m2-define-palette(mat.$m2-blue-palette, A200, A100, A400),
),
typography: mat.define-typography-config(),
typography: mat.m2-define-typography-config(),
));

@include mat.all-component-themes($custom-dark-theme);
Expand Down
17 changes: 9 additions & 8 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -236,10 +236,10 @@
vite "5.2.11"
watchpack "2.4.1"

"@angular/cdk@17.3.10":
version "17.3.10"
resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-17.3.10.tgz#4a3bab529cd65bb19cb89c89b3548dcc534d1a44"
integrity sha512-b1qktT2c1TTTe5nTji/kFAVW92fULK0YhYAvJ+BjZTPKu2FniZNe8o4qqQ0pUuvtMu+ZQxp/QqFYoidIVCjScg==
"@angular/cdk@18.0.1":
version "18.0.1"
resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-18.0.1.tgz#7338c85ac88aa57633eb0b55ba5b6deea508a86b"
integrity sha512-2fCqX1sz5cM+LncO6ak4EU2ZBm8MWitv5V53go3Iz5dOVOdrvysBt8smEkWZ4nvEKkFYHEPpQo0YlxEWbuTEmA==
dependencies:
tslib "^2.3.0"
optionalDependencies:
Expand Down Expand Up @@ -310,10 +310,10 @@
dependencies:
tslib "^2.3.0"

"@angular/material@17.3.10":
version "17.3.10"
resolved "https://registry.yarnpkg.com/@angular/material/-/material-17.3.10.tgz#db4c41bcc4ba6a6328be3d89dc95947a48555b54"
integrity sha512-hHMQES0tQPH5JW33W+mpBPuM8ybsloDTqFPuRV8cboDjosAWfJhzAKF3ozICpNlUrs62La/2Wu/756GcQrxebg==
"@angular/material@18.0.1":
version "18.0.1"
resolved "https://registry.yarnpkg.com/@angular/material/-/material-18.0.1.tgz#83b8e6a7998e0c5c0579b26527dfc183e798b01e"
integrity sha512-y8OaESXw32P74Jh2FEr3n7QjqjTlo2Jf+XdgOvp5dd1yxpJ20vnK7ZCEQqCpxdxGAzXqR+2DccKk9tebB9egZw==
dependencies:
"@material/animation" "15.0.0-canary.7f224ddd4.0"
"@material/auto-init" "15.0.0-canary.7f224ddd4.0"
Expand Down Expand Up @@ -358,6 +358,7 @@
"@material/tab-scroller" "15.0.0-canary.7f224ddd4.0"
"@material/textfield" "15.0.0-canary.7f224ddd4.0"
"@material/theme" "15.0.0-canary.7f224ddd4.0"
"@material/tokens" "15.0.0-canary.7f224ddd4.0"
"@material/tooltip" "15.0.0-canary.7f224ddd4.0"
"@material/top-app-bar" "15.0.0-canary.7f224ddd4.0"
"@material/touch-target" "15.0.0-canary.7f224ddd4.0"
Expand Down

0 comments on commit 7c64e44

Please sign in to comment.