Ver código fonte

Merge branch 'feature/v1.0.18_Z' of jianyu/web into feature/v1.0.18

zhangyuhan 2 anos atrás
pai
commit
fa2eeafc14

+ 1 - 0
apps/work-bench/src/assets/style/index.scss

@@ -15,6 +15,7 @@
 
 section.el-container.work-layout {
   min-width: unset;
+  font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, Helvetica Neue, PingFang SC, Microsoft YaHei, Source Han Sans SC, Noto Sans CJK SC, WenQuanYi Micro Hei, sans-serif;
 }
 
 .scrollbar::-webkit-scrollbar,

+ 1 - 5
packages/work-bench-frame/packages/style/base.scss

@@ -52,11 +52,7 @@ html,
 html body {
   -webkit-text-size-adjust: 100%;
   margin: 0 auto;
-  width: 100%;
-  height: 100%;
-  font-size: 12px;
-  line-height: 1;
-  font-family: -apple-system, BlinkMacSystemFont, Helvetica Neue, PingFang SC, Microsoft YaHei, Source Han Sans SC, Noto Sans CJK SC, WenQuanYi Micro Hei, sans-serif;
+  font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, Helvetica Neue, PingFang SC, Microsoft YaHei, Source Han Sans SC, Noto Sans CJK SC, WenQuanYi Micro Hei, sans-serif;
 }
 
 // 取消滚动条