From 7127bb98f43fd46931e9e6bbedc3521a08bd527b Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Tue, 2 Nov 2021 14:00:03 -0600
Subject: [PATCH] update Angular material
---
package-lock.json | 52 ++++++++++---------
package.json | 4 +-
.../lib/components/error/error.component.scss | 3 +-
3 files changed, 31 insertions(+), 28 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 3661c495b..d0a9998f4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,12 +10,12 @@
"hasInstallScript": true,
"dependencies": {
"@angular/animations": "^12.2.12",
- "@angular/cdk": "^11.2.7",
+ "@angular/cdk": "^12.2.12",
"@angular/common": "^12.2.12",
"@angular/compiler": "^12.2.12",
"@angular/core": "^12.2.12",
"@angular/forms": "^12.2.12",
- "@angular/material": "^11.2.7",
+ "@angular/material": "^12.2.12",
"@angular/platform-browser": "^12.2.12",
"@angular/platform-browser-dynamic": "^12.2.12",
"@angular/router": "^12.2.12",
@@ -1967,18 +1967,19 @@
}
},
"node_modules/@angular/cdk": {
- "version": "11.2.13",
- "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-11.2.13.tgz",
- "integrity": "sha512-FkE4iCwoLbQxLDUOjV1I7M/6hmpyb7erAjEdWgch7nGRNxF1hqX5Bqf1lvLFKPNCbx5NRI5K7YVAdIUQUR8vug==",
+ "version": "12.2.12",
+ "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-12.2.12.tgz",
+ "integrity": "sha512-AK+74JZP95BDj9OJ1YUaRqPXkgs+oadTk7z+8omu1RcvDoUivouKxgODCQX5jI7rZeQIlnV49hEgBne07hYk4A==",
"dependencies": {
- "tslib": "^2.0.0"
+ "tslib": "^2.2.0"
},
"optionalDependencies": {
"parse5": "^5.0.0"
},
"peerDependencies": {
- "@angular/common": "^11.0.0 || ^12.0.0-0",
- "@angular/core": "^11.0.0 || ^12.0.0-0"
+ "@angular/common": "^12.0.0 || ^13.0.0-0",
+ "@angular/core": "^12.0.0 || ^13.0.0-0",
+ "rxjs": "^6.5.3 || ^7.0.0"
}
},
"node_modules/@angular/cli": {
@@ -2239,18 +2240,19 @@
}
},
"node_modules/@angular/material": {
- "version": "11.2.13",
- "resolved": "https://registry.npmjs.org/@angular/material/-/material-11.2.13.tgz",
- "integrity": "sha512-FqFdGSkOtqsmeLyTSousodDGUy2NqbtxCIKv2rwbsIRwHNKB0KpR/UQhA2gMRuGa5hxhMJ0DW0Tf9neMRuLCTg==",
+ "version": "12.2.12",
+ "resolved": "https://registry.npmjs.org/@angular/material/-/material-12.2.12.tgz",
+ "integrity": "sha512-Fgpffplmd3KfoK9Ms34jYXRaqFYLbgXdGl250Acg7fV16LN1KTOyYm2Qs+FQuqyhuXfhePPt6Srh7VcGTLT4+g==",
"dependencies": {
- "tslib": "^2.0.0"
+ "tslib": "^2.2.0"
},
"peerDependencies": {
- "@angular/animations": "^11.0.0 || ^12.0.0-0",
- "@angular/cdk": "11.2.13",
- "@angular/common": "^11.0.0 || ^12.0.0-0",
- "@angular/core": "^11.0.0 || ^12.0.0-0",
- "@angular/forms": "^11.0.0 || ^12.0.0-0"
+ "@angular/animations": "^12.0.0 || ^13.0.0-0",
+ "@angular/cdk": "12.2.12",
+ "@angular/common": "^12.0.0 || ^13.0.0-0",
+ "@angular/core": "^12.0.0 || ^13.0.0-0",
+ "@angular/forms": "^12.0.0 || ^13.0.0-0",
+ "rxjs": "^6.5.3 || ^7.0.0"
}
},
"node_modules/@angular/platform-browser": {
@@ -34660,12 +34662,12 @@
}
},
"@angular/cdk": {
- "version": "11.2.13",
- "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-11.2.13.tgz",
- "integrity": "sha512-FkE4iCwoLbQxLDUOjV1I7M/6hmpyb7erAjEdWgch7nGRNxF1hqX5Bqf1lvLFKPNCbx5NRI5K7YVAdIUQUR8vug==",
+ "version": "12.2.12",
+ "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-12.2.12.tgz",
+ "integrity": "sha512-AK+74JZP95BDj9OJ1YUaRqPXkgs+oadTk7z+8omu1RcvDoUivouKxgODCQX5jI7rZeQIlnV49hEgBne07hYk4A==",
"requires": {
"parse5": "^5.0.0",
- "tslib": "^2.0.0"
+ "tslib": "^2.2.0"
}
},
"@angular/cli": {
@@ -34852,11 +34854,11 @@
"dev": true
},
"@angular/material": {
- "version": "11.2.13",
- "resolved": "https://registry.npmjs.org/@angular/material/-/material-11.2.13.tgz",
- "integrity": "sha512-FqFdGSkOtqsmeLyTSousodDGUy2NqbtxCIKv2rwbsIRwHNKB0KpR/UQhA2gMRuGa5hxhMJ0DW0Tf9neMRuLCTg==",
+ "version": "12.2.12",
+ "resolved": "https://registry.npmjs.org/@angular/material/-/material-12.2.12.tgz",
+ "integrity": "sha512-Fgpffplmd3KfoK9Ms34jYXRaqFYLbgXdGl250Acg7fV16LN1KTOyYm2Qs+FQuqyhuXfhePPt6Srh7VcGTLT4+g==",
"requires": {
- "tslib": "^2.0.0"
+ "tslib": "^2.2.0"
}
},
"@angular/platform-browser": {
diff --git a/package.json b/package.json
index 317c4549c..f31d672a8 100644
--- a/package.json
+++ b/package.json
@@ -20,12 +20,12 @@
"private": true,
"dependencies": {
"@angular/animations": "^12.2.12",
- "@angular/cdk": "^11.2.7",
+ "@angular/cdk": "^12.2.12",
"@angular/common": "^12.2.12",
"@angular/compiler": "^12.2.12",
"@angular/core": "^12.2.12",
"@angular/forms": "^12.2.12",
- "@angular/material": "^11.2.7",
+ "@angular/material": "^12.2.12",
"@angular/platform-browser": "^12.2.12",
"@angular/platform-browser-dynamic": "^12.2.12",
"@angular/router": "^12.2.12",
diff --git a/projects/nshmp-lib/src/lib/components/error/error.component.scss b/projects/nshmp-lib/src/lib/components/error/error.component.scss
index 32cf3fe01..9d46071c0 100644
--- a/projects/nshmp-lib/src/lib/components/error/error.component.scss
+++ b/projects/nshmp-lib/src/lib/components/error/error.component.scss
@@ -1,10 +1,11 @@
+@use '~@angular/material' as mat;
@import '~@ghsc/nshmp-template/styles/material-theme';
mat-card {
padding: 0;
mat-card-header {
- background-color: mat-color($nshmp-warn, 300);
+ background-color: mat.get-color-from-palette($nshmp-warn, 300);
}
mat-card-title {
--
GitLab