From 83a36614afbf5fc40dda5530bf2053eb34c87acd Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 23 Sep 2022 16:15:57 +0300 Subject: [PATCH] Delete material.scss from project. Update material and submodules to version 12 --- angular.json | 2 +- package.json | 4 ++-- src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- src/material.scss | 9 --------- 5 files changed, 5 insertions(+), 14 deletions(-) delete mode 100644 src/material.scss diff --git a/angular.json b/angular.json index 8555277..8645591 100644 --- a/angular.json +++ b/angular.json @@ -45,7 +45,7 @@ ], "styles": [ "src/styles.css", - "src/material.scss" + "src/assets/common-assets/library-css/material.scss" ], "scripts": [ "node_modules/uikit/dist/js/uikit.min.js", diff --git a/package.json b/package.json index 148c0c2..7ef377a 100644 --- a/package.json +++ b/package.json @@ -22,13 +22,13 @@ "private": true, "dependencies": { "@angular/animations": "~12.2.16", - "@angular/cdk": "^11.2.13", + "@angular/cdk": "^12.2.13", "@angular/common": "~12.2.16", "@angular/compiler": "~12.2.16", "@angular/core": "~12.2.16", "@angular/forms": "~12.2.16", "@angular/localize": "^12.2.16", - "@angular/material": "^11.2.13", + "@angular/material": "^12.2.13", "@angular/platform-browser": "~12.2.16", "@angular/platform-browser-dynamic": "~12.2.16", "@angular/platform-server": "~12.2.16", diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 032b91a..717ead0 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 032b91ae7a78ccad72a3a02a9463f6df5d00d223 +Subproject commit 717ead02b2f154c3a91e799ed5701ea23b54f7e8 diff --git a/src/assets/common-assets b/src/assets/common-assets index 14655ae..fd4dec1 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 14655ae3aa7a50162ef218428a0ccdee35c1aa7b +Subproject commit fd4dec1ab53c0a5f77a5d8717a265cee0688a612 diff --git a/src/material.scss b/src/material.scss deleted file mode 100644 index 50525af..0000000 --- a/src/material.scss +++ /dev/null @@ -1,9 +0,0 @@ -@import '~@angular/material/theming'; -@include mat-core(); -$my-app-primary: mat-palette($mat-gray, 900); -$my-app-accent: mat-palette($mat-light-green, 700); - -$my-app-theme: mat-light-theme($my-app-primary, $my-app-accent); - -@include angular-material-theme($my-app-theme); -