From 2c52a74371ce155b3f4c148f73a192d32e7ad422 Mon Sep 17 00:00:00 2001 From: "Frank.Qiu" Date: Wed, 7 Mar 2018 10:38:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?ie8=E4=B8=8B=E6=AD=A3=E5=B8=B8=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/bundle.css | 3 ++- dist/fineui.css | 3 ++- dist/resource.css | 3 ++- public/css/font.css | 3 ++- src/css/resource/font.css | 3 ++- src/less/resource/font.less | 3 ++- ui/css/font.css | 3 ++- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dist/bundle.css b/dist/bundle.css index bd15973499..269f441a1b 100644 --- a/dist/bundle.css +++ b/dist/bundle.css @@ -5473,7 +5473,8 @@ textarea::-webkit-scrollbar-thumb:hover { } @font-face { font-family: 'bi'; - src: url('https://fanruan.coding.me/fineui/dist/font/iconfont.eot'), /* IE6-IE8 */ url('https://fanruan.coding.me/fineui/dist/font/iconfont.woff') format('woff'), /* chrome、firefox */ url('https://fanruan.coding.me/fineui/dist/font/iconfont.ttf') format('truetype'), /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ url('https://fanruan.coding.me/fineui/dist/font/iconfont.svg#svgFontName') format('svg'); + src: url('https://fanruan.coding.me/fineui/dist/font/iconfont.eot'); + src: url('https://fanruan.coding.me/fineui/dist/font/iconfont.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('https://fanruan.coding.me/fineui/dist/font/iconfont.woff') format('woff'), /* chrome、firefox */ url('https://fanruan.coding.me/fineui/dist/font/iconfont.ttf') format('truetype'), /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ url('https://fanruan.coding.me/fineui/dist/font/iconfont.svg#svgFontName') format('svg'); /* iOS 4.1- */ } .b-font { diff --git a/dist/fineui.css b/dist/fineui.css index a4d71363c8..d8366ad3b2 100644 --- a/dist/fineui.css +++ b/dist/fineui.css @@ -5473,7 +5473,8 @@ textarea::-webkit-scrollbar-thumb:hover { } @font-face { font-family: 'bi'; - src: url('decision/file?path=/com/fr/web/ui/font/iconfont.eot'), /* IE6-IE8 */ url('decision/file?path=/com/fr/web/ui/font/iconfont.woff') format('woff'), /* chrome、firefox */ url('decision/file?path=/com/fr/web/ui/font/iconfont.ttf') format('truetype'), /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ url('decision/file?path=/com/fr/web/ui/font/iconfont.svg#svgFontName') format('svg'); + src: url('decision/file?path=/com/fr/web/ui/font/iconfont.eot'); + src: url('decision/file?path=/com/fr/web/ui/font/iconfont.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('decision/file?path=/com/fr/web/ui/font/iconfont.woff') format('woff'), /* chrome、firefox */ url('decision/file?path=/com/fr/web/ui/font/iconfont.ttf') format('truetype'), /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ url('decision/file?path=/com/fr/web/ui/font/iconfont.svg#svgFontName') format('svg'); /* iOS 4.1- */ } .b-font { diff --git a/dist/resource.css b/dist/resource.css index 0877b5d6b1..2d812fee55 100644 --- a/dist/resource.css +++ b/dist/resource.css @@ -329,7 +329,8 @@ textarea::-webkit-scrollbar-thumb:hover { } @font-face { font-family: 'bi'; - src: url('font/iconfont.eot'), /* 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'); + 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 { diff --git a/public/css/font.css b/public/css/font.css index e9160b3a6c..be72d99353 100644 --- a/public/css/font.css +++ b/public/css/font.css @@ -1,6 +1,7 @@ @font-face { font-family: 'bi'; - src: url('https://fanruan.coding.me/fineui/dist/font/iconfont.eot'), /* IE6-IE8 */ url('https://fanruan.coding.me/fineui/dist/font/iconfont.woff') format('woff'), /* chrome、firefox */ url('https://fanruan.coding.me/fineui/dist/font/iconfont.ttf') format('truetype'), /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ url('https://fanruan.coding.me/fineui/dist/font/iconfont.svg#svgFontName') format('svg'); + src: url('https://fanruan.coding.me/fineui/dist/font/iconfont.eot'); + src: url('https://fanruan.coding.me/fineui/dist/font/iconfont.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('https://fanruan.coding.me/fineui/dist/font/iconfont.woff') format('woff'), /* chrome、firefox */ url('https://fanruan.coding.me/fineui/dist/font/iconfont.ttf') format('truetype'), /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ url('https://fanruan.coding.me/fineui/dist/font/iconfont.svg#svgFontName') format('svg'); /* iOS 4.1- */ } .b-font { diff --git a/src/css/resource/font.css b/src/css/resource/font.css index 3a2ffee80a..31c5ce9232 100644 --- a/src/css/resource/font.css +++ b/src/css/resource/font.css @@ -1,6 +1,7 @@ @font-face { font-family: 'bi'; - src: url('font/iconfont.eot'), /* 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'); + 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 { diff --git a/src/less/resource/font.less b/src/less/resource/font.less index 0d53ac15e5..91263acb27 100644 --- a/src/less/resource/font.less +++ b/src/less/resource/font.less @@ -4,7 +4,8 @@ @font-face { font-family: 'bi'; - src: url('@{fontUrl}iconfont.eot'), /* IE6-IE8 */ url('@{fontUrl}iconfont.woff') format('woff'), /* chrome、firefox */ url('@{fontUrl}iconfont.ttf') format('truetype'), /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ url('@{fontUrl}iconfont.svg#svgFontName') format('svg'); /* iOS 4.1- */ + src: url('@{fontUrl}iconfont.eot'); + src: url('@{fontUrl}iconfont.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('@{fontUrl}iconfont.woff') format('woff'), /* chrome、firefox */ url('@{fontUrl}iconfont.ttf') format('truetype'), /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ url('@{fontUrl}iconfont.svg#svgFontName') format('svg'); /* iOS 4.1- */ } .b-font { diff --git a/ui/css/font.css b/ui/css/font.css index 0a2941acc2..524658c6cd 100644 --- a/ui/css/font.css +++ b/ui/css/font.css @@ -1,6 +1,7 @@ @font-face { font-family: 'bi'; - src: url('decision/file?path=/com/fr/web/ui/font/iconfont.eot'), /* IE6-IE8 */ url('decision/file?path=/com/fr/web/ui/font/iconfont.woff') format('woff'), /* chrome、firefox */ url('decision/file?path=/com/fr/web/ui/font/iconfont.ttf') format('truetype'), /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ url('decision/file?path=/com/fr/web/ui/font/iconfont.svg#svgFontName') format('svg'); + src: url('decision/file?path=/com/fr/web/ui/font/iconfont.eot'); + src: url('decision/file?path=/com/fr/web/ui/font/iconfont.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('decision/file?path=/com/fr/web/ui/font/iconfont.woff') format('woff'), /* chrome、firefox */ url('decision/file?path=/com/fr/web/ui/font/iconfont.ttf') format('truetype'), /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ url('decision/file?path=/com/fr/web/ui/font/iconfont.svg#svgFontName') format('svg'); /* iOS 4.1- */ } .b-font { From 639c85e3d515a5b69cdcefcb72d97fe1eb26e2ee Mon Sep 17 00:00:00 2001 From: "Frank.Qiu" Date: Wed, 7 Mar 2018 11:12:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?icon=20=E5=B1=85=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/base.css | 1 + dist/bundle.css | 1 + dist/fineui.css | 1 + src/css/base/single/icon.css | 1 + src/less/base/single/icon.less | 1 + 5 files changed, 5 insertions(+) diff --git a/dist/base.css b/dist/base.css index edaa28ef91..4226264e3a 100644 --- a/dist/base.css +++ b/dist/base.css @@ -1455,6 +1455,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before, } .x-icon.b-font { margin: auto; + width: 100%; } .bi-file { opacity: 0; diff --git a/dist/bundle.css b/dist/bundle.css index 269f441a1b..003e184dee 100644 --- a/dist/bundle.css +++ b/dist/bundle.css @@ -3502,6 +3502,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before, } .x-icon.b-font { margin: auto; + width: 100%; } .bi-file { opacity: 0; diff --git a/dist/fineui.css b/dist/fineui.css index d8366ad3b2..b4f510e799 100644 --- a/dist/fineui.css +++ b/dist/fineui.css @@ -3502,6 +3502,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before, } .x-icon.b-font { margin: auto; + width: 100%; } .bi-file { opacity: 0; diff --git a/src/css/base/single/icon.css b/src/css/base/single/icon.css index a27b547736..03e445ad04 100644 --- a/src/css/base/single/icon.css +++ b/src/css/base/single/icon.css @@ -1,3 +1,4 @@ .x-icon.b-font { margin: auto; + width: 100%; } diff --git a/src/less/base/single/icon.less b/src/less/base/single/icon.less index dce0c35351..080a14736c 100644 --- a/src/less/base/single/icon.less +++ b/src/less/base/single/icon.less @@ -1,3 +1,4 @@ .x-icon.b-font { margin: auto; + width: 100%; } \ No newline at end of file