Merge pull request #1016 in VISUAL/fineui from ~WINDY/fineui:master to master

* commit '2a6e9b10b4432186e4040c154f25a3b63f08e324': BI-47946 fix: 新加的Verdana字体有问题，暂缓添加
5 years ago · b3b1f4c92d
4 changed files with 4 additions and 4 deletions
--- a/public/css/app.css
+++ b/public/css/app.css
@ -18,7 +18,7 @@ body {
  -o-user-select: none;
  user-select: none;
  color: #3d4d66;
-  font: normal 12px "Helvetica Neue", Verdana, Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Heiti, "黑体", sans-serif;
+  font: normal 12px "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Heiti, "黑体", sans-serif;
  -webkit-font-smoothing: antialiased;
  -moz-osx-font-smoothing: grayscale;
  text-decoration: none;
--- a/src/css/resource/app.css
+++ b/src/css/resource/app.css
@ -18,7 +18,7 @@ body {
  -o-user-select: none;
  user-select: none;
  color: #3d4d66;
-  font: normal 12px "Helvetica Neue", Verdana, Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Heiti, "黑体", sans-serif;
+  font: normal 12px "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Heiti, "黑体", sans-serif;
  -webkit-font-smoothing: antialiased;
  -moz-osx-font-smoothing: grayscale;
  text-decoration: none;
--- a/src/less/resource/app.less
+++ b/src/less/resource/app.less
@ -16,7 +16,7 @@ body {
  background-repeat: repeat;
  .user-select-disable();
  color: @color-bi-text-normal;
-  font: normal 12px "Helvetica Neue", Verdana, Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Heiti, "黑体", sans-serif;
+  font: normal 12px "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Heiti, "黑体", sans-serif;
  -webkit-font-smoothing: antialiased;
  -moz-osx-font-smoothing: grayscale;
  text-decoration: none;
--- a/ui/css/app.css
+++ b/ui/css/app.css
@ -18,7 +18,7 @@ body {
  -o-user-select: none;
  user-select: none;
  color: #3d4d66;
-  font: normal 12px "Helvetica Neue", Verdana, Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Heiti, "黑体", sans-serif;
+  font: normal 12px "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Heiti, "黑体", sans-serif;
  -webkit-font-smoothing: antialiased;
  -moz-osx-font-smoothing: grayscale;
  text-decoration: none;