Browse Source

Merge pull request #249 in FUI/fineui from ~WINDY/fui:master to master

* commit '6a7e9f385adf557b6f78d813cf7aaa2f864f5f62':
  combo和node新视觉
  替换5.0字体资源及适配
es6
guy 7 years ago
parent
commit
9c413b529d
  1. 6
      dist/base.js
  2. 448
      dist/bundle.css
  3. 8
      dist/bundle.js
  4. 2
      dist/case.js
  5. 8
      dist/fineui.js
  6. BIN
      dist/font/iconfont.eot
  7. 743
      dist/font/iconfont.svg
  8. BIN
      dist/font/iconfont.ttf
  9. BIN
      dist/font/iconfont.woff
  10. 448
      dist/resource.css
  11. 448
      public/bundle.css
  12. 448
      public/css/font.css
  13. 1
      src/base/single/button/buttons/button.js
  14. 5
      src/base/single/tip/tip.toast.js
  15. 1
      src/case/colorchooser/colorchooser.js
  16. 1
      src/case/trigger/trigger.text.js
  17. 448
      src/css/resource/font.css
  18. 216
      src/less/lib/font.less
  19. 11
      src/less/resource/font.less

6
dist/base.js vendored

@ -16527,6 +16527,7 @@ BI.shortcut("bi.image_button", BI.ImageButton);(function ($) {
level: "common",
block: false, // 是否块状显示,即不显示边框,没有最小宽度的限制
clear: false, // 是否去掉边框和背景
ghost: false, // 是否幽灵显示, 即正常状态无背景
textAlign: "center",
whiteSpace: "nowrap",
forceCenter: false,
@ -20424,17 +20425,20 @@ BI.Toast = BI.inherit(BI.Tip, {
return false;
};
this.element.bind({click: fn, mousedown: fn, mouseup: fn, mouseover: fn, mouseenter: fn, mouseleave: fn, mousemove: fn});
var cls = "close-font";
switch(o.level) {
case "success":
cls = "toast-success-font";
break;
case "error":
cls = "toast-error-font";
break;
case "warning":
cls = "toast-warning-font";
break;
case "normal":
default:
cls = "toast-message-font";
break;
}

448
dist/bundle.css vendored

File diff suppressed because it is too large Load Diff

8
dist/bundle.js vendored

@ -42579,6 +42579,7 @@ BI.shortcut("bi.image_button", BI.ImageButton);(function ($) {
level: "common",
block: false, // 是否块状显示,即不显示边框,没有最小宽度的限制
clear: false, // 是否去掉边框和背景
ghost: false, // 是否幽灵显示, 即正常状态无背景
textAlign: "center",
whiteSpace: "nowrap",
forceCenter: false,
@ -46476,17 +46477,20 @@ BI.Toast = BI.inherit(BI.Tip, {
return false;
};
this.element.bind({click: fn, mousedown: fn, mouseup: fn, mouseover: fn, mouseenter: fn, mouseleave: fn, mousemove: fn});
var cls = "close-font";
switch(o.level) {
case "success":
cls = "toast-success-font";
break;
case "error":
cls = "toast-error-font";
break;
case "warning":
cls = "toast-warning-font";
break;
case "normal":
default:
cls = "toast-message-font";
break;
}
@ -66154,6 +66158,7 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
}]
},
stopPropagation: false,
minWidth: 202,
minWidth: 202
},
value: o.value
@ -76369,7 +76374,6 @@ BI.TextTrigger = BI.inherit(BI.Trigger, {
});
this.trigerButton = BI.createWidget({
type: "bi.trigger_icon_button",
cls: "bi-border-left",
width: o.triggerWidth || o.height
});

2
dist/case.js vendored

@ -3592,6 +3592,7 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
}]
},
stopPropagation: false,
minWidth: 202,
minWidth: 202
},
value: o.value
@ -13807,7 +13808,6 @@ BI.TextTrigger = BI.inherit(BI.Trigger, {
});
this.trigerButton = BI.createWidget({
type: "bi.trigger_icon_button",
cls: "bi-border-left",
width: o.triggerWidth || o.height
});

8
dist/fineui.js vendored

@ -44343,6 +44343,7 @@ BI.shortcut("bi.image_button", BI.ImageButton);(function ($) {
level: "common",
block: false, // 是否块状显示,即不显示边框,没有最小宽度的限制
clear: false, // 是否去掉边框和背景
ghost: false, // 是否幽灵显示, 即正常状态无背景
textAlign: "center",
whiteSpace: "nowrap",
forceCenter: false,
@ -48240,17 +48241,20 @@ BI.Toast = BI.inherit(BI.Tip, {
return false;
};
this.element.bind({click: fn, mousedown: fn, mouseup: fn, mouseover: fn, mouseenter: fn, mouseleave: fn, mousemove: fn});
var cls = "close-font";
switch(o.level) {
case "success":
cls = "toast-success-font";
break;
case "error":
cls = "toast-error-font";
break;
case "warning":
cls = "toast-warning-font";
break;
case "normal":
default:
cls = "toast-message-font";
break;
}
@ -67918,6 +67922,7 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
}]
},
stopPropagation: false,
minWidth: 202,
minWidth: 202
},
value: o.value
@ -78133,7 +78138,6 @@ BI.TextTrigger = BI.inherit(BI.Trigger, {
});
this.trigerButton = BI.createWidget({
type: "bi.trigger_icon_button",
cls: "bi-border-left",
width: o.triggerWidth || o.height
});

BIN
dist/font/iconfont.eot vendored

Binary file not shown.

743
dist/font/iconfont.svg vendored

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 215 KiB

After

Width:  |  Height:  |  Size: 170 KiB

BIN
dist/font/iconfont.ttf vendored

Binary file not shown.

BIN
dist/font/iconfont.woff vendored

Binary file not shown.

448
dist/resource.css vendored

File diff suppressed because it is too large Load Diff

448
public/bundle.css

File diff suppressed because it is too large Load Diff

448
public/css/font.css

File diff suppressed because it is too large Load Diff

1
src/base/single/button/buttons/button.js

@ -22,6 +22,7 @@
level: "common",
block: false, // 是否块状显示,即不显示边框,没有最小宽度的限制
clear: false, // 是否去掉边框和背景
ghost: false, // 是否幽灵显示, 即正常状态无背景
textAlign: "center",
whiteSpace: "nowrap",
forceCenter: false,

5
src/base/single/tip/tip.toast.js

@ -31,17 +31,20 @@ BI.Toast = BI.inherit(BI.Tip, {
return false;
};
this.element.bind({click: fn, mousedown: fn, mouseup: fn, mouseover: fn, mouseenter: fn, mouseleave: fn, mousemove: fn});
var cls = "close-font";
switch(o.level) {
case "success":
cls = "toast-success-font";
break;
case "error":
cls = "toast-error-font";
break;
case "warning":
cls = "toast-warning-font";
break;
case "normal":
default:
cls = "toast-message-font";
break;
}

1
src/case/colorchooser/colorchooser.js

@ -50,6 +50,7 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
}]
},
stopPropagation: false,
minWidth: 202,
minWidth: 202
},
value: o.value

1
src/case/trigger/trigger.text.js

@ -34,7 +34,6 @@ BI.TextTrigger = BI.inherit(BI.Trigger, {
});
this.trigerButton = BI.createWidget({
type: "bi.trigger_icon_button",
cls: "bi-border-left",
width: o.triggerWidth || o.height
});

448
src/css/resource/font.css

File diff suppressed because it is too large Load Diff

216
src/less/lib/font.less

@ -1,183 +1,39 @@
//字体库
@font-cross: "e600";
@font-arrow-left: "e601";
@font-arrow-right: "e602";
@font-arrow-down: "e603";
@font-search: "e604";
@font-cross: "e6d0";
@font-search: "e6dc";
@font-date: "e733";
@font-right-triangle: "e70c";
@font-copy: "e6bd";
@font-check-mark: "e6cf";
@font-solid-left: "e6d9";
@font-solid-right: "e6d8";
@font-solid-top: "e6d6";
@font-solid-bottom: "e6d7";
@font-down-triangle: "e70b";
@font-key: "e740";
@font-arrow-left: "e70d";
@font-arrow-right: "e70c";
@font-change: "e72f";
@font-dot: "e762";
@font-no-sort-no-filter: "e6f0";
@font-less: "e75f";
@font-less-equal: "e760";
@font-bold: "e75b";
@font-italic: "e75c";
@font-underline: "e75d";
@font-color: "e75a";
@font-background: "e758";
@font-color-underline: "e75d";
@font-align-left: "e6ca";
@font-align-center: "e6bf";
@font-align-right: "e6c8";
@font-tip-error: "e757";
@font-tip-success: "e756";
@font-tip-warning: "e755";
@font-tip-message: "e74b";
@font-delete: "e605";
@font-dot: "e606";
@font-right-triangle: "e607";
@font-down-triangle: "e608";
@font-left-triangle: "e6ae";
@font-top-triangle: "e6ad";
@font-summary: "e60e";
@font-axis: "e626";
@font-bar: "e620";
@font-accumulate-bar: "e60a";
@font-pie: "e618";
@font-map: "e62c";
@font-dashboard: "e623";
@font-doughnut: "e624";
@font-detail: "e615";
@font-more-cn: "e60d";
@font-bubble: "e62a";
@font-scatter: "e61d";
@font-radar: "e614";
@font-content: "e621";
@font-image: "e68d";
@font-web: "e68c";
@font-text: "e622";
@font-number: "e61f";
@font-tree: "e61e";
@font-date: "e61b";
@font-year: "e628";
@font-year-month: "e627";
@font-quarter: "e629";
@font-YMD: "e61c";
@font-date-range: "e616";
@font-and-or: "e62b";
@font-query-cn: "e609";
@font-reset-cn: "e61a";
@font-text-area: "e622";
@font-reuse: "e60b";
@font-save: "e617";
@font-undo: "e619";
@font-redo: "e625";
@font-style-set: "e60c";
@font-filter: "e60f";
@font-copy: "e610";
@font-check-mark: "e611";
@font-dimension-from: "e612";
@font-chart-type: "e613";
@font-share: "e632";
@font-edit: "e631";
@font-up: "e630";
@font-right: "e62f";
@font-down: "e62d";
@font-left: "e62e";
@font-less: "e633";
@font-less-equal: "e636";
@font-less-arrow: "e637";
@font-less-equal-arrow: "e638";
@font-asc: "e63f";
@font-des: "e63a";
@font-add: "e649";
@font-field-calc: "e6a3";
@font-field-string: "e642";
@font-field-number: "e641";
@font-field-date: "e640";
@font-preview: "e65f";
@font-setting: "e678";
@font-warning: "e64e";
@font-linkage: "e63c";
@font-detail-set: "e634";
@font-export-excel: "e635";
@font-change: "e660";
@font-sortable: "e63b";
@font-clear: "e63d";
@font-bold: "e64d";
@font-color: "e69c";
@font-italic: "e656";
@font-underline: "e650";
@font-background: "e696";
@font-color-underline: "e69d";
@font-align-left: "e654";
@font-align-center: "e64f";
@font-align-right: "e651";
@font-move: "e65e";
@font-share: "e65a";
@font-new-folder: "e65d";
@font-letter: "e659";
@font-time: "e658";
@font-file: "e65b";
@font-folder: "e65c";
@font-rename: "e687";
@font-rename-edit: "e670";
@font-source-table: "e67b";
@font-excel-table: "e682";
@font-etl-table: "e680";
@font-sql-table: "e681";
@font-key: "e67d";
@font-refresh: "e683";
@font-tile-view: "e685";
@font-relation-view: "e684";
@font-test-link: "e686";
@font-upload: "e6ba";
@font-image-size: "e68b";
@font-href: "e688";
@font-shutdown: "e689";
@font-doubt: "e69a";
@font-new: "e692";
@font-database: "e693";
@font-series: "e695";
@font-classify: "e694";
@font-solid-left: "e6be";
@font-solid-right: "e6bd";
@font-solid-top: "e6bc";
@font-solid-bottom: "e6bb";
@font-no-sort-no-filter: "e66a";
@font-no-sort-filter: "e66b";
@font-descending-filter: "e667";
@font-ascending-filter: "e669";
@font-descending-no-filter: "e666";
@font-ascending-no-filter: "e668";
@font-no-sort: "e66c";
@font-table-col-open: "e672";
@font-table-row-open: "e671";
@font-tip: "e69e";
@font-mark-dot: "e6a2";
@font-mark-up-arrow: "e6a0";
@font-mark-down-arrow: "e6a1";
@font-mark-equal: "e69f";
@font-pull-down: "e6ab";
@font-check: "e64c";
@font-hellip: "e6ac";
@font-report-filter-open: "e648";
@font-report-filter-close: "e645";
@font-apply-hangout: "e66d";
@font-hangout: "e64b";
@font-real-time: "e6af";
@font-info: "e66e";
@font-cancel-share: "e6b5";
@font-check-box-selected: "e6b3";
@font-check-box-not-selected: "e6b2";
@font-recover-chart: "e6b4";
@font-check-box-not-selected: "e6b2";
@font-solid-setting: "e697";

11
src/less/resource/font.less

@ -57,9 +57,6 @@
/** dashboard组件/控件 下拉列表图标字体 ~end~**/
//树控件图标
.font(tree-node-triangle-expand-font, @font-down-triangle);
.font(tree-node-triangle-collapse-font, @font-right-triangle);
//翻页按钮字体图标
.font-hover(row-pre-page-h-font, @font-solid-left);
@ -97,4 +94,10 @@
.font(text-color-underline-font, @font-color-underline);
.font(text-align-left-font, @font-align-left);
.font(text-align-center-font, @font-align-center);
.font(text-align-right-font, @font-align-right);
.font(text-align-right-font, @font-align-right);
//toast
.font(toast-error-font, @font-tip-error);
.font(toast-success-font, @font-tip-success);
.font(toast-warning-font, @font-tip-warning);
.font(toast-message-font, @font-tip-message);
Loading…
Cancel
Save