From eebea260b19a379cfe8f06448ec4a39e25016b37 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Sun, 26 Jun 2022 23:36:49 +0300 Subject: [PATCH] Get material.scss from library-css --- angular.json | 6 +++--- src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- src/assets/openaire-theme | 2 +- src/material.scss | 9 --------- 5 files changed, 6 insertions(+), 15 deletions(-) delete mode 100644 src/material.scss diff --git a/angular.json b/angular.json index d378051..167b227 100644 --- a/angular.json +++ b/angular.json @@ -49,11 +49,11 @@ "styles": [ "src/styles.less", "src/deprecated.css", - "src/material.scss" + "src/assets/common-assets/library-css/material.scss" ], "scripts": [ - "src/assets/openaire-theme/js/uikit.min.js", - "src/assets/openaire-theme/js/uikit-icons.min.js", + "node_modules/uikit/dist/js/uikit.min.js", + "node_modules/uikit/dist/js/uikit-icons.min.js", "node_modules/jquery/dist/jquery.js" ] }, diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 0c4df8a..5e1fde7 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 0c4df8a34dd4f518353c5924238eca9d2cf0a91e +Subproject commit 5e1fde78411e2913c3757534a073ace32a4eacf2 diff --git a/src/assets/common-assets b/src/assets/common-assets index 787970f..752859b 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 787970f735d48efc65e4408fe4eb5803e57021aa +Subproject commit 752859b10d3e110fdc9a4360bb7cb005ef6225ed diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 4fca369..ec73c67 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 4fca369b2e4f4f2c2689e0efc501d2c548dfeb68 +Subproject commit ec73c67c591eca9fe68f7a6c6f65ce4332852b2f diff --git a/src/material.scss b/src/material.scss deleted file mode 100644 index 40f39f7..0000000 --- a/src/material.scss +++ /dev/null @@ -1,9 +0,0 @@ -@import '../node_modules/@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); -