From 6021807d6a452a3205416f95bbff87544db3c2d2 Mon Sep 17 00:00:00 2001 From: fay Date: Tue, 17 Jul 2018 11:20:59 +0800 Subject: [PATCH] update --- dist/bundle.css | 2 -- dist/bundle.js | 4 ++-- dist/fineui.css | 2 -- dist/fineui.js | 4 ++-- dist/resource.css | 2 -- dist/widget.js | 4 ++-- public/css/font.css | 2 -- src/css/resource/font.css | 2 -- src/less/resource/font.less | 4 ++-- src/widget/numbereditor/number.editor.js | 4 ++-- ui/css/font.css | 2 -- 11 files changed, 10 insertions(+), 22 deletions(-) diff --git a/dist/bundle.css b/dist/bundle.css index c3c95f388..efb497406 100644 --- a/dist/bundle.css +++ b/dist/bundle.css @@ -5786,7 +5786,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: #13cd66; } .add-up-font .b-font { - font-size: 12px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .add-up-font .b-font:before { @@ -5798,7 +5797,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .minus-down-font .b-font { - font-size: 12px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .minus-down-font .b-font:before { diff --git a/dist/bundle.js b/dist/bundle.js index 3d1429153..57d8cea54 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -102053,7 +102053,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, { type: "bi.icon_button", forceNotSelected: true, trigger: "lclick,", - cls: "add-up-font top-button bi-border-left bi-list-item-active3" + cls: "add-up-font top-button bi-border-left bi-list-item-active3 icon-size-12" }); this.topBtn.on(BI.IconButton.EVENT_CHANGE, function () { self._finetuning(o.step); @@ -102064,7 +102064,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, { type: "bi.icon_button", trigger: "lclick,", forceNotSelected: true, - cls: "minus-down-font bottom-button bi-border-left bi-list-item-active3" + cls: "minus-down-font bottom-button bi-border-left bi-list-item-active3 icon-size-12" }); this.bottomBtn.on(BI.IconButton.EVENT_CHANGE, function () { self._finetuning(-o.step); diff --git a/dist/fineui.css b/dist/fineui.css index 55b6b4ec0..9025e6f7c 100644 --- a/dist/fineui.css +++ b/dist/fineui.css @@ -5786,7 +5786,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: #13cd66; } .add-up-font .b-font { - font-size: 12px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .add-up-font .b-font:before { @@ -5798,7 +5797,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .minus-down-font .b-font { - font-size: 12px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .minus-down-font .b-font:before { diff --git a/dist/fineui.js b/dist/fineui.js index 33b015b1c..f29ba716e 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -102302,7 +102302,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, { type: "bi.icon_button", forceNotSelected: true, trigger: "lclick,", - cls: "add-up-font top-button bi-border-left bi-list-item-active3" + cls: "add-up-font top-button bi-border-left bi-list-item-active3 icon-size-12" }); this.topBtn.on(BI.IconButton.EVENT_CHANGE, function () { self._finetuning(o.step); @@ -102313,7 +102313,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, { type: "bi.icon_button", trigger: "lclick,", forceNotSelected: true, - cls: "minus-down-font bottom-button bi-border-left bi-list-item-active3" + cls: "minus-down-font bottom-button bi-border-left bi-list-item-active3 icon-size-12" }); this.bottomBtn.on(BI.IconButton.EVENT_CHANGE, function () { self._finetuning(-o.step); diff --git a/dist/resource.css b/dist/resource.css index 1c5c78f0f..fba5e3475 100644 --- a/dist/resource.css +++ b/dist/resource.css @@ -1235,7 +1235,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: #13cd66; } .add-up-font .b-font { - font-size: 12px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .add-up-font .b-font:before { @@ -1247,7 +1246,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .minus-down-font .b-font { - font-size: 12px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .minus-down-font .b-font:before { diff --git a/dist/widget.js b/dist/widget.js index 0ab31d51f..9e16f838d 100644 --- a/dist/widget.js +++ b/dist/widget.js @@ -14243,7 +14243,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, { type: "bi.icon_button", forceNotSelected: true, trigger: "lclick,", - cls: "add-up-font top-button bi-border-left bi-list-item-active3" + cls: "add-up-font top-button bi-border-left bi-list-item-active3 icon-size-12" }); this.topBtn.on(BI.IconButton.EVENT_CHANGE, function () { self._finetuning(o.step); @@ -14254,7 +14254,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, { type: "bi.icon_button", trigger: "lclick,", forceNotSelected: true, - cls: "minus-down-font bottom-button bi-border-left bi-list-item-active3" + cls: "minus-down-font bottom-button bi-border-left bi-list-item-active3 icon-size-12" }); this.bottomBtn.on(BI.IconButton.EVENT_CHANGE, function () { self._finetuning(-o.step); diff --git a/public/css/font.css b/public/css/font.css index 06318b5ec..54448706e 100644 --- a/public/css/font.css +++ b/public/css/font.css @@ -899,7 +899,6 @@ color: #13cd66; } .add-up-font .b-font { - font-size: 12px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .add-up-font .b-font:before { @@ -911,7 +910,6 @@ color: inherit; } .minus-down-font .b-font { - font-size: 12px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .minus-down-font .b-font:before { diff --git a/src/css/resource/font.css b/src/css/resource/font.css index 2ab353193..a7748b619 100644 --- a/src/css/resource/font.css +++ b/src/css/resource/font.css @@ -899,7 +899,6 @@ color: #13cd66; } .add-up-font .b-font { - font-size: 12px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .add-up-font .b-font:before { @@ -911,7 +910,6 @@ color: inherit; } .minus-down-font .b-font { - font-size: 12px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .minus-down-font .b-font:before { diff --git a/src/less/resource/font.less b/src/less/resource/font.less index 074fd49f9..46e8b1abb 100644 --- a/src/less/resource/font.less +++ b/src/less/resource/font.less @@ -115,5 +115,5 @@ .font(text-add-tip-font, @font-add, @color-bi-text-success); -.font(add-up-font, @font-up-triangle, inherit, @font-size-12); -.font(minus-down-font, @font-down-triangle, inherit, @font-size-12); \ No newline at end of file +.font(add-up-font, @font-up-triangle); +.font(minus-down-font, @font-down-triangle); \ No newline at end of file diff --git a/src/widget/numbereditor/number.editor.js b/src/widget/numbereditor/number.editor.js index a3b29c801..8db438a98 100644 --- a/src/widget/numbereditor/number.editor.js +++ b/src/widget/numbereditor/number.editor.js @@ -42,7 +42,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, { type: "bi.icon_button", forceNotSelected: true, trigger: "lclick,", - cls: "add-up-font top-button bi-border-left bi-list-item-active3" + cls: "add-up-font top-button bi-border-left bi-list-item-active3 icon-size-12" }); this.topBtn.on(BI.IconButton.EVENT_CHANGE, function () { self._finetuning(o.step); @@ -53,7 +53,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, { type: "bi.icon_button", trigger: "lclick,", forceNotSelected: true, - cls: "minus-down-font bottom-button bi-border-left bi-list-item-active3" + cls: "minus-down-font bottom-button bi-border-left bi-list-item-active3 icon-size-12" }); this.bottomBtn.on(BI.IconButton.EVENT_CHANGE, function () { self._finetuning(-o.step); diff --git a/ui/css/font.css b/ui/css/font.css index a1fc60f6f..75748a60e 100644 --- a/ui/css/font.css +++ b/ui/css/font.css @@ -899,7 +899,6 @@ color: #13cd66; } .add-up-font .b-font { - font-size: 12px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .add-up-font .b-font:before { @@ -911,7 +910,6 @@ color: inherit; } .minus-down-font .b-font { - font-size: 12px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .minus-down-font .b-font:before {