fix: 🐛 合并代码解决冲突

2025-02-19 14:03:36 +08:00
parent 549c471199 bc646a3c02
commit 902e0b8417
78 changed files with 1906 additions and 2145 deletions
--- a/src/styles/reset.scss
+++ b/src/styles/reset.scss
@@ -25,8 +25,9 @@ body {
  width: 100%;
  height: 100%;
  margin: 0;
-  font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB",
-    "Microsoft YaHei", "微软雅黑", Arial, sans-serif;
+  font-family:
+    "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑",
+    Arial, sans-serif;
  line-height: inherit;
  -moz-osx-font-smoothing: grayscale;
  -webkit-font-smoothing: antialiased;