From ea363829bafba2ea63d41e11808dac54919e6353 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Thu, 24 Aug 2023 17:30:59 +0300 Subject: [PATCH] Update material to angular 15. --- package.json | 6 +++--- src/assets/common-assets | 2 +- src/material.scss | 16 +++++++++++----- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index e236b0e..ef55cd8 100644 --- a/package.json +++ b/package.json @@ -17,13 +17,13 @@ "private": true, "dependencies": { "@angular/animations": "~15.2.9", - "@angular/cdk": "^14.2.7", + "@angular/cdk": "^15.2.9", "@angular/common": "~15.2.9", "@angular/compiler": "~15.2.9", "@angular/core": "~15.2.9", "@angular/forms": "~15.2.9", "@angular/localize": "^15.2.9", - "@angular/material": "^14.2.7", + "@angular/material": "^15.2.9", "@angular/platform-browser": "~15.2.9", "@angular/platform-browser-dynamic": "~15.2.9", "@angular/router": "~15.2.9", @@ -59,4 +59,4 @@ "ts-node": "~7.0.0", "typescript": "~4.9.5" } -} +} \ No newline at end of file diff --git a/src/assets/common-assets b/src/assets/common-assets index b3c0557..46709cf 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit b3c0557065c4947275fb082078531a2e3613c638 +Subproject commit 46709cfb0a84a1e715a3c5886500e5ac6868fb39 diff --git a/src/material.scss b/src/material.scss index 59d9825..3b53ebc 100644 --- a/src/material.scss +++ b/src/material.scss @@ -1,14 +1,20 @@ @use '@angular/material' as mat; -@import '../node_modules/@angular/material/theming'; @include mat.core(); $my-app-primary: mat.define-palette(mat.$blue-grey-palette); $my-app-accent: mat.define-palette(mat.$green-palette); $my-app-warn: mat.define-palette(mat.$deep-orange-palette); - -$my-app-theme: mat.define-light-theme($my-app-primary, $my-app-accent, $my-app-warn); - +$my-app-theme: mat.define-light-theme(( + color: ( + primary: $my-app-primary, + accent: $my-app-accent, + warn: $my-app-warn + ), + typography: mat.define-typography-config(), + density: 0, +)); @include mat.all-component-themes($my-app-theme); -.mat-option:hover:not(.mat-option-disabled), .mat-option:focus:not(.mat-option-disabled), .mat-option.mat-active:not(.mat-option-disabled) { + +.mat-mdc-option:hover:not(.mat-mdc-option-disabled), .mat-option:focus:not(.mat-option-disabled), .mat-option.mat-active:not(.mat-option-disabled) { background-color: #F8CBBB; }