Browse Source

fix: 修改方法

master
windy 6 years ago
parent
commit
aaed35484c
  1. 4
      dist/2.0/fineui.css
  2. 4
      dist/bundle.css
  3. 4
      dist/fineui.css
  4. 4
      dist/resource.css
  5. 4
      public/css/font.css
  6. 4
      src/css/resource/font.css
  7. 6
      src/less/image.less
  8. 4
      src/less/resource/font.less
  9. 2
      src/less/var.less
  10. 4
      ui/css/font.css

4
dist/2.0/fineui.css vendored

@ -4901,13 +4901,13 @@ textarea::-webkit-scrollbar-thumb:hover {
_background: none; _background: none;
} }
@font-face { @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');
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'); 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- */ /* iOS 4.1- */
} }
.b-font { .b-font {
font-family: "bi"; font-family: 'fineui';
font-style: normal; font-style: normal;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-webkit-text-stroke-width: 0.2px; -webkit-text-stroke-width: 0.2px;

4
dist/bundle.css vendored

@ -4901,13 +4901,13 @@ textarea::-webkit-scrollbar-thumb:hover {
_background: none; _background: none;
} }
@font-face { @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');
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'); 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- */ /* iOS 4.1- */
} }
.b-font { .b-font {
font-family: "bi"; font-family: 'fineui';
font-style: normal; font-style: normal;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-webkit-text-stroke-width: 0.2px; -webkit-text-stroke-width: 0.2px;

4
dist/fineui.css vendored

@ -4901,13 +4901,13 @@ textarea::-webkit-scrollbar-thumb:hover {
_background: none; _background: none;
} }
@font-face { @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');
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'); 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- */ /* iOS 4.1- */
} }
.b-font { .b-font {
font-family: "bi"; font-family: 'fineui';
font-style: normal; font-style: normal;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-webkit-text-stroke-width: 0.2px; -webkit-text-stroke-width: 0.2px;

4
dist/resource.css vendored

@ -414,13 +414,13 @@ textarea::-webkit-scrollbar-thumb:hover {
_background: none; _background: none;
} }
@font-face { @font-face {
font-family: "bi"; font-family: "fineui";
src: url('font/iconfont.eot'); 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'); 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 {
font-family: "bi"; font-family: 'fineui';
font-style: normal; font-style: normal;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-webkit-text-stroke-width: 0.2px; -webkit-text-stroke-width: 0.2px;

4
public/css/font.css

@ -1,11 +1,11 @@
@font-face { @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');
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'); 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- */ /* iOS 4.1- */
} }
.b-font { .b-font {
font-family: "bi"; font-family: 'fineui';
font-style: normal; font-style: normal;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-webkit-text-stroke-width: 0.2px; -webkit-text-stroke-width: 0.2px;

4
src/css/resource/font.css

@ -1,11 +1,11 @@
@font-face { @font-face {
font-family: "bi"; font-family: "fineui";
src: url('font/iconfont.eot'); 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'); 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 {
font-family: "bi"; font-family: 'fineui';
font-style: normal; font-style: normal;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-webkit-text-stroke-width: 0.2px; -webkit-text-stroke-width: 0.2px;

6
src/less/image.less

@ -350,11 +350,7 @@
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
}; };
.b-font when not ((length(@fonts) = 1) and (extract(@fonts, 1) = "bi")) { .b-font {
font-family: @fonts, "bi";
@baseProperty();
}
.b-font when ((length(@fonts) = 1) and (extract(@fonts, 1) = "bi")) {
font-family: @fonts; font-family: @fonts;
@baseProperty(); @baseProperty();
} }

4
src/less/resource/font.less

@ -2,8 +2,8 @@
@import "../lib/colors"; @import "../lib/colors";
@import "../image"; @import "../image";
.addFontRes("bi", @fontUrl); .addFontRes(@fontName, @fontUrl);
.activateFont("bi"); .activateFont(@fontName);
.font(close-font, @font-cross); .font(close-font, @font-cross);
.font-hover(close-h-font, @font-cross); .font-hover(close-h-font, @font-cross);

2
src/less/var.less

@ -2,6 +2,8 @@
@imageUrl: 'images/1x/'; //图片的基本地址 @imageUrl: 'images/1x/'; //图片的基本地址
@image2xUrl: 'images/2x/'; //2x图片的基本地址 @image2xUrl: 'images/2x/'; //2x图片的基本地址
@fontName: 'fineui';
@zIndex-layer: 100000; @zIndex-layer: 100000;
@zIndex-popover: 1000000; @zIndex-popover: 1000000;
@zIndex-popup: 10000000; @zIndex-popup: 10000000;

4
ui/css/font.css

@ -1,11 +1,11 @@
@font-face { @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');
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'); 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- */ /* iOS 4.1- */
} }
.b-font { .b-font {
font-family: "bi"; font-family: 'fineui';
font-style: normal; font-style: normal;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-webkit-text-stroke-width: 0.2px; -webkit-text-stroke-width: 0.2px;

Loading…
Cancel
Save