caoww
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

* commit '639c85e3d515a5b69cdcefcb72d97fe1eb26e2ee':
  icon 居中
  ie8下正常显示图标
es6
guy 7 years ago
parent
03f9e116a8 639c85e3d5
commit
45261336f5
10 changed files with 19 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      dist/base.css
  2. 4
      dist/bundle.css
  3. 4
      dist/fineui.css
  4. 3
      dist/resource.css
  5. 3
      public/css/font.css
  6. 1
      src/css/base/single/icon.css
  7. 3
      src/css/resource/font.css
  8. 1
      src/less/base/single/icon.less
  9. 3
      src/less/resource/font.less
  10. 3
      ui/css/font.css

1
dist/base.css vendored
Unescape View File

@ -1455,6 +1455,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
} }
.x-icon.b-font { .x-icon.b-font {
margin: auto; margin: auto;
width: 100%;
} }
.bi-file { .bi-file {
opacity: 0; opacity: 0;

4
dist/bundle.css vendored
Unescape View File

@ -3502,6 +3502,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
} }
.x-icon.b-font { .x-icon.b-font {
margin: auto; margin: auto;
width: 100%;
} }
.bi-file { .bi-file {
opacity: 0; opacity: 0;
@ -5473,7 +5474,8 @@ textarea::-webkit-scrollbar-thumb:hover {
} }
@font-face { @font-face {
font-family: 'bi'; 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- */ /* iOS 4.1- */
} }
.b-font { .b-font {

4
dist/fineui.css vendored
Unescape View File

@ -3502,6 +3502,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
} }
.x-icon.b-font { .x-icon.b-font {
margin: auto; margin: auto;
width: 100%;
} }
.bi-file { .bi-file {
opacity: 0; opacity: 0;
@ -5473,7 +5474,8 @@ textarea::-webkit-scrollbar-thumb:hover {
} }
@font-face { @font-face {
font-family: 'bi'; 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- */ /* iOS 4.1- */
} }
.b-font { .b-font {

3
dist/resource.css vendored
Unescape View File

@ -329,7 +329,8 @@ textarea::-webkit-scrollbar-thumb:hover {
} }
@font-face { @font-face {
font-family: 'bi'; 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- */ /* iOS 4.1- */
} }
.b-font { .b-font {

3
public/css/font.css
Unescape View File

@ -1,6 +1,7 @@
@font-face { @font-face {
font-family: 'bi'; 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- */ /* iOS 4.1- */
} }
.b-font { .b-font {

1
src/css/base/single/icon.css
Unescape View File

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

3
src/css/resource/font.css
Unescape View File

@ -1,6 +1,7 @@
@font-face { @font-face {
font-family: 'bi'; 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- */ /* iOS 4.1- */
} }
.b-font { .b-font {

1
src/less/base/single/icon.less
Unescape View File

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

3
src/less/resource/font.less
Unescape View File

@ -4,7 +4,8 @@
@font-face { @font-face {
font-family: 'bi'; 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 { .b-font {

3
ui/css/font.css
Unescape View File

@ -1,6 +1,7 @@
@font-face { @font-face {
font-family: 'bi'; 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- */ /* iOS 4.1- */
} }
.b-font { .b-font {

Write Preview
Loading…
Cancel
Save