Browse Source

fix: 按照comment修改

es6
windy 6 years ago
parent
commit
7047583979
  1. 14
      src/less/image.less
  2. 4
      src/less/resource/font.less
  3. 2
      src/less/var.less

14
src/less/image.less

@ -332,8 +332,9 @@
} }
} }
@defaultFontName: 'fineui';
// 添加字体资源 // 添加字体资源
.addFontRes(@name, @fontUrl) { .addFontRes(@name: @defaultFontName, @fontUrl: @fontUrl) {
@font-face { @font-face {
font-family: "@{name}"; font-family: "@{name}";
src: url('@{fontUrl}iconfont.eot'); src: url('@{fontUrl}iconfont.eot');
@ -342,7 +343,7 @@
} }
// 激活字体 // 激活字体
.activateFont(@fonts) { .activateFont(@fonts: false) {
@baseProperty: { @baseProperty: {
font-style: normal; font-style: normal;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
@ -350,8 +351,13 @@
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
}; };
.b-font { .b-font when (@fonts = false){
font-family: @fonts; font-family: @defaultFontName;
@baseProperty();
}
.b-font when not (@fonts = false){
font-family: @fonts, @defaultFontName;
@baseProperty(); @baseProperty();
} }
} }

4
src/less/resource/font.less

@ -2,8 +2,8 @@
@import "../lib/colors"; @import "../lib/colors";
@import "../image"; @import "../image";
.addFontRes(@fontName, @fontUrl); .addFontRes();
.activateFont(@fontName); .activateFont();
.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,8 +2,6 @@
@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;

Loading…
Cancel
Save