Merge pull request #276 in FUI/fineui from ~GUY/fineui:master to master

* commit '639c85e3d515a5b69cdcefcb72d97fe1eb26e2ee':
  icon 居中
  ie8下正常显示图标

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;

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;
@@ -5473,7 +5474,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 {

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;
@@ -5473,7 +5474,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 {

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 {

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 {

src/css/base/single/icon.css

@@ -1,3 +1,4 @@
 .x-icon.b-font {
   margin: auto;
+  width: 100%;
 }

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 {

src/less/base/single/icon.less

@@ -1,3 +1,4 @@
 .x-icon.b-font {
   margin: auto;
+  width: 100%;
 }

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 {

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 {