Yuki Takei 2 лет назад
Родитель
Сommit
bf003fc32e

+ 1 - 1
apps/app/package.json

@@ -212,6 +212,7 @@
     "@growi/ui": "link:../../packages/ui",
     "@handsontable/react": "=2.1.0",
     "@icon/themify-icons": "1.0.1-alpha.3",
+    "@material-symbols/font-300": "^0.13.1",
     "@next/bundle-analyzer": "^13.2.3",
     "@swc-node/jest": "^1.6.2",
     "@swc/jest": "^0.2.24",
@@ -236,7 +237,6 @@
     "jest-date-mock": "^1.0.8",
     "jest-localstorage-mock": "^2.4.14",
     "load-css-file": "^1.0.0",
-    "material-icons": "^1.13.10",
     "mongodb-memory-server": "^8.12.2",
     "morgan": "^1.10.0",
     "null-loader": "^4.0.1",

+ 2 - 3
apps/app/src/styles/font-icons.scss

@@ -2,7 +2,6 @@
 // font-familiy used in simple-line-icons has to be prioritized than the one used in font-awesome.
 @import 'font-awesome';
 @import 'simple-line-icons';
-@import 'material-icons/iconfont/filled';
-@import 'material-icons/iconfont/outlined';
-@import 'material-icons/iconfont/round';
+@import '@material-symbols/font-300/outlined';
+@import '@material-symbols/font-300/rounded';
 @import '@icon/themify-icons/themify-icons';

+ 1 - 1
packages/editor/package.json

@@ -26,6 +26,7 @@
     "@codemirror/language": "^6.8.0",
     "@codemirror/state": "^6.2.1",
     "@codemirror/view": "^6.15.3",
+    "@material-symbols/font-300": "^0.13.1",
     "@popperjs/core": "^2.11.8",
     "@types/react": "^18.2.14",
     "@types/react-dom": "^18.2.6",
@@ -33,7 +34,6 @@
     "bootstrap": "^5.3.1",
     "codemirror": "^6.0.1",
     "eslint-plugin-react-refresh": "^0.4.1",
-    "material-icons": "^1.13.10",
     "react-dropzone": "^14.2.3",
     "react-hook-form": "^7.45.4",
     "react-toastify": "^9.1.3",

+ 3 - 4
packages/editor/src/main.scss

@@ -1,9 +1,8 @@
 @import 'bootstrap';
 @import 'react-toastify/scss/main';
 
-$material-icons-font-path: 'material-icons/iconfont/';
-@import 'material-icons/iconfont/filled';
-@import 'material-icons/iconfont/outlined';
-@import 'material-icons/iconfont/round';
+$material-symbols-font-path: '@material-symbols/font-300/';
+@import '@material-symbols/font-300/outlined';
+@import '@material-symbols/font-300/rounded';
 
 @import '@growi/core/scss/flex-expand';

+ 5 - 5
yarn.lock

@@ -3229,6 +3229,11 @@
     markdown-it-front-matter "^0.2.3"
     postcss "^8.4.19"
 
+"@material-symbols/font-300@^0.13.1":
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/@material-symbols/font-300/-/font-300-0.13.1.tgz#33e1914565a8a8e421cb9de502ec5f6ccdc80256"
+  integrity sha512-3UcU9kw/1hKDyjkeOuv2wx9nwr5XSpbl/GG+o9+TY5xZ3ogeruNQ5aS7mRXqTxQiizLXtmkYeNUcS3N4fLQonQ==
+
 "@microsoft/api-extractor-model@7.27.5":
   version "7.27.5"
   resolved "https://registry.yarnpkg.com/@microsoft/api-extractor-model/-/api-extractor-model-7.27.5.tgz#2220cf20c8587cd4cf78f82c20c4011a9e36a60f"
@@ -11089,11 +11094,6 @@ markdown-table@^3.0.0:
   resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-3.0.2.tgz#9b59eb2c1b22fe71954a65ff512887065a7bb57c"
   integrity sha512-y8j3a5/DkJCmS5x4dMCQL+OR0+2EAq3DOtio1COSHsmW2BGXnNCK3v12hJt1LrUz5iZH5g0LmuYOjDdI+czghA==
 
-material-icons@^1.13.10:
-  version "1.13.12"
-  resolved "https://registry.yarnpkg.com/material-icons/-/material-icons-1.13.12.tgz#eed4082bf0426642edeb027e75397e3064adc536"
-  integrity sha512-/2YoaB79IjUK2B2JB+vIXXYGtBfHb/XG66LvoKVM5ykHW7yfrV5SP6d7KLX6iijY6/G9GqwgtPQ/sbhFnOURVA==
-
 mathjax-full@^3.2.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/mathjax-full/-/mathjax-full-3.2.2.tgz#43f02e55219db393030985d2b6537ceae82f1fa7"