From 384c371bcd5094ffae18f2a78a167d146d15398b Mon Sep 17 00:00:00 2001 From: fay Date: Tue, 17 Jul 2018 11:17:57 +0800 Subject: [PATCH 1/2] update --- dist/bundle.css | 59 --------------- dist/bundle.js | 4 +- dist/fineui.css | 59 --------------- dist/fineui.js | 4 +- dist/resource.css | 74 ++++--------------- dist/widget.js | 4 +- public/css/font.css | 59 --------------- src/css/resource/font.css | 59 --------------- src/css/resource/size.css | 15 ++++ src/less/image.less | 20 +++-- src/less/resource/font.less | 2 +- src/less/resource/size.less | 8 ++ .../multiselect/check/multiselect.display.js | 2 +- .../multi.tree.button.checkselected.js | 2 +- ui/css/font.css | 59 --------------- 15 files changed, 59 insertions(+), 371 deletions(-) create mode 100644 src/css/resource/size.css create mode 100644 src/less/resource/size.less diff --git a/dist/bundle.css b/dist/bundle.css index 75b6b3f6e..c3c95f388 100644 --- a/dist/bundle.css +++ b/dist/bundle.css @@ -4899,7 +4899,6 @@ textarea::-webkit-scrollbar-thumb:hover { -moz-osx-font-smoothing: grayscale; } .close-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .close-font .b-font:before { @@ -4911,7 +4910,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .close-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .close-h-font .b-font:before { @@ -4928,7 +4926,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .close-ha-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .close-ha-font .b-font:before { @@ -4950,7 +4947,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .circle-close-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .circle-close-font .b-font:before { @@ -4962,7 +4958,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .search-close-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .search-close-h-font .b-font:before { @@ -4979,7 +4974,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .pre-page-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pre-page-h-font .b-font:before { @@ -4996,7 +4990,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .next-page-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .next-page-h-font .b-font:before { @@ -5013,7 +5006,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .search-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .search-font .b-font:before { @@ -5025,7 +5017,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .date-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .date-font .b-font:before { @@ -5037,7 +5028,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .date-change-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .date-change-h-font .b-font:before { @@ -5054,7 +5044,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .dot-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .dot-font .b-font:before { @@ -5066,7 +5055,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: #232e40; } .dot-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .dot-h-font .b-font:before { @@ -5083,7 +5071,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: #232e40; } .dot-ha-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .dot-ha-font .b-font:before { @@ -5105,7 +5092,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: #ffffff; } .dot-e-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .dot-e-font .b-font:before { @@ -5130,7 +5116,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: transparent; } .pull-right-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-font .b-font:before { @@ -5142,7 +5127,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .pull-right-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-h-font .b-font:before { @@ -5159,7 +5143,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .pull-right-ha-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-ha-font .b-font:before { @@ -5181,7 +5164,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .pull-right-e-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-e-font .b-font:before { @@ -5206,7 +5188,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .copy-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .copy-font .b-font:before { @@ -5218,7 +5199,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .copy-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .copy-h-font .b-font:before { @@ -5235,7 +5215,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: #232e40; } .copy-ha-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .copy-ha-font .b-font:before { @@ -5257,7 +5236,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .copy-e-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .copy-e-font .b-font:before { @@ -5282,7 +5260,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .check-mark-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .check-mark-font .b-font:before { @@ -5294,7 +5271,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .check-mark-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .check-mark-h-font .b-font:before { @@ -5311,7 +5287,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .check-mark-ha-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .check-mark-ha-font .b-font:before { @@ -5333,7 +5308,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .check-mark-e-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .check-mark-e-font .b-font:before { @@ -5359,7 +5333,6 @@ textarea::-webkit-scrollbar-thumb:hover { } /** dashboard组件/控件 下拉列表图标字体 ~end~**/ .row-pre-page-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .row-pre-page-h-font .b-font:before { @@ -5376,7 +5349,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .row-next-page-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .row-next-page-h-font .b-font:before { @@ -5393,7 +5365,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .column-pre-page-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .column-pre-page-h-font .b-font:before { @@ -5410,7 +5381,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .column-next-page-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .column-next-page-h-font .b-font:before { @@ -5427,7 +5397,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .expander-right-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .expander-right-font .b-font:before { @@ -5439,7 +5408,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .expander-down-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .expander-down-font .b-font:before { @@ -5451,7 +5419,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .solid-triangle-top-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .solid-triangle-top-font .b-font:before { @@ -5468,7 +5435,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .solid-triangle-bottom-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .solid-triangle-bottom-font .b-font:before { @@ -5485,7 +5451,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .trigger-triangle-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .trigger-triangle-font .b-font:before { @@ -5507,7 +5472,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: #999999; } .pull-up-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-up-font .b-font:before { @@ -5519,7 +5483,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .pull-down-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-down-font .b-font:before { @@ -5531,7 +5494,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .pull-down-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-down-h-font .b-font:before { @@ -5548,7 +5510,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: #647185; } .pull-down-ha-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-down-ha-font .b-font:before { @@ -5570,7 +5531,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: #647185; } .check-font .b-font { - font-size: 12px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .check-font .b-font:before { @@ -5582,7 +5542,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: #3685f2; } .item-check-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .item-check-font .b-font:before { @@ -5604,7 +5563,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: #ffffff; } .primary-key-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .primary-key-font .b-font:before { @@ -5621,7 +5579,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .drag-tag-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .drag-tag-font .b-font:before { @@ -5633,7 +5590,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: #faaa39; } .less-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .less-font .b-font:before { @@ -5655,7 +5611,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .less-equal-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .less-equal-font .b-font:before { @@ -5677,7 +5632,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .text-bold-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-bold-font .b-font:before { @@ -5689,7 +5643,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .text-italic-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-italic-font .b-font:before { @@ -5701,7 +5654,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .text-underline-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-underline-font .b-font:before { @@ -5713,7 +5665,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .text-color-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-color-font .b-font:before { @@ -5725,7 +5676,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .text-background-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-background-font .b-font:before { @@ -5737,7 +5687,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .text-color-underline-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-color-underline-font .b-font:before { @@ -5749,7 +5698,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .text-align-left-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-align-left-font .b-font:before { @@ -5761,7 +5709,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .text-align-center-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-align-center-font .b-font:before { @@ -5773,7 +5720,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .text-align-right-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-align-right-font .b-font:before { @@ -5785,7 +5731,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .toast-error-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .toast-error-font .b-font:before { @@ -5797,7 +5742,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .toast-success-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .toast-success-font .b-font:before { @@ -5809,7 +5753,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .toast-warning-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .toast-warning-font .b-font:before { @@ -5821,7 +5764,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .toast-message-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .toast-message-font .b-font:before { @@ -5833,7 +5775,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .text-add-tip-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-add-tip-font .b-font:before { diff --git a/dist/bundle.js b/dist/bundle.js index 9d09dbf60..3d1429153 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -96974,7 +96974,7 @@ BI.DisplaySelectedList = BI.inherit(BI.Pane, { _createItems: function (items) { return BI.createItems(items, { type: "bi.icon_text_item", - cls: "cursor-default check-font display-list-item bi-tips", + cls: "cursor-default check-font icon-size-12 display-list-item bi-tips", once: true, invalid: true, selected: true, @@ -101790,7 +101790,7 @@ BI.MultiTreeCheckSelectedButton = BI.inherit(BI.Single, { var self = this; this.indicator = BI.createWidget({ type: "bi.icon_button", - cls: "check-font trigger-check-selected", + cls: "check-font trigger-check-selected icon-size-12", width: 15, height: 15, stopPropagation: true diff --git a/dist/fineui.css b/dist/fineui.css index 5e00d294b..55b6b4ec0 100644 --- a/dist/fineui.css +++ b/dist/fineui.css @@ -4899,7 +4899,6 @@ textarea::-webkit-scrollbar-thumb:hover { -moz-osx-font-smoothing: grayscale; } .close-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .close-font .b-font:before { @@ -4911,7 +4910,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .close-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .close-h-font .b-font:before { @@ -4928,7 +4926,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .close-ha-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .close-ha-font .b-font:before { @@ -4950,7 +4947,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .circle-close-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .circle-close-font .b-font:before { @@ -4962,7 +4958,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .search-close-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .search-close-h-font .b-font:before { @@ -4979,7 +4974,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .pre-page-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pre-page-h-font .b-font:before { @@ -4996,7 +4990,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .next-page-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .next-page-h-font .b-font:before { @@ -5013,7 +5006,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .search-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .search-font .b-font:before { @@ -5025,7 +5017,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .date-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .date-font .b-font:before { @@ -5037,7 +5028,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .date-change-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .date-change-h-font .b-font:before { @@ -5054,7 +5044,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .dot-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .dot-font .b-font:before { @@ -5066,7 +5055,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: #232e40; } .dot-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .dot-h-font .b-font:before { @@ -5083,7 +5071,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: #232e40; } .dot-ha-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .dot-ha-font .b-font:before { @@ -5105,7 +5092,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: #ffffff; } .dot-e-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .dot-e-font .b-font:before { @@ -5130,7 +5116,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: transparent; } .pull-right-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-font .b-font:before { @@ -5142,7 +5127,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .pull-right-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-h-font .b-font:before { @@ -5159,7 +5143,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .pull-right-ha-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-ha-font .b-font:before { @@ -5181,7 +5164,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .pull-right-e-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-e-font .b-font:before { @@ -5206,7 +5188,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .copy-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .copy-font .b-font:before { @@ -5218,7 +5199,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .copy-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .copy-h-font .b-font:before { @@ -5235,7 +5215,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: #232e40; } .copy-ha-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .copy-ha-font .b-font:before { @@ -5257,7 +5236,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .copy-e-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .copy-e-font .b-font:before { @@ -5282,7 +5260,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .check-mark-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .check-mark-font .b-font:before { @@ -5294,7 +5271,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .check-mark-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .check-mark-h-font .b-font:before { @@ -5311,7 +5287,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .check-mark-ha-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .check-mark-ha-font .b-font:before { @@ -5333,7 +5308,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .check-mark-e-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .check-mark-e-font .b-font:before { @@ -5359,7 +5333,6 @@ textarea::-webkit-scrollbar-thumb:hover { } /** dashboard组件/控件 下拉列表图标字体 ~end~**/ .row-pre-page-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .row-pre-page-h-font .b-font:before { @@ -5376,7 +5349,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .row-next-page-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .row-next-page-h-font .b-font:before { @@ -5393,7 +5365,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .column-pre-page-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .column-pre-page-h-font .b-font:before { @@ -5410,7 +5381,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .column-next-page-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .column-next-page-h-font .b-font:before { @@ -5427,7 +5397,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .expander-right-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .expander-right-font .b-font:before { @@ -5439,7 +5408,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .expander-down-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .expander-down-font .b-font:before { @@ -5451,7 +5419,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .solid-triangle-top-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .solid-triangle-top-font .b-font:before { @@ -5468,7 +5435,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .solid-triangle-bottom-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .solid-triangle-bottom-font .b-font:before { @@ -5485,7 +5451,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .trigger-triangle-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .trigger-triangle-font .b-font:before { @@ -5507,7 +5472,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: #999999; } .pull-up-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-up-font .b-font:before { @@ -5519,7 +5483,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .pull-down-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-down-font .b-font:before { @@ -5531,7 +5494,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .pull-down-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-down-h-font .b-font:before { @@ -5548,7 +5510,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: #647185; } .pull-down-ha-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-down-ha-font .b-font:before { @@ -5570,7 +5531,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: #647185; } .check-font .b-font { - font-size: 12px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .check-font .b-font:before { @@ -5582,7 +5542,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: #3685f2; } .item-check-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .item-check-font .b-font:before { @@ -5604,7 +5563,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: #ffffff; } .primary-key-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .primary-key-font .b-font:before { @@ -5621,7 +5579,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .drag-tag-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .drag-tag-font .b-font:before { @@ -5633,7 +5590,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: #faaa39; } .less-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .less-font .b-font:before { @@ -5655,7 +5611,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .less-equal-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .less-equal-font .b-font:before { @@ -5677,7 +5632,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .text-bold-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-bold-font .b-font:before { @@ -5689,7 +5643,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .text-italic-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-italic-font .b-font:before { @@ -5701,7 +5654,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .text-underline-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-underline-font .b-font:before { @@ -5713,7 +5665,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .text-color-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-color-font .b-font:before { @@ -5725,7 +5676,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .text-background-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-background-font .b-font:before { @@ -5737,7 +5687,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .text-color-underline-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-color-underline-font .b-font:before { @@ -5749,7 +5698,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .text-align-left-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-align-left-font .b-font:before { @@ -5761,7 +5709,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .text-align-center-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-align-center-font .b-font:before { @@ -5773,7 +5720,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .text-align-right-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-align-right-font .b-font:before { @@ -5785,7 +5731,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .toast-error-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .toast-error-font .b-font:before { @@ -5797,7 +5742,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .toast-success-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .toast-success-font .b-font:before { @@ -5809,7 +5753,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .toast-warning-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .toast-warning-font .b-font:before { @@ -5821,7 +5764,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .toast-message-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .toast-message-font .b-font:before { @@ -5833,7 +5775,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .text-add-tip-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-add-tip-font .b-font:before { diff --git a/dist/fineui.js b/dist/fineui.js index b34ac245d..33b015b1c 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -97223,7 +97223,7 @@ BI.DisplaySelectedList = BI.inherit(BI.Pane, { _createItems: function (items) { return BI.createItems(items, { type: "bi.icon_text_item", - cls: "cursor-default check-font display-list-item bi-tips", + cls: "cursor-default check-font icon-size-12 display-list-item bi-tips", once: true, invalid: true, selected: true, @@ -102039,7 +102039,7 @@ BI.MultiTreeCheckSelectedButton = BI.inherit(BI.Single, { var self = this; this.indicator = BI.createWidget({ type: "bi.icon_button", - cls: "check-font trigger-check-selected", + cls: "check-font trigger-check-selected icon-size-12", width: 15, height: 15, stopPropagation: true diff --git a/dist/resource.css b/dist/resource.css index 5381029b8..1c5c78f0f 100644 --- a/dist/resource.css +++ b/dist/resource.css @@ -348,7 +348,6 @@ textarea::-webkit-scrollbar-thumb:hover { -moz-osx-font-smoothing: grayscale; } .close-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .close-font .b-font:before { @@ -360,7 +359,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .close-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .close-h-font .b-font:before { @@ -377,7 +375,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .close-ha-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .close-ha-font .b-font:before { @@ -399,7 +396,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .circle-close-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .circle-close-font .b-font:before { @@ -411,7 +407,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .search-close-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .search-close-h-font .b-font:before { @@ -428,7 +423,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .pre-page-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pre-page-h-font .b-font:before { @@ -445,7 +439,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .next-page-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .next-page-h-font .b-font:before { @@ -462,7 +455,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .search-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .search-font .b-font:before { @@ -474,7 +466,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .date-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .date-font .b-font:before { @@ -486,7 +477,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .date-change-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .date-change-h-font .b-font:before { @@ -503,7 +493,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .dot-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .dot-font .b-font:before { @@ -515,7 +504,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: #232e40; } .dot-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .dot-h-font .b-font:before { @@ -532,7 +520,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: #232e40; } .dot-ha-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .dot-ha-font .b-font:before { @@ -554,7 +541,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: #ffffff; } .dot-e-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .dot-e-font .b-font:before { @@ -579,7 +565,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: transparent; } .pull-right-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-font .b-font:before { @@ -591,7 +576,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .pull-right-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-h-font .b-font:before { @@ -608,7 +592,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .pull-right-ha-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-ha-font .b-font:before { @@ -630,7 +613,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .pull-right-e-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-e-font .b-font:before { @@ -655,7 +637,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .copy-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .copy-font .b-font:before { @@ -667,7 +648,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .copy-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .copy-h-font .b-font:before { @@ -684,7 +664,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: #232e40; } .copy-ha-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .copy-ha-font .b-font:before { @@ -706,7 +685,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .copy-e-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .copy-e-font .b-font:before { @@ -731,7 +709,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .check-mark-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .check-mark-font .b-font:before { @@ -743,7 +720,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .check-mark-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .check-mark-h-font .b-font:before { @@ -760,7 +736,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .check-mark-ha-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .check-mark-ha-font .b-font:before { @@ -782,7 +757,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .check-mark-e-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .check-mark-e-font .b-font:before { @@ -808,7 +782,6 @@ textarea::-webkit-scrollbar-thumb:hover { } /** dashboard组件/控件 下拉列表图标字体 ~end~**/ .row-pre-page-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .row-pre-page-h-font .b-font:before { @@ -825,7 +798,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .row-next-page-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .row-next-page-h-font .b-font:before { @@ -842,7 +814,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .column-pre-page-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .column-pre-page-h-font .b-font:before { @@ -859,7 +830,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .column-next-page-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .column-next-page-h-font .b-font:before { @@ -876,7 +846,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .expander-right-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .expander-right-font .b-font:before { @@ -888,7 +857,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .expander-down-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .expander-down-font .b-font:before { @@ -900,7 +868,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .solid-triangle-top-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .solid-triangle-top-font .b-font:before { @@ -917,7 +884,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .solid-triangle-bottom-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .solid-triangle-bottom-font .b-font:before { @@ -934,7 +900,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .trigger-triangle-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .trigger-triangle-font .b-font:before { @@ -956,7 +921,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: #999999; } .pull-up-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-up-font .b-font:before { @@ -968,7 +932,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .pull-down-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-down-font .b-font:before { @@ -980,7 +943,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .pull-down-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-down-h-font .b-font:before { @@ -997,7 +959,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: #647185; } .pull-down-ha-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-down-ha-font .b-font:before { @@ -1019,7 +980,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: #647185; } .check-font .b-font { - font-size: 12px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .check-font .b-font:before { @@ -1031,7 +991,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: #3685f2; } .item-check-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .item-check-font .b-font:before { @@ -1053,7 +1012,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: #ffffff; } .primary-key-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .primary-key-font .b-font:before { @@ -1070,7 +1028,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .drag-tag-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .drag-tag-font .b-font:before { @@ -1082,7 +1039,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: #faaa39; } .less-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .less-font .b-font:before { @@ -1104,7 +1060,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .less-equal-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .less-equal-font .b-font:before { @@ -1126,7 +1081,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .text-bold-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-bold-font .b-font:before { @@ -1138,7 +1092,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .text-italic-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-italic-font .b-font:before { @@ -1150,7 +1103,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .text-underline-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-underline-font .b-font:before { @@ -1162,7 +1114,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .text-color-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-color-font .b-font:before { @@ -1174,7 +1125,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .text-background-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-background-font .b-font:before { @@ -1186,7 +1136,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .text-color-underline-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-color-underline-font .b-font:before { @@ -1198,7 +1147,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .text-align-left-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-align-left-font .b-font:before { @@ -1210,7 +1158,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .text-align-center-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-align-center-font .b-font:before { @@ -1222,7 +1169,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .text-align-right-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-align-right-font .b-font:before { @@ -1234,7 +1180,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .toast-error-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .toast-error-font .b-font:before { @@ -1246,7 +1191,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .toast-success-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .toast-success-font .b-font:before { @@ -1258,7 +1202,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .toast-warning-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .toast-warning-font .b-font:before { @@ -1270,7 +1213,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .toast-message-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .toast-message-font .b-font:before { @@ -1282,7 +1224,6 @@ textarea::-webkit-scrollbar-thumb:hover { color: inherit; } .text-add-tip-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-add-tip-font .b-font:before { @@ -1851,3 +1792,18 @@ textarea::-webkit-scrollbar-thumb:hover { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/trans_disable.png'); _background: none; } +.icon-size-12 .b-font { + font-size: 12px; +} +.icon-size-16 .b-font { + font-size: 16px; +} +.icon-size-24 .b-font { + font-size: 24px; +} +.icon-size-50 .b-font { + font-size: 50px; +} +.icon-size-70 .b-font { + font-size: 70px; +} diff --git a/dist/widget.js b/dist/widget.js index ccb04c50b..0ab31d51f 100644 --- a/dist/widget.js +++ b/dist/widget.js @@ -9164,7 +9164,7 @@ BI.DisplaySelectedList = BI.inherit(BI.Pane, { _createItems: function (items) { return BI.createItems(items, { type: "bi.icon_text_item", - cls: "cursor-default check-font display-list-item bi-tips", + cls: "cursor-default check-font icon-size-12 display-list-item bi-tips", once: true, invalid: true, selected: true, @@ -13980,7 +13980,7 @@ BI.MultiTreeCheckSelectedButton = BI.inherit(BI.Single, { var self = this; this.indicator = BI.createWidget({ type: "bi.icon_button", - cls: "check-font trigger-check-selected", + cls: "check-font trigger-check-selected icon-size-12", width: 15, height: 15, stopPropagation: true diff --git a/public/css/font.css b/public/css/font.css index 0262f7f5d..06318b5ec 100644 --- a/public/css/font.css +++ b/public/css/font.css @@ -12,7 +12,6 @@ -moz-osx-font-smoothing: grayscale; } .close-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .close-font .b-font:before { @@ -24,7 +23,6 @@ color: inherit; } .close-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .close-h-font .b-font:before { @@ -41,7 +39,6 @@ color: inherit; } .close-ha-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .close-ha-font .b-font:before { @@ -63,7 +60,6 @@ color: inherit; } .circle-close-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .circle-close-font .b-font:before { @@ -75,7 +71,6 @@ color: inherit; } .search-close-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .search-close-h-font .b-font:before { @@ -92,7 +87,6 @@ color: inherit; } .pre-page-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pre-page-h-font .b-font:before { @@ -109,7 +103,6 @@ color: inherit; } .next-page-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .next-page-h-font .b-font:before { @@ -126,7 +119,6 @@ color: inherit; } .search-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .search-font .b-font:before { @@ -138,7 +130,6 @@ color: inherit; } .date-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .date-font .b-font:before { @@ -150,7 +141,6 @@ color: inherit; } .date-change-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .date-change-h-font .b-font:before { @@ -167,7 +157,6 @@ color: inherit; } .dot-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .dot-font .b-font:before { @@ -179,7 +168,6 @@ color: #232e40; } .dot-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .dot-h-font .b-font:before { @@ -196,7 +184,6 @@ color: #232e40; } .dot-ha-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .dot-ha-font .b-font:before { @@ -218,7 +205,6 @@ color: #ffffff; } .dot-e-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .dot-e-font .b-font:before { @@ -243,7 +229,6 @@ color: transparent; } .pull-right-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-font .b-font:before { @@ -255,7 +240,6 @@ color: inherit; } .pull-right-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-h-font .b-font:before { @@ -272,7 +256,6 @@ color: inherit; } .pull-right-ha-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-ha-font .b-font:before { @@ -294,7 +277,6 @@ color: inherit; } .pull-right-e-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-e-font .b-font:before { @@ -319,7 +301,6 @@ color: inherit; } .copy-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .copy-font .b-font:before { @@ -331,7 +312,6 @@ color: inherit; } .copy-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .copy-h-font .b-font:before { @@ -348,7 +328,6 @@ color: #232e40; } .copy-ha-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .copy-ha-font .b-font:before { @@ -370,7 +349,6 @@ color: inherit; } .copy-e-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .copy-e-font .b-font:before { @@ -395,7 +373,6 @@ color: inherit; } .check-mark-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .check-mark-font .b-font:before { @@ -407,7 +384,6 @@ color: inherit; } .check-mark-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .check-mark-h-font .b-font:before { @@ -424,7 +400,6 @@ color: inherit; } .check-mark-ha-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .check-mark-ha-font .b-font:before { @@ -446,7 +421,6 @@ color: inherit; } .check-mark-e-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .check-mark-e-font .b-font:before { @@ -472,7 +446,6 @@ } /** dashboard组件/控件 下拉列表图标字体 ~end~**/ .row-pre-page-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .row-pre-page-h-font .b-font:before { @@ -489,7 +462,6 @@ color: inherit; } .row-next-page-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .row-next-page-h-font .b-font:before { @@ -506,7 +478,6 @@ color: inherit; } .column-pre-page-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .column-pre-page-h-font .b-font:before { @@ -523,7 +494,6 @@ color: inherit; } .column-next-page-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .column-next-page-h-font .b-font:before { @@ -540,7 +510,6 @@ color: inherit; } .expander-right-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .expander-right-font .b-font:before { @@ -552,7 +521,6 @@ color: inherit; } .expander-down-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .expander-down-font .b-font:before { @@ -564,7 +532,6 @@ color: inherit; } .solid-triangle-top-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .solid-triangle-top-font .b-font:before { @@ -581,7 +548,6 @@ color: inherit; } .solid-triangle-bottom-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .solid-triangle-bottom-font .b-font:before { @@ -598,7 +564,6 @@ color: inherit; } .trigger-triangle-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .trigger-triangle-font .b-font:before { @@ -620,7 +585,6 @@ color: #999999; } .pull-up-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-up-font .b-font:before { @@ -632,7 +596,6 @@ color: inherit; } .pull-down-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-down-font .b-font:before { @@ -644,7 +607,6 @@ color: inherit; } .pull-down-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-down-h-font .b-font:before { @@ -661,7 +623,6 @@ color: #647185; } .pull-down-ha-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-down-ha-font .b-font:before { @@ -683,7 +644,6 @@ color: #647185; } .check-font .b-font { - font-size: 12px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .check-font .b-font:before { @@ -695,7 +655,6 @@ color: #3685f2; } .item-check-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .item-check-font .b-font:before { @@ -717,7 +676,6 @@ color: #ffffff; } .primary-key-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .primary-key-font .b-font:before { @@ -734,7 +692,6 @@ color: inherit; } .drag-tag-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .drag-tag-font .b-font:before { @@ -746,7 +703,6 @@ color: #faaa39; } .less-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .less-font .b-font:before { @@ -768,7 +724,6 @@ color: inherit; } .less-equal-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .less-equal-font .b-font:before { @@ -790,7 +745,6 @@ color: inherit; } .text-bold-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-bold-font .b-font:before { @@ -802,7 +756,6 @@ color: inherit; } .text-italic-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-italic-font .b-font:before { @@ -814,7 +767,6 @@ color: inherit; } .text-underline-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-underline-font .b-font:before { @@ -826,7 +778,6 @@ color: inherit; } .text-color-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-color-font .b-font:before { @@ -838,7 +789,6 @@ color: inherit; } .text-background-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-background-font .b-font:before { @@ -850,7 +800,6 @@ color: inherit; } .text-color-underline-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-color-underline-font .b-font:before { @@ -862,7 +811,6 @@ color: inherit; } .text-align-left-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-align-left-font .b-font:before { @@ -874,7 +822,6 @@ color: inherit; } .text-align-center-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-align-center-font .b-font:before { @@ -886,7 +833,6 @@ color: inherit; } .text-align-right-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-align-right-font .b-font:before { @@ -898,7 +844,6 @@ color: inherit; } .toast-error-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .toast-error-font .b-font:before { @@ -910,7 +855,6 @@ color: inherit; } .toast-success-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .toast-success-font .b-font:before { @@ -922,7 +866,6 @@ color: inherit; } .toast-warning-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .toast-warning-font .b-font:before { @@ -934,7 +877,6 @@ color: inherit; } .toast-message-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .toast-message-font .b-font:before { @@ -946,7 +888,6 @@ color: inherit; } .text-add-tip-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-add-tip-font .b-font:before { diff --git a/src/css/resource/font.css b/src/css/resource/font.css index 3b39794d2..2ab353193 100644 --- a/src/css/resource/font.css +++ b/src/css/resource/font.css @@ -12,7 +12,6 @@ -moz-osx-font-smoothing: grayscale; } .close-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .close-font .b-font:before { @@ -24,7 +23,6 @@ color: inherit; } .close-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .close-h-font .b-font:before { @@ -41,7 +39,6 @@ color: inherit; } .close-ha-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .close-ha-font .b-font:before { @@ -63,7 +60,6 @@ color: inherit; } .circle-close-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .circle-close-font .b-font:before { @@ -75,7 +71,6 @@ color: inherit; } .search-close-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .search-close-h-font .b-font:before { @@ -92,7 +87,6 @@ color: inherit; } .pre-page-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pre-page-h-font .b-font:before { @@ -109,7 +103,6 @@ color: inherit; } .next-page-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .next-page-h-font .b-font:before { @@ -126,7 +119,6 @@ color: inherit; } .search-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .search-font .b-font:before { @@ -138,7 +130,6 @@ color: inherit; } .date-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .date-font .b-font:before { @@ -150,7 +141,6 @@ color: inherit; } .date-change-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .date-change-h-font .b-font:before { @@ -167,7 +157,6 @@ color: inherit; } .dot-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .dot-font .b-font:before { @@ -179,7 +168,6 @@ color: #232e40; } .dot-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .dot-h-font .b-font:before { @@ -196,7 +184,6 @@ color: #232e40; } .dot-ha-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .dot-ha-font .b-font:before { @@ -218,7 +205,6 @@ color: #ffffff; } .dot-e-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .dot-e-font .b-font:before { @@ -243,7 +229,6 @@ color: transparent; } .pull-right-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-font .b-font:before { @@ -255,7 +240,6 @@ color: inherit; } .pull-right-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-h-font .b-font:before { @@ -272,7 +256,6 @@ color: inherit; } .pull-right-ha-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-ha-font .b-font:before { @@ -294,7 +277,6 @@ color: inherit; } .pull-right-e-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-e-font .b-font:before { @@ -319,7 +301,6 @@ color: inherit; } .copy-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .copy-font .b-font:before { @@ -331,7 +312,6 @@ color: inherit; } .copy-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .copy-h-font .b-font:before { @@ -348,7 +328,6 @@ color: #232e40; } .copy-ha-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .copy-ha-font .b-font:before { @@ -370,7 +349,6 @@ color: inherit; } .copy-e-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .copy-e-font .b-font:before { @@ -395,7 +373,6 @@ color: inherit; } .check-mark-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .check-mark-font .b-font:before { @@ -407,7 +384,6 @@ color: inherit; } .check-mark-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .check-mark-h-font .b-font:before { @@ -424,7 +400,6 @@ color: inherit; } .check-mark-ha-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .check-mark-ha-font .b-font:before { @@ -446,7 +421,6 @@ color: inherit; } .check-mark-e-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .check-mark-e-font .b-font:before { @@ -472,7 +446,6 @@ } /** dashboard组件/控件 下拉列表图标字体 ~end~**/ .row-pre-page-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .row-pre-page-h-font .b-font:before { @@ -489,7 +462,6 @@ color: inherit; } .row-next-page-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .row-next-page-h-font .b-font:before { @@ -506,7 +478,6 @@ color: inherit; } .column-pre-page-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .column-pre-page-h-font .b-font:before { @@ -523,7 +494,6 @@ color: inherit; } .column-next-page-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .column-next-page-h-font .b-font:before { @@ -540,7 +510,6 @@ color: inherit; } .expander-right-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .expander-right-font .b-font:before { @@ -552,7 +521,6 @@ color: inherit; } .expander-down-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .expander-down-font .b-font:before { @@ -564,7 +532,6 @@ color: inherit; } .solid-triangle-top-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .solid-triangle-top-font .b-font:before { @@ -581,7 +548,6 @@ color: inherit; } .solid-triangle-bottom-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .solid-triangle-bottom-font .b-font:before { @@ -598,7 +564,6 @@ color: inherit; } .trigger-triangle-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .trigger-triangle-font .b-font:before { @@ -620,7 +585,6 @@ color: #999999; } .pull-up-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-up-font .b-font:before { @@ -632,7 +596,6 @@ color: inherit; } .pull-down-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-down-font .b-font:before { @@ -644,7 +607,6 @@ color: inherit; } .pull-down-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-down-h-font .b-font:before { @@ -661,7 +623,6 @@ color: #647185; } .pull-down-ha-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-down-ha-font .b-font:before { @@ -683,7 +644,6 @@ color: #647185; } .check-font .b-font { - font-size: 12px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .check-font .b-font:before { @@ -695,7 +655,6 @@ color: #3685f2; } .item-check-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .item-check-font .b-font:before { @@ -717,7 +676,6 @@ color: #ffffff; } .primary-key-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .primary-key-font .b-font:before { @@ -734,7 +692,6 @@ color: inherit; } .drag-tag-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .drag-tag-font .b-font:before { @@ -746,7 +703,6 @@ color: #faaa39; } .less-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .less-font .b-font:before { @@ -768,7 +724,6 @@ color: inherit; } .less-equal-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .less-equal-font .b-font:before { @@ -790,7 +745,6 @@ color: inherit; } .text-bold-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-bold-font .b-font:before { @@ -802,7 +756,6 @@ color: inherit; } .text-italic-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-italic-font .b-font:before { @@ -814,7 +767,6 @@ color: inherit; } .text-underline-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-underline-font .b-font:before { @@ -826,7 +778,6 @@ color: inherit; } .text-color-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-color-font .b-font:before { @@ -838,7 +789,6 @@ color: inherit; } .text-background-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-background-font .b-font:before { @@ -850,7 +800,6 @@ color: inherit; } .text-color-underline-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-color-underline-font .b-font:before { @@ -862,7 +811,6 @@ color: inherit; } .text-align-left-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-align-left-font .b-font:before { @@ -874,7 +822,6 @@ color: inherit; } .text-align-center-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-align-center-font .b-font:before { @@ -886,7 +833,6 @@ color: inherit; } .text-align-right-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-align-right-font .b-font:before { @@ -898,7 +844,6 @@ color: inherit; } .toast-error-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .toast-error-font .b-font:before { @@ -910,7 +855,6 @@ color: inherit; } .toast-success-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .toast-success-font .b-font:before { @@ -922,7 +866,6 @@ color: inherit; } .toast-warning-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .toast-warning-font .b-font:before { @@ -934,7 +877,6 @@ color: inherit; } .toast-message-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .toast-message-font .b-font:before { @@ -946,7 +888,6 @@ color: inherit; } .text-add-tip-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-add-tip-font .b-font:before { diff --git a/src/css/resource/size.css b/src/css/resource/size.css new file mode 100644 index 000000000..f08a250bd --- /dev/null +++ b/src/css/resource/size.css @@ -0,0 +1,15 @@ +.icon-size-12 .b-font { + font-size: 12px; +} +.icon-size-16 .b-font { + font-size: 16px; +} +.icon-size-24 .b-font { + font-size: 24px; +} +.icon-size-50 .b-font { + font-size: 50px; +} +.icon-size-70 .b-font { + font-size: 70px; +} diff --git a/src/less/image.less b/src/less/image.less index 35dba5f3a..23d3593e9 100644 --- a/src/less/image.less +++ b/src/less/image.less @@ -314,12 +314,19 @@ @color-bi-font-hover: inherit; @color-bi-font-active: #3f8ce8; +.iconSize(@class,@fontSize) { + .@{class} { + & .b-font { + font-size: @fontSize; + } + } +} + // 默认font -.font(@class,@content, @color: @color-bi-font-native, @fontSize: @font-size-16) { +.font(@class,@content, @color: @color-bi-font-native) { @fc: "\@{content}"; .@{class} { & .b-font { - font-size: @fontSize; *zoom: ~"expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#x@{content};')"; } & .b-font:before { @@ -334,11 +341,10 @@ } // 有悬浮效果的font -.font-hover(@class,@content,@color-native: @color-bi-font-native, @color-hover: @color-bi-font-hover, @fontSize: @font-size-16) { +.font-hover(@class,@content,@color-native: @color-bi-font-native, @color-hover: @color-bi-font-hover) { @fc: "\@{content}"; .@{class} { & .b-font { - font-size: @fontSize; *zoom: ~"expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#x@{content};')"; } & .b-font:before { @@ -358,11 +364,10 @@ } // 有默认、激活(选中)的font -.font-hover-active(@class,@content,@color-native: @color-bi-font-native, @color-hover: @color-bi-font-hover, @color-active: @color-bi-font-active, @fontSize: @font-size-16) { +.font-hover-active(@class,@content,@color-native: @color-bi-font-native, @color-hover: @color-bi-font-hover, @color-active: @color-bi-font-active) { @fc: "\@{content}"; .@{class} { & .b-font { - font-size: @fontSize; *zoom: ~"expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#x@{content};')"; } & .b-font:before { @@ -387,11 +392,10 @@ } } -.font-effect(@class,@content,@color-native: @color-bi-font-native, @color-hover: @color-bi-font-hover, @color-active: @color-bi-font-active, @color-selected: @color-bi-font-active, @fontSize: @font-size-16) { +.font-effect(@class,@content,@color-native: @color-bi-font-native, @color-hover: @color-bi-font-hover, @color-active: @color-bi-font-active, @color-selected: @color-bi-font-active) { @fc: "\@{content}"; .@{class} { & .b-font { - font-size: @fontSize; *zoom: ~"expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#x@{content};')"; } & .b-font:before { diff --git a/src/less/resource/font.less b/src/less/resource/font.less index 70392b71e..074fd49f9 100644 --- a/src/less/resource/font.less +++ b/src/less/resource/font.less @@ -84,7 +84,7 @@ .font-hover(pull-down-h-font, @font-down-triangle, @color-bi-text-light-gray); .font-hover-active(pull-down-ha-font, @font-down-triangle, @color-bi-text-light-gray); -.font(check-font, @font-check-mark, @color-bi-text-highlight, @font-size-12); +.font(check-font, @font-check-mark, @color-bi-text-highlight); .font-hover-active(item-check-font, @font-check-mark, @color-bi-text, @color-bi-text-gray, @color-bi-font-active); diff --git a/src/less/resource/size.less b/src/less/resource/size.less new file mode 100644 index 000000000..6f72ba3bc --- /dev/null +++ b/src/less/resource/size.less @@ -0,0 +1,8 @@ +@import "../lib/constant"; +@import "../image"; + +.iconSize(icon-size-12, @font-size-12); +.iconSize(icon-size-16, @font-size-16); +.iconSize(icon-size-24, @font-size-24); +.iconSize(icon-size-50, @font-size-50); +.iconSize(icon-size-70, @font-size-70); \ No newline at end of file diff --git a/src/widget/multiselect/check/multiselect.display.js b/src/widget/multiselect/check/multiselect.display.js index 9b91da397..337afd59f 100644 --- a/src/widget/multiselect/check/multiselect.display.js +++ b/src/widget/multiselect/check/multiselect.display.js @@ -60,7 +60,7 @@ BI.DisplaySelectedList = BI.inherit(BI.Pane, { _createItems: function (items) { return BI.createItems(items, { type: "bi.icon_text_item", - cls: "cursor-default check-font display-list-item bi-tips", + cls: "cursor-default check-font icon-size-12 display-list-item bi-tips", once: true, invalid: true, selected: true, diff --git a/src/widget/multitree/trigger/multi.tree.button.checkselected.js b/src/widget/multitree/trigger/multi.tree.button.checkselected.js index 4ee85fa20..4cb5489d7 100644 --- a/src/widget/multitree/trigger/multi.tree.button.checkselected.js +++ b/src/widget/multitree/trigger/multi.tree.button.checkselected.js @@ -18,7 +18,7 @@ BI.MultiTreeCheckSelectedButton = BI.inherit(BI.Single, { var self = this; this.indicator = BI.createWidget({ type: "bi.icon_button", - cls: "check-font trigger-check-selected", + cls: "check-font trigger-check-selected icon-size-12", width: 15, height: 15, stopPropagation: true diff --git a/ui/css/font.css b/ui/css/font.css index fd1b6b5d5..a1fc60f6f 100644 --- a/ui/css/font.css +++ b/ui/css/font.css @@ -12,7 +12,6 @@ -moz-osx-font-smoothing: grayscale; } .close-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .close-font .b-font:before { @@ -24,7 +23,6 @@ color: inherit; } .close-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .close-h-font .b-font:before { @@ -41,7 +39,6 @@ color: inherit; } .close-ha-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .close-ha-font .b-font:before { @@ -63,7 +60,6 @@ color: inherit; } .circle-close-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .circle-close-font .b-font:before { @@ -75,7 +71,6 @@ color: inherit; } .search-close-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .search-close-h-font .b-font:before { @@ -92,7 +87,6 @@ color: inherit; } .pre-page-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pre-page-h-font .b-font:before { @@ -109,7 +103,6 @@ color: inherit; } .next-page-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .next-page-h-font .b-font:before { @@ -126,7 +119,6 @@ color: inherit; } .search-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .search-font .b-font:before { @@ -138,7 +130,6 @@ color: inherit; } .date-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .date-font .b-font:before { @@ -150,7 +141,6 @@ color: inherit; } .date-change-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .date-change-h-font .b-font:before { @@ -167,7 +157,6 @@ color: inherit; } .dot-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .dot-font .b-font:before { @@ -179,7 +168,6 @@ color: #232e40; } .dot-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .dot-h-font .b-font:before { @@ -196,7 +184,6 @@ color: #232e40; } .dot-ha-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .dot-ha-font .b-font:before { @@ -218,7 +205,6 @@ color: #ffffff; } .dot-e-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .dot-e-font .b-font:before { @@ -243,7 +229,6 @@ color: transparent; } .pull-right-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-font .b-font:before { @@ -255,7 +240,6 @@ color: inherit; } .pull-right-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-h-font .b-font:before { @@ -272,7 +256,6 @@ color: inherit; } .pull-right-ha-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-ha-font .b-font:before { @@ -294,7 +277,6 @@ color: inherit; } .pull-right-e-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-right-e-font .b-font:before { @@ -319,7 +301,6 @@ color: inherit; } .copy-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .copy-font .b-font:before { @@ -331,7 +312,6 @@ color: inherit; } .copy-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .copy-h-font .b-font:before { @@ -348,7 +328,6 @@ color: #232e40; } .copy-ha-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .copy-ha-font .b-font:before { @@ -370,7 +349,6 @@ color: inherit; } .copy-e-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .copy-e-font .b-font:before { @@ -395,7 +373,6 @@ color: inherit; } .check-mark-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .check-mark-font .b-font:before { @@ -407,7 +384,6 @@ color: inherit; } .check-mark-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .check-mark-h-font .b-font:before { @@ -424,7 +400,6 @@ color: inherit; } .check-mark-ha-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .check-mark-ha-font .b-font:before { @@ -446,7 +421,6 @@ color: inherit; } .check-mark-e-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .check-mark-e-font .b-font:before { @@ -472,7 +446,6 @@ } /** dashboard组件/控件 下拉列表图标字体 ~end~**/ .row-pre-page-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .row-pre-page-h-font .b-font:before { @@ -489,7 +462,6 @@ color: inherit; } .row-next-page-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .row-next-page-h-font .b-font:before { @@ -506,7 +478,6 @@ color: inherit; } .column-pre-page-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .column-pre-page-h-font .b-font:before { @@ -523,7 +494,6 @@ color: inherit; } .column-next-page-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .column-next-page-h-font .b-font:before { @@ -540,7 +510,6 @@ color: inherit; } .expander-right-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .expander-right-font .b-font:before { @@ -552,7 +521,6 @@ color: inherit; } .expander-down-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .expander-down-font .b-font:before { @@ -564,7 +532,6 @@ color: inherit; } .solid-triangle-top-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .solid-triangle-top-font .b-font:before { @@ -581,7 +548,6 @@ color: inherit; } .solid-triangle-bottom-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .solid-triangle-bottom-font .b-font:before { @@ -598,7 +564,6 @@ color: inherit; } .trigger-triangle-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .trigger-triangle-font .b-font:before { @@ -620,7 +585,6 @@ color: #999999; } .pull-up-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-up-font .b-font:before { @@ -632,7 +596,6 @@ color: inherit; } .pull-down-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-down-font .b-font:before { @@ -644,7 +607,6 @@ color: inherit; } .pull-down-h-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-down-h-font .b-font:before { @@ -661,7 +623,6 @@ color: #647185; } .pull-down-ha-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-down-ha-font .b-font:before { @@ -683,7 +644,6 @@ color: #647185; } .check-font .b-font { - font-size: 12px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .check-font .b-font:before { @@ -695,7 +655,6 @@ color: #3685f2; } .item-check-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .item-check-font .b-font:before { @@ -717,7 +676,6 @@ color: #ffffff; } .primary-key-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .primary-key-font .b-font:before { @@ -734,7 +692,6 @@ color: inherit; } .drag-tag-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .drag-tag-font .b-font:before { @@ -746,7 +703,6 @@ color: #faaa39; } .less-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .less-font .b-font:before { @@ -768,7 +724,6 @@ color: inherit; } .less-equal-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .less-equal-font .b-font:before { @@ -790,7 +745,6 @@ color: inherit; } .text-bold-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-bold-font .b-font:before { @@ -802,7 +756,6 @@ color: inherit; } .text-italic-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-italic-font .b-font:before { @@ -814,7 +767,6 @@ color: inherit; } .text-underline-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-underline-font .b-font:before { @@ -826,7 +778,6 @@ color: inherit; } .text-color-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-color-font .b-font:before { @@ -838,7 +789,6 @@ color: inherit; } .text-background-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-background-font .b-font:before { @@ -850,7 +800,6 @@ color: inherit; } .text-color-underline-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-color-underline-font .b-font:before { @@ -862,7 +811,6 @@ color: inherit; } .text-align-left-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-align-left-font .b-font:before { @@ -874,7 +822,6 @@ color: inherit; } .text-align-center-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-align-center-font .b-font:before { @@ -886,7 +833,6 @@ color: inherit; } .text-align-right-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-align-right-font .b-font:before { @@ -898,7 +844,6 @@ color: inherit; } .toast-error-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .toast-error-font .b-font:before { @@ -910,7 +855,6 @@ color: inherit; } .toast-success-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .toast-success-font .b-font:before { @@ -922,7 +866,6 @@ color: inherit; } .toast-warning-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .toast-warning-font .b-font:before { @@ -934,7 +877,6 @@ color: inherit; } .toast-message-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .toast-message-font .b-font:before { @@ -946,7 +888,6 @@ color: inherit; } .text-add-tip-font .b-font { - font-size: 16px; *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .text-add-tip-font .b-font:before { From 6021807d6a452a3205416f95bbff87544db3c2d2 Mon Sep 17 00:00:00 2001 From: fay Date: Tue, 17 Jul 2018 11:20:59 +0800 Subject: [PATCH 2/2] 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 {