From aaed35484c7d6c182e5f64c8e5cd56c99fa99e1e Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Mon, 6 May 2019 13:49:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dist/2.0/fineui.css         | 4 ++--
 dist/bundle.css             | 4 ++--
 dist/fineui.css             | 4 ++--
 dist/resource.css           | 4 ++--
 public/css/font.css         | 4 ++--
 src/css/resource/font.css   | 4 ++--
 src/less/image.less         | 6 +-----
 src/less/resource/font.less | 4 ++--
 src/less/var.less           | 2 ++
 ui/css/font.css             | 4 ++--
 10 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/dist/2.0/fineui.css b/dist/2.0/fineui.css
index b4cb0cbe7..a29f9f3b8 100644
--- a/dist/2.0/fineui.css
+++ b/dist/2.0/fineui.css
@@ -4901,13 +4901,13 @@ textarea::-webkit-scrollbar-thumb:hover {
   _background: none;
 }
 @font-face {
-  font-family: "bi";
+  font-family: "fineui";
   src: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/font/iconfont.eot');
   src: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/font/iconfont.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/font/iconfont.woff') format('woff'), /* chrome、firefox */ url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/font/iconfont.ttf') format('truetype'), /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/font/iconfont.svg#svgFontName') format('svg');
   /*  iOS 4.1- */
 }
 .b-font {
-  font-family: "bi";
+  font-family: 'fineui';
   font-style: normal;
   -webkit-font-smoothing: antialiased;
   -webkit-text-stroke-width: 0.2px;
diff --git a/dist/bundle.css b/dist/bundle.css
index b4cb0cbe7..a29f9f3b8 100644
--- a/dist/bundle.css
+++ b/dist/bundle.css
@@ -4901,13 +4901,13 @@ textarea::-webkit-scrollbar-thumb:hover {
   _background: none;
 }
 @font-face {
-  font-family: "bi";
+  font-family: "fineui";
   src: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/font/iconfont.eot');
   src: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/font/iconfont.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/font/iconfont.woff') format('woff'), /* chrome、firefox */ url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/font/iconfont.ttf') format('truetype'), /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/font/iconfont.svg#svgFontName') format('svg');
   /*  iOS 4.1- */
 }
 .b-font {
-  font-family: "bi";
+  font-family: 'fineui';
   font-style: normal;
   -webkit-font-smoothing: antialiased;
   -webkit-text-stroke-width: 0.2px;
diff --git a/dist/fineui.css b/dist/fineui.css
index 799b619b5..ee428831f 100644
--- a/dist/fineui.css
+++ b/dist/fineui.css
@@ -4901,13 +4901,13 @@ textarea::-webkit-scrollbar-thumb:hover {
   _background: none;
 }
 @font-face {
-  font-family: "bi";
+  font-family: "fineui";
   src: url('resources?path=/com/fr/web/ui/font/iconfont.eot');
   src: url('resources?path=/com/fr/web/ui/font/iconfont.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('resources?path=/com/fr/web/ui/font/iconfont.woff') format('woff'), /* chrome、firefox */ url('resources?path=/com/fr/web/ui/font/iconfont.ttf') format('truetype'), /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ url('resources?path=/com/fr/web/ui/font/iconfont.svg#svgFontName') format('svg');
   /*  iOS 4.1- */
 }
 .b-font {
-  font-family: "bi";
+  font-family: 'fineui';
   font-style: normal;
   -webkit-font-smoothing: antialiased;
   -webkit-text-stroke-width: 0.2px;
diff --git a/dist/resource.css b/dist/resource.css
index ec77632e2..d5e843a5d 100644
--- a/dist/resource.css
+++ b/dist/resource.css
@@ -414,13 +414,13 @@ textarea::-webkit-scrollbar-thumb:hover {
   _background: none;
 }
 @font-face {
-  font-family: "bi";
+  font-family: "fineui";
   src: url('font/iconfont.eot');
   src: url('font/iconfont.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('font/iconfont.woff') format('woff'), /* chrome、firefox */ url('font/iconfont.ttf') format('truetype'), /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ url('font/iconfont.svg#svgFontName') format('svg');
   /*  iOS 4.1- */
 }
 .b-font {
-  font-family: "bi";
+  font-family: 'fineui';
   font-style: normal;
   -webkit-font-smoothing: antialiased;
   -webkit-text-stroke-width: 0.2px;
diff --git a/public/css/font.css b/public/css/font.css
index 9abc38fe2..3c6218046 100644
--- a/public/css/font.css
+++ b/public/css/font.css
@@ -1,11 +1,11 @@
 @font-face {
-  font-family: "bi";
+  font-family: "fineui";
   src: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/font/iconfont.eot');
   src: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/font/iconfont.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/font/iconfont.woff') format('woff'), /* chrome、firefox */ url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/font/iconfont.ttf') format('truetype'), /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/font/iconfont.svg#svgFontName') format('svg');
   /*  iOS 4.1- */
 }
 .b-font {
-  font-family: "bi";
+  font-family: 'fineui';
   font-style: normal;
   -webkit-font-smoothing: antialiased;
   -webkit-text-stroke-width: 0.2px;
diff --git a/src/css/resource/font.css b/src/css/resource/font.css
index 16ce6fef8..59f66a14d 100644
--- a/src/css/resource/font.css
+++ b/src/css/resource/font.css
@@ -1,11 +1,11 @@
 @font-face {
-  font-family: "bi";
+  font-family: "fineui";
   src: url('font/iconfont.eot');
   src: url('font/iconfont.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('font/iconfont.woff') format('woff'), /* chrome、firefox */ url('font/iconfont.ttf') format('truetype'), /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ url('font/iconfont.svg#svgFontName') format('svg');
   /*  iOS 4.1- */
 }
 .b-font {
-  font-family: "bi";
+  font-family: 'fineui';
   font-style: normal;
   -webkit-font-smoothing: antialiased;
   -webkit-text-stroke-width: 0.2px;
diff --git a/src/less/image.less b/src/less/image.less
index e7acfa257..ff1228cd2 100644
--- a/src/less/image.less
+++ b/src/less/image.less
@@ -350,11 +350,7 @@
     -moz-osx-font-smoothing: grayscale;
   };
 
-  .b-font when not ((length(@fonts) = 1) and (extract(@fonts, 1) = "bi")) {
-    font-family: @fonts, "bi";
-    @baseProperty();
-  }
-  .b-font when ((length(@fonts) = 1) and (extract(@fonts, 1) = "bi")) {
+  .b-font {
     font-family: @fonts;
     @baseProperty();
   }
diff --git a/src/less/resource/font.less b/src/less/resource/font.less
index 8e9a04961..daae9cc6f 100644
--- a/src/less/resource/font.less
+++ b/src/less/resource/font.less
@@ -2,8 +2,8 @@
 @import "../lib/colors";
 @import "../image";
 
-.addFontRes("bi", @fontUrl);
-.activateFont("bi");
+.addFontRes(@fontName, @fontUrl);
+.activateFont(@fontName);
 
 .font(close-font, @font-cross);
 .font-hover(close-h-font, @font-cross);
diff --git a/src/less/var.less b/src/less/var.less
index bb3fbbbb7..0f1e41c7b 100644
--- a/src/less/var.less
+++ b/src/less/var.less
@@ -2,6 +2,8 @@
 @imageUrl: 'images/1x/'; //图片的基本地址
 @image2xUrl: 'images/2x/'; //2x图片的基本地址
 
+@fontName: 'fineui';
+
 @zIndex-layer:    100000;
 @zIndex-popover: 1000000;
 @zIndex-popup:    10000000;
diff --git a/ui/css/font.css b/ui/css/font.css
index fb49d206c..d27f87ace 100644
--- a/ui/css/font.css
+++ b/ui/css/font.css
@@ -1,11 +1,11 @@
 @font-face {
-  font-family: "bi";
+  font-family: "fineui";
   src: url('resources?path=/com/fr/web/ui/font/iconfont.eot');
   src: url('resources?path=/com/fr/web/ui/font/iconfont.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('resources?path=/com/fr/web/ui/font/iconfont.woff') format('woff'), /* chrome、firefox */ url('resources?path=/com/fr/web/ui/font/iconfont.ttf') format('truetype'), /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ url('resources?path=/com/fr/web/ui/font/iconfont.svg#svgFontName') format('svg');
   /*  iOS 4.1- */
 }
 .b-font {
-  font-family: "bi";
+  font-family: 'fineui';
   font-style: normal;
   -webkit-font-smoothing: antialiased;
   -webkit-text-stroke-width: 0.2px;