From 409c3af475021a6bd44881bf2108bd43391e6a2c Mon Sep 17 00:00:00 2001
From: Caramel <git@caramelfur.dev>
Date: Fri, 2 Jun 2023 17:00:12 +0200
Subject: [PATCH] Fix icons

---
 frontend/package.json                         |  3 +-
 frontend/src/scss/fonts.scss                  | 28 +++++++++++++++++--
 .../src/scss/material/material-theme.scss     |  2 +-
 yarn.lock                                     | 24 ++++++----------
 4 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/frontend/package.json b/frontend/package.json
index 47524de..5d88b08 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -31,8 +31,6 @@
     "@babel/cli": "^7.21.5",
     "@babel/core": "^7.22.1",
     "@babel/preset-env": "^7.22.4",
-    "@fontsource/material-icons": "^5.0.2",
-    "@fontsource/material-icons-outlined": "^5.0.2",
     "@fontsource/roboto": "^5.0.2",
     "@ng-web-apis/common": "^2.1.0",
     "@ng-web-apis/resize-observer": "^2.0.0",
@@ -50,6 +48,7 @@
     "caniuse-lite": "^1.0.30001492",
     "fuse.js": "^6.6.2",
     "jwt-decode": "^3.1.2",
+    "material-icons": "^1.13.7",
     "moment": "^2.29.4",
     "ng-mat-select-infinite-scroll": "^4.0.0",
     "ngx-auto-unsubscribe-decorator": "^1.1.0",
diff --git a/frontend/src/scss/fonts.scss b/frontend/src/scss/fonts.scss
index 8d3ef3b..bbf594c 100644
--- a/frontend/src/scss/fonts.scss
+++ b/frontend/src/scss/fonts.scss
@@ -5,5 +5,29 @@
 @import '~@fontsource/roboto/700.css';
 @import '~@fontsource/roboto/900.css';
 
-@import '~@fontsource/material-icons/index.css';
-@import '~@fontsource/material-icons-outlined/index.css';
+@import 'material-icons';
+
+// @import '~@fontsource/material-icons/index.css';
+// @import '~@fontsource/material-icons-outlined/index.css';
+
+// .material-symbols-rounded {
+//   font-family: 'Material Symbols Rounded';
+//   font-weight: normal;
+//   font-style: normal;
+//   font-size: 24px;
+//   line-height: 1;
+//   letter-spacing: normal;
+//   text-transform: none;
+//   display: inline-block;
+//   white-space: nowrap;
+//   word-wrap: normal;
+//   direction: ltr;
+//   -moz-font-feature-settings: 'liga';
+//   -moz-osx-font-smoothing: grayscale;
+// }
+
+
+// .material-icons {
+//   font-family: 'Material Icons';
+//   font-variation-settings: 'FILL' 1, 'wght' 400, 'GRAD' 0, 'opsz' 48;
+// }
diff --git a/frontend/src/scss/material/material-theme.scss b/frontend/src/scss/material/material-theme.scss
index 5f2d805..8e50d1f 100644
--- a/frontend/src/scss/material/material-theme.scss
+++ b/frontend/src/scss/material/material-theme.scss
@@ -2,7 +2,7 @@
 @use '@angular/material' as mat;
 @use './material-theme-custom.scss' as custom-mat;
 
-mat.$theme-ignore-duplication-warnings: true;
+$theme-ignore-duplication-warnings: true;
 
 @include mat.core();
 
diff --git a/yarn.lock b/yarn.lock
index dd8676b..4132a24 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3136,20 +3136,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@fontsource/material-icons-outlined@npm:^5.0.2":
-  version: 5.0.2
-  resolution: "@fontsource/material-icons-outlined@npm:5.0.2"
-  checksum: e0f2e592c03b66fc93dade657f8502f81090c6e07fe87dfd2ad9a2b156ad7cd49e2c51720bb35d8057dc5d6ef8933339358d57eedfc04db8b1f41ab6767de13d
-  languageName: node
-  linkType: hard
-
-"@fontsource/material-icons@npm:^5.0.2":
-  version: 5.0.2
-  resolution: "@fontsource/material-icons@npm:5.0.2"
-  checksum: b2412879d7fd5e9dddd657e60f5a2122b08a76a4580d812a32ced16bf150b661bd0bd50c96ea38683ccb06820a71051d51c8b2f2342a32ff87455a0380d2d206
-  languageName: node
-  linkType: hard
-
 "@fontsource/roboto@npm:^5.0.2":
   version: 5.0.2
   resolution: "@fontsource/roboto@npm:5.0.2"
@@ -9561,6 +9547,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"material-icons@npm:^1.13.7":
+  version: 1.13.7
+  resolution: "material-icons@npm:1.13.7"
+  checksum: b3c62be3988a2afb78ac78a3057db64e794664a5462648018053610c5e5212a970790adc6d46283a907323a2872d1238946a3768b917e99a859d760641ef5980
+  languageName: node
+  linkType: hard
+
 "md5@npm:^2.2.1":
   version: 2.3.0
   resolution: "md5@npm:2.3.0"
@@ -11016,8 +11009,6 @@ __metadata:
     "@babel/cli": ^7.21.5
     "@babel/core": ^7.22.1
     "@babel/preset-env": ^7.22.4
-    "@fontsource/material-icons": ^5.0.2
-    "@fontsource/material-icons-outlined": ^5.0.2
     "@fontsource/roboto": ^5.0.2
     "@ng-web-apis/common": ^2.1.0
     "@ng-web-apis/resize-observer": ^2.0.0
@@ -11035,6 +11026,7 @@ __metadata:
     caniuse-lite: ^1.0.30001492
     fuse.js: ^6.6.2
     jwt-decode: ^3.1.2
+    material-icons: ^1.13.7
     moment: ^2.29.4
     ng-mat-select-infinite-scroll: ^4.0.0
     ngx-auto-unsubscribe-decorator: ^1.1.0