diff --git a/Gruntfile.js b/Gruntfile.js index 31730ad34c..f905d60cf0 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -103,7 +103,7 @@ module.exports = function (grunt) { dest: "dist/widget.js" }, coreCss: { - src: ['src/css/core/**/*.css'], + src: ['src/css/core/**/*.css', 'src/css/theme/**/*.css'], dest: 'dist/core.css' }, baseCss: { @@ -202,7 +202,7 @@ module.exports = function (grunt) { dest: "bi/widget.js" }, bi_coreCss: { - src: ['src/css/core/**/*.css'], + src: ['src/css/core/**/*.css', 'src/css/theme/**/*.css'], dest: 'bi/core.css' }, bi_baseCss: { diff --git a/bi/base.css b/bi/base.css index d9a49fee4a..7589322336 100644 --- a/bi/base.css +++ b/bi/base.css @@ -4,17 +4,6 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-combine-chart .bi-linkage-list { - background-color: #ffffff; - border: 1px solid #eaeaea; - z-index: 1000000000; -} -.bi-combine-chart .bi-linkage-list .bi-linkage-list-item:hover { - background-color: #f4f4f4; -} -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ .bi-color-chooser-popup .color-chooser-popup-title { background: #f4f4f4; border-bottom: 1px solid #d4dadd; @@ -949,13 +938,6 @@ li.CodeMirror-hint-active { /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-record-editor .record-editor-text { - font-size: 12px; - background: #f4f4f4; -} -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ .bi-shelter-editor .shelter-editor-text { font-size: 12px; } @@ -1021,9 +1003,6 @@ li.CodeMirror-hint-active { border: none; color: #e85050 !important; } -.bi-input.disabled { - background-color: white; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ @@ -1279,11 +1258,19 @@ li.CodeMirror-hint-active { .public-scrollbar-face:after { background-color: #c2c2c2; } +.bi-theme-dark .public-scrollbar-face:after { + background-color: #7d7d7d; +} .public-scrollbar-main:hover .public-scrollbar-face:after, .public-scrollbar-main-active .public-scrollbar-face:after, .public-scrollbar-faceActive:after { background-color: #7d7d7d; } +.bi-theme-dark .public-scrollbar-main:hover .public-scrollbar-face:after, +.bi-theme-dark .public-scrollbar-main-active .public-scrollbar-face:after, +.bi-theme-dark .public-scrollbar-faceActive:after { + background-color: #c2c2c2; +} .horizontal-scrollbar { bottom: 0; position: absolute; @@ -1437,3 +1424,7 @@ li.CodeMirror-hint-active { .bi-list-view .list-view-toolbar > .first-element { border-left: none; } +.bi-theme-dark .bi-list-view .list-view-outer { + color: #b2b2b2; + background: #191a2c; +} diff --git a/bi/case.js b/bi/case.js index ee23e1ba8b..7ce7b74c82 100644 --- a/bi/case.js +++ b/bi/case.js @@ -5225,232 +5225,6 @@ BI.ClearEditor.EVENT_RESTRICT = "EVENT_RESTRICT"; BI.ClearEditor.EVENT_REMOVE = "EVENT_REMOVE"; BI.ClearEditor.EVENT_EMPTY = "EVENT_EMPTY"; BI.shortcut("bi.clear_editor", BI.ClearEditor);/** - * guy - * 记录内容的输入框 - * @class BI.RecordEditor - * @extends BI.Single - */ -BI.RecordEditor = BI.inherit(BI.Single, { - _defaultConfig: function () { - var conf = BI.RecordEditor.superclass._defaultConfig.apply(this, arguments); - return BI.extend(conf, { - baseCls: (conf.baseCls || "") + " bi-record-editor", - hgap: 4, - vgap: 2, - lgap: 0, - rgap: 0, - tgap: 0, - bgap: 0, - validationChecker: BI.emptyFn, - quitChecker: BI.emptyFn, - allowBlank: true, - watermark: "", - errorText: "", - height: 30 - }) - }, - - _init: function () { - BI.RecordEditor.superclass._init.apply(this, arguments); - this.contents = []; - var self = this, o = this.options; - - this.editor = BI.createWidget({ - type: "bi.editor", - height: o.height, - hgap: o.hgap, - vgap: o.vgap, - lgap: o.lgap, - rgap: o.rgap, - tgap: o.tgap, - bgap: o.bgap, - value: o.value, - validationChecker: o.validationChecker, - quitChecker: o.quitChecker, - mouseOut: o.mouseOut, - allowBlank: o.allowBlank, - watermark: o.watermark, - errorText: o.errorText - }); - this.textContainer = BI.createWidget({ - type: "bi.vertical_adapt", - hgap: 2, - height: o.height - }); - this.editor.on(BI.Controller.EVENT_CHANGE, function () { - self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); - }); - this.editor.on(BI.Editor.EVENT_FOCUS, function () { - self._checkInputState(); - self.fireEvent(BI.RecordEditor.EVENT_FOCUS, arguments); - }); - this.editor.on(BI.Editor.EVENT_BLUR, function () { - self._checkInputState(); - self.fireEvent(BI.RecordEditor.EVENT_BLUR, arguments); - }); - this.editor.on(BI.Editor.EVENT_CLICK, function () { - self.fireEvent(BI.RecordEditor.EVENT_CLICK, arguments); - }); - this.editor.on(BI.Editor.EVENT_CHANGE, function () { - self.fireEvent(BI.RecordEditor.EVENT_CHANGE, arguments); - }); - this.editor.on(BI.Editor.EVENT_KEY_DOWN, function (v) { - self.fireEvent(BI.RecordEditor.EVENT_KEY_DOWN, arguments); - }); - - this.editor.on(BI.Editor.EVENT_VALID, function () { - self.fireEvent(BI.RecordEditor.EVENT_VALID, arguments); - }); - this.editor.on(BI.Editor.EVENT_SPACE, function () { - self.fireEvent(BI.RecordEditor.EVENT_SPACE, arguments); - }); - this.editor.on(BI.Editor.EVENT_CONFIRM, function () { - self.setState(self.getValue()); - self.editor.isValid() && self.editor.setValue(""); - self.fireEvent(BI.RecordEditor.EVENT_CONFIRM, arguments); - }); - this.editor.on(BI.Editor.EVENT_START, function () { - self.fireEvent(BI.RecordEditor.EVENT_START, arguments); - }); - this.editor.on(BI.Editor.EVENT_PAUSE, function () { - self.fireEvent(BI.RecordEditor.EVENT_PAUSE, arguments); - }); - this.editor.on(BI.Editor.EVENT_STOP, function () { - self.fireEvent(BI.RecordEditor.EVENT_STOP, arguments); - }); - this.editor.on(BI.Editor.EVENT_ENTER, function () { - self.fireEvent(BI.RecordEditor.EVENT_ENTER, arguments); - }); - this.editor.on(BI.Editor.EVENT_BACKSPACE, function () { - self._checkInputState(); - }); - this.editor.on(BI.Editor.EVENT_REMOVE, function () { - if (!BI.isEmpty(self.contents)) { - self.contents.pop().destroy(); - self.setValue(self.getValue()); - self._adjustInputWidth(); - } - }); - this.editor.on(BI.Editor.EVENT_ERROR, function () { - self.fireEvent(BI.RecordEditor.EVENT_ERROR, arguments); - }); - this.editor.on(BI.Editor.EVENT_RESTRICT, function () { - self.fireEvent(BI.RecordEditor.EVENT_RESTRICT, arguments); - }); - this.editor.on(BI.Editor.EVENT_EMPTY, function () { - self.fireEvent(BI.RecordEditor.EVENT_EMPTY, arguments); - }); - BI.createWidget({ - type: "bi.inline", - element: this, - items: [this.textContainer, this.editor] - }); - BI.ResizeDetector.addResizeListener(this, BI.bind(this._adjustInputWidth, this)); - this._adjustInputWidth(); - }, - - _adjustInputWidth: function () { - BI.nextTick(BI.bind(function () { - this.editor.element.css("width", this.element.width() - this.textContainer.element.outerWidth() - 10); - }, this)); - }, - - _checkInputState: function () { - if (BI.isEmpty(this.contents)) { - this.editor.enableWarterMark(); - } else { - this.editor.disableWarterMark(); - } - }, - - focus: function () { - this.editor.focus(); - }, - - blur: function () { - this.editor.blur(); - }, - - isValid: function () { - return this.editor.isValid(); - }, - - setErrorText: function (text) { - this.editor.setErrorText(text); - }, - - getErrorText: function () { - return this.editor.getErrorText(); - }, - - isEditing: function () { - return this.editor.isEditing(); - }, - - getLastValidValue: function () { - return this.editor.getLastValidValue(); - }, - - setValue: function (k) { - this.editor.setValue(k); - }, - - getValue: function () { - return this.editor.getValue(); - }, - - getState: function () { - var values = BI.map(this.contents, function (i, lb) { - return lb.getText(); - }); - if (BI.isNotEmptyString(this.editor.getValue())) { - return values.concat([this.editor.getValue()]); - } - return values; - }, - - setState: function (v) { - BI.RecordEditor.superclass.setValue.apply(this, arguments); - v = BI.isArray(v) ? v : (v == "" ? [] : [v]); - var contents = this.contents = []; - BI.each(v, function (i, lb) { - contents.push(BI.createWidget({ - type: "bi.label", - height: 25, - cls: "record-editor-text", - text: lb - })) - }); - this.textContainer.empty(); - this.textContainer.populate(contents); - this.editor.isValid() && this.editor.setValue(""); - this._checkInputState(); - this._adjustInputWidth(); - }, - - destroy: function () { - BI.Resizers.remove(this.getName()); - BI.RecordEditor.superclass.destroy.apply(this, arguments); - } -}); -BI.RecordEditor.EVENT_CHANGE = "EVENT_CHANGE"; -BI.RecordEditor.EVENT_FOCUS = "EVENT_FOCUS"; -BI.RecordEditor.EVENT_BLUR = "EVENT_BLUR"; -BI.RecordEditor.EVENT_CLICK = "EVENT_CLICK"; -BI.RecordEditor.EVENT_KEY_DOWN = "EVENT_KEY_DOWN"; - -BI.RecordEditor.EVENT_START = "EVENT_START"; -BI.RecordEditor.EVENT_PAUSE = "EVENT_PAUSE"; -BI.RecordEditor.EVENT_STOP = "EVENT_STOP"; -BI.RecordEditor.EVENT_CONFIRM = "EVENT_CONFIRM"; -BI.RecordEditor.EVENT_VALID = "EVENT_VALID"; -BI.RecordEditor.EVENT_ERROR = "EVENT_ERROR"; -BI.RecordEditor.EVENT_ENTER = "EVENT_ENTER"; -BI.RecordEditor.EVENT_RESTRICT = "EVENT_RESTRICT"; -BI.RecordEditor.EVENT_SPACE = "EVENT_SPACE"; -BI.RecordEditor.EVENT_EMPTY = "EVENT_EMPTY"; - -BI.shortcut("bi.record_editor", BI.RecordEditor);/** * Created by roy on 15/9/14. */ BI.SearchEditor = BI.inherit(BI.Widget, { diff --git a/bi/core.css b/bi/core.css index c94ea5fe62..42772d827c 100644 --- a/bi/core.css +++ b/bi/core.css @@ -2958,6 +2958,16 @@ .bi-list-item.disabled:active { background-color: #ffffff; } +.bi-theme-dark .bi-list-item:hover, +.bi-theme-dark .bi-list-item.hover { + background-color: #04070d; + color: #ffffff; +} +.bi-theme-dark .bi-list-item.disabled, +.bi-theme-dark .bi-list-item.disabled:hover, +.bi-theme-dark .bi-list-item.disabled:active { + background-color: transparent; +} .bi-list-item-effect.active, .bi-list-item-effect:active { color: #009de3; @@ -2965,7 +2975,16 @@ .bi-list-item-effect.disabled, .bi-list-item-effect.disabled:hover, .bi-list-item-effect.disabled:active { - color: #1a1a1a; + color: #c4c6c6; +} +.bi-theme-dark .bi-list-item-effect.active, +.bi-theme-dark .bi-list-item-effect:active { + color: #009de3; +} +.bi-theme-dark .bi-list-item-effect.disabled, +.bi-theme-dark .bi-list-item-effect.disabled:hover, +.bi-theme-dark .bi-list-item-effect.disabled:active { + color: #c4c6c6; } .bi-list-item-hover:hover, .bi-list-item-hover.hover { @@ -2975,9 +2994,20 @@ .bi-list-item-hover.disabled, .bi-list-item-hover.disabled:hover, .bi-list-item-hover.disabled:active { - color: #1a1a1a; + color: #c4c6c6; background-color: #ffffff; } +.bi-theme-dark .bi-list-item-hover:hover, +.bi-theme-dark .bi-list-item-hover.hover { + color: #009de3; + background-color: #04070d; +} +.bi-theme-dark .bi-list-item-hover.disabled, +.bi-theme-dark .bi-list-item-hover.disabled:hover, +.bi-theme-dark .bi-list-item-hover.disabled:active { + color: #c4c6c6; + background-color: transparent; +} .bi-list-item-active:hover, .bi-list-item-active.hover { background-color: #f4f4f4; @@ -2992,6 +3022,21 @@ .bi-list-item-active.disabled:active { background-color: #ffffff; } +.bi-theme-dark .bi-list-item-active:hover, +.bi-theme-dark .bi-list-item-active.hover { + background-color: #04070d; + color: #ffffff; +} +.bi-theme-dark .bi-list-item-active.active, +.bi-theme-dark .bi-list-item-active:active { + color: #009de3; + background-color: #04070d; +} +.bi-theme-dark .bi-list-item-active.disabled, +.bi-theme-dark .bi-list-item-active.disabled:hover, +.bi-theme-dark .bi-list-item-active.disabled:active { + background-color: transparent; +} .bi-list-item-select:hover, .bi-list-item-select.hover { color: #009de3; @@ -3017,6 +3062,31 @@ .bi-list-item-select.disabled:active .bi-high-light { color: #c4c6c6 !important; } +.bi-theme-dark .list-item-select:hover, +.bi-theme-dark .list-item-select.hover { + color: #009de3; + background-color: #04070d; +} +.bi-theme-dark .list-item-select:active, +.bi-theme-dark .list-item-select.active { + color: #ffffff; + background-color: #009de3; +} +.bi-theme-dark .list-item-select:active .bi-high-light, +.bi-theme-dark .list-item-select.active .bi-high-light { + color: #ffffff; +} +.bi-theme-dark .list-item-select.disabled, +.bi-theme-dark .list-item-select.disabled:hover, +.bi-theme-dark .list-item-select.disabled:active { + color: #c4c6c6 !important; + background-color: transparent !important; +} +.bi-theme-dark .list-item-select.disabled .bi-high-light, +.bi-theme-dark .list-item-select.disabled:hover .bi-high-light, +.bi-theme-dark .list-item-select.disabled:active .bi-high-light { + color: #c4c6c6 !important; +} /*****************cursor*****************/ .cursor-pointer { cursor: pointer; @@ -3447,3 +3517,19 @@ vertical-align: middle; content: ' '; } +/****添加计算宽度的--运算符直接需要space****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ +.bi-theme-dark { + background-color: #191a2c; + color: #b2b2b2; +} +.bi-theme-dark .bi-input { + color: #ffffff; +} +/****添加计算宽度的--运算符直接需要space****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ +/****添加计算宽度的--运算符直接需要space****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ diff --git a/bi/core.js b/bi/core.js index a176df9ba3..d9b383c5d4 100644 --- a/bi/core.js +++ b/bi/core.js @@ -15830,7 +15830,8 @@ BI.LayerController = BI.inherit(BI.Controller, { return this.get(name); } var widget = BI.createWidget((op.render || {}), { - type: "bi.layout" + type: "bi.layout", + cls: op.cls }); var layout = BI.createWidget({ type: "bi.absolute", @@ -17046,6 +17047,14 @@ $(function () { return false; }, + //获取对比颜色 + getContrastColor: function (color) { + if (this.isDarkColor(color)) { + return "#ffffff"; + } + return "#1a1a1a"; + }, + rgb2hex: function (rgbColour) { if (!rgbColour || rgbColour.substr(0, 3) != "rgb") { return ""; diff --git a/bi/widget.css b/bi/widget.css index 8b7bfd0aa9..0d9edf19be 100644 --- a/bi/widget.css +++ b/bi/widget.css @@ -139,35 +139,12 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-down-list-combo .down-list-group.bi-combo-hover .bi-down-list-group-item, -.bi-down-list-combo .down-list-group.bi-combo-hover .bi-down-list-group-item .b-font:before { - background-color: #f4f4f4; -} -.bi-down-list-combo .down-list-group.bi-combo-hover .bi-down-list-group-item:disabled, -.bi-down-list-combo .down-list-group.bi-combo-hover .bi-down-list-group-item.disabled, -.bi-down-list-combo .down-list-group.bi-combo-hover .bi-down-list-group-item:disabled .b-font:before, -.bi-down-list-combo .down-list-group.bi-combo-hover .bi-down-list-group-item.disabled .b-font:before { - background-color: #ffffff; -} .bi-down-list-combo .bi-down-list-spliter { border-top: 1px solid #eaeaea; } /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-down-list-popup .bi-down-list-item:hover, -.bi-down-list-popup .bi-down-list-item.hover { - background-color: #f4f4f4; -} -.bi-down-list-popup .bi-down-list-item.disabled, -.bi-down-list-popup .bi-down-list-item.disabled:hover, -.bi-down-list-popup .bi-down-list-item.disabled:active { - background-color: #ffffff; -} -.bi-down-list-popup .bi-down-list-item:active { - color: #009de3; - background-color: #f4f4f4; -} .bi-down-list-popup .bi-down-list-item .list-item-text { max-width: 203px; } @@ -359,6 +336,9 @@ background-color: #ffffff; z-index: 1; } +.bi-theme-dark .bi-multi-select-check-selected-button { + background-color: #191a2c; +} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ diff --git a/bi/widget.js b/bi/widget.js index 41393c75ad..99ffd64b57 100644 --- a/bi/widget.js +++ b/bi/widget.js @@ -5670,7 +5670,7 @@ BI.shortcut("bi.down_list_group", BI.DownListGroup);BI.DownListItem = BI.inherit _defaultConfig: function () { var conf = BI.DownListItem.superclass._defaultConfig.apply(this, arguments); return BI.extend(conf, { - baseCls: "bi-down-list-item", + baseCls: "bi-down-list-item bi-list-item-active", cls: "", height: 25, logic: { diff --git a/demo.html b/demo.html index 53decbadcf..6908f599d5 100644 --- a/demo.html +++ b/demo.html @@ -22,7 +22,7 @@ -
+
\ No newline at end of file diff --git a/demo/js/north.js b/demo/js/north.js index b0c1f3e435..cffe037448 100644 --- a/demo/js/north.js +++ b/demo/js/north.js @@ -22,7 +22,21 @@ Demo.North = BI.inherit(BI.Widget, { } }, { el: { - type: "bi.layout" + type: "bi.right", + hgap: 10, + items: [{ + type: "bi.text_button", + text: "星空蓝", + handler: function () { + $("#wrapper").removeClass("bi-theme-default").addClass("bi-theme-dark"); + } + }, { + type: "bi.text_button", + text: "典雅白", + handler: function () { + $("#wrapper").removeClass("bi-theme-dark").addClass("bi-theme-default"); + } + }] } }] } diff --git a/dist/base.css b/dist/base.css index d9a49fee4a..7589322336 100644 --- a/dist/base.css +++ b/dist/base.css @@ -4,17 +4,6 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-combine-chart .bi-linkage-list { - background-color: #ffffff; - border: 1px solid #eaeaea; - z-index: 1000000000; -} -.bi-combine-chart .bi-linkage-list .bi-linkage-list-item:hover { - background-color: #f4f4f4; -} -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ .bi-color-chooser-popup .color-chooser-popup-title { background: #f4f4f4; border-bottom: 1px solid #d4dadd; @@ -949,13 +938,6 @@ li.CodeMirror-hint-active { /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-record-editor .record-editor-text { - font-size: 12px; - background: #f4f4f4; -} -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ .bi-shelter-editor .shelter-editor-text { font-size: 12px; } @@ -1021,9 +1003,6 @@ li.CodeMirror-hint-active { border: none; color: #e85050 !important; } -.bi-input.disabled { - background-color: white; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ @@ -1279,11 +1258,19 @@ li.CodeMirror-hint-active { .public-scrollbar-face:after { background-color: #c2c2c2; } +.bi-theme-dark .public-scrollbar-face:after { + background-color: #7d7d7d; +} .public-scrollbar-main:hover .public-scrollbar-face:after, .public-scrollbar-main-active .public-scrollbar-face:after, .public-scrollbar-faceActive:after { background-color: #7d7d7d; } +.bi-theme-dark .public-scrollbar-main:hover .public-scrollbar-face:after, +.bi-theme-dark .public-scrollbar-main-active .public-scrollbar-face:after, +.bi-theme-dark .public-scrollbar-faceActive:after { + background-color: #c2c2c2; +} .horizontal-scrollbar { bottom: 0; position: absolute; @@ -1437,3 +1424,7 @@ li.CodeMirror-hint-active { .bi-list-view .list-view-toolbar > .first-element { border-left: none; } +.bi-theme-dark .bi-list-view .list-view-outer { + color: #b2b2b2; + background: #191a2c; +} diff --git a/dist/case.js b/dist/case.js index ee23e1ba8b..7ce7b74c82 100644 --- a/dist/case.js +++ b/dist/case.js @@ -5225,232 +5225,6 @@ BI.ClearEditor.EVENT_RESTRICT = "EVENT_RESTRICT"; BI.ClearEditor.EVENT_REMOVE = "EVENT_REMOVE"; BI.ClearEditor.EVENT_EMPTY = "EVENT_EMPTY"; BI.shortcut("bi.clear_editor", BI.ClearEditor);/** - * guy - * 记录内容的输入框 - * @class BI.RecordEditor - * @extends BI.Single - */ -BI.RecordEditor = BI.inherit(BI.Single, { - _defaultConfig: function () { - var conf = BI.RecordEditor.superclass._defaultConfig.apply(this, arguments); - return BI.extend(conf, { - baseCls: (conf.baseCls || "") + " bi-record-editor", - hgap: 4, - vgap: 2, - lgap: 0, - rgap: 0, - tgap: 0, - bgap: 0, - validationChecker: BI.emptyFn, - quitChecker: BI.emptyFn, - allowBlank: true, - watermark: "", - errorText: "", - height: 30 - }) - }, - - _init: function () { - BI.RecordEditor.superclass._init.apply(this, arguments); - this.contents = []; - var self = this, o = this.options; - - this.editor = BI.createWidget({ - type: "bi.editor", - height: o.height, - hgap: o.hgap, - vgap: o.vgap, - lgap: o.lgap, - rgap: o.rgap, - tgap: o.tgap, - bgap: o.bgap, - value: o.value, - validationChecker: o.validationChecker, - quitChecker: o.quitChecker, - mouseOut: o.mouseOut, - allowBlank: o.allowBlank, - watermark: o.watermark, - errorText: o.errorText - }); - this.textContainer = BI.createWidget({ - type: "bi.vertical_adapt", - hgap: 2, - height: o.height - }); - this.editor.on(BI.Controller.EVENT_CHANGE, function () { - self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); - }); - this.editor.on(BI.Editor.EVENT_FOCUS, function () { - self._checkInputState(); - self.fireEvent(BI.RecordEditor.EVENT_FOCUS, arguments); - }); - this.editor.on(BI.Editor.EVENT_BLUR, function () { - self._checkInputState(); - self.fireEvent(BI.RecordEditor.EVENT_BLUR, arguments); - }); - this.editor.on(BI.Editor.EVENT_CLICK, function () { - self.fireEvent(BI.RecordEditor.EVENT_CLICK, arguments); - }); - this.editor.on(BI.Editor.EVENT_CHANGE, function () { - self.fireEvent(BI.RecordEditor.EVENT_CHANGE, arguments); - }); - this.editor.on(BI.Editor.EVENT_KEY_DOWN, function (v) { - self.fireEvent(BI.RecordEditor.EVENT_KEY_DOWN, arguments); - }); - - this.editor.on(BI.Editor.EVENT_VALID, function () { - self.fireEvent(BI.RecordEditor.EVENT_VALID, arguments); - }); - this.editor.on(BI.Editor.EVENT_SPACE, function () { - self.fireEvent(BI.RecordEditor.EVENT_SPACE, arguments); - }); - this.editor.on(BI.Editor.EVENT_CONFIRM, function () { - self.setState(self.getValue()); - self.editor.isValid() && self.editor.setValue(""); - self.fireEvent(BI.RecordEditor.EVENT_CONFIRM, arguments); - }); - this.editor.on(BI.Editor.EVENT_START, function () { - self.fireEvent(BI.RecordEditor.EVENT_START, arguments); - }); - this.editor.on(BI.Editor.EVENT_PAUSE, function () { - self.fireEvent(BI.RecordEditor.EVENT_PAUSE, arguments); - }); - this.editor.on(BI.Editor.EVENT_STOP, function () { - self.fireEvent(BI.RecordEditor.EVENT_STOP, arguments); - }); - this.editor.on(BI.Editor.EVENT_ENTER, function () { - self.fireEvent(BI.RecordEditor.EVENT_ENTER, arguments); - }); - this.editor.on(BI.Editor.EVENT_BACKSPACE, function () { - self._checkInputState(); - }); - this.editor.on(BI.Editor.EVENT_REMOVE, function () { - if (!BI.isEmpty(self.contents)) { - self.contents.pop().destroy(); - self.setValue(self.getValue()); - self._adjustInputWidth(); - } - }); - this.editor.on(BI.Editor.EVENT_ERROR, function () { - self.fireEvent(BI.RecordEditor.EVENT_ERROR, arguments); - }); - this.editor.on(BI.Editor.EVENT_RESTRICT, function () { - self.fireEvent(BI.RecordEditor.EVENT_RESTRICT, arguments); - }); - this.editor.on(BI.Editor.EVENT_EMPTY, function () { - self.fireEvent(BI.RecordEditor.EVENT_EMPTY, arguments); - }); - BI.createWidget({ - type: "bi.inline", - element: this, - items: [this.textContainer, this.editor] - }); - BI.ResizeDetector.addResizeListener(this, BI.bind(this._adjustInputWidth, this)); - this._adjustInputWidth(); - }, - - _adjustInputWidth: function () { - BI.nextTick(BI.bind(function () { - this.editor.element.css("width", this.element.width() - this.textContainer.element.outerWidth() - 10); - }, this)); - }, - - _checkInputState: function () { - if (BI.isEmpty(this.contents)) { - this.editor.enableWarterMark(); - } else { - this.editor.disableWarterMark(); - } - }, - - focus: function () { - this.editor.focus(); - }, - - blur: function () { - this.editor.blur(); - }, - - isValid: function () { - return this.editor.isValid(); - }, - - setErrorText: function (text) { - this.editor.setErrorText(text); - }, - - getErrorText: function () { - return this.editor.getErrorText(); - }, - - isEditing: function () { - return this.editor.isEditing(); - }, - - getLastValidValue: function () { - return this.editor.getLastValidValue(); - }, - - setValue: function (k) { - this.editor.setValue(k); - }, - - getValue: function () { - return this.editor.getValue(); - }, - - getState: function () { - var values = BI.map(this.contents, function (i, lb) { - return lb.getText(); - }); - if (BI.isNotEmptyString(this.editor.getValue())) { - return values.concat([this.editor.getValue()]); - } - return values; - }, - - setState: function (v) { - BI.RecordEditor.superclass.setValue.apply(this, arguments); - v = BI.isArray(v) ? v : (v == "" ? [] : [v]); - var contents = this.contents = []; - BI.each(v, function (i, lb) { - contents.push(BI.createWidget({ - type: "bi.label", - height: 25, - cls: "record-editor-text", - text: lb - })) - }); - this.textContainer.empty(); - this.textContainer.populate(contents); - this.editor.isValid() && this.editor.setValue(""); - this._checkInputState(); - this._adjustInputWidth(); - }, - - destroy: function () { - BI.Resizers.remove(this.getName()); - BI.RecordEditor.superclass.destroy.apply(this, arguments); - } -}); -BI.RecordEditor.EVENT_CHANGE = "EVENT_CHANGE"; -BI.RecordEditor.EVENT_FOCUS = "EVENT_FOCUS"; -BI.RecordEditor.EVENT_BLUR = "EVENT_BLUR"; -BI.RecordEditor.EVENT_CLICK = "EVENT_CLICK"; -BI.RecordEditor.EVENT_KEY_DOWN = "EVENT_KEY_DOWN"; - -BI.RecordEditor.EVENT_START = "EVENT_START"; -BI.RecordEditor.EVENT_PAUSE = "EVENT_PAUSE"; -BI.RecordEditor.EVENT_STOP = "EVENT_STOP"; -BI.RecordEditor.EVENT_CONFIRM = "EVENT_CONFIRM"; -BI.RecordEditor.EVENT_VALID = "EVENT_VALID"; -BI.RecordEditor.EVENT_ERROR = "EVENT_ERROR"; -BI.RecordEditor.EVENT_ENTER = "EVENT_ENTER"; -BI.RecordEditor.EVENT_RESTRICT = "EVENT_RESTRICT"; -BI.RecordEditor.EVENT_SPACE = "EVENT_SPACE"; -BI.RecordEditor.EVENT_EMPTY = "EVENT_EMPTY"; - -BI.shortcut("bi.record_editor", BI.RecordEditor);/** * Created by roy on 15/9/14. */ BI.SearchEditor = BI.inherit(BI.Widget, { diff --git a/dist/core.css b/dist/core.css index c94ea5fe62..42772d827c 100644 --- a/dist/core.css +++ b/dist/core.css @@ -2958,6 +2958,16 @@ .bi-list-item.disabled:active { background-color: #ffffff; } +.bi-theme-dark .bi-list-item:hover, +.bi-theme-dark .bi-list-item.hover { + background-color: #04070d; + color: #ffffff; +} +.bi-theme-dark .bi-list-item.disabled, +.bi-theme-dark .bi-list-item.disabled:hover, +.bi-theme-dark .bi-list-item.disabled:active { + background-color: transparent; +} .bi-list-item-effect.active, .bi-list-item-effect:active { color: #009de3; @@ -2965,7 +2975,16 @@ .bi-list-item-effect.disabled, .bi-list-item-effect.disabled:hover, .bi-list-item-effect.disabled:active { - color: #1a1a1a; + color: #c4c6c6; +} +.bi-theme-dark .bi-list-item-effect.active, +.bi-theme-dark .bi-list-item-effect:active { + color: #009de3; +} +.bi-theme-dark .bi-list-item-effect.disabled, +.bi-theme-dark .bi-list-item-effect.disabled:hover, +.bi-theme-dark .bi-list-item-effect.disabled:active { + color: #c4c6c6; } .bi-list-item-hover:hover, .bi-list-item-hover.hover { @@ -2975,9 +2994,20 @@ .bi-list-item-hover.disabled, .bi-list-item-hover.disabled:hover, .bi-list-item-hover.disabled:active { - color: #1a1a1a; + color: #c4c6c6; background-color: #ffffff; } +.bi-theme-dark .bi-list-item-hover:hover, +.bi-theme-dark .bi-list-item-hover.hover { + color: #009de3; + background-color: #04070d; +} +.bi-theme-dark .bi-list-item-hover.disabled, +.bi-theme-dark .bi-list-item-hover.disabled:hover, +.bi-theme-dark .bi-list-item-hover.disabled:active { + color: #c4c6c6; + background-color: transparent; +} .bi-list-item-active:hover, .bi-list-item-active.hover { background-color: #f4f4f4; @@ -2992,6 +3022,21 @@ .bi-list-item-active.disabled:active { background-color: #ffffff; } +.bi-theme-dark .bi-list-item-active:hover, +.bi-theme-dark .bi-list-item-active.hover { + background-color: #04070d; + color: #ffffff; +} +.bi-theme-dark .bi-list-item-active.active, +.bi-theme-dark .bi-list-item-active:active { + color: #009de3; + background-color: #04070d; +} +.bi-theme-dark .bi-list-item-active.disabled, +.bi-theme-dark .bi-list-item-active.disabled:hover, +.bi-theme-dark .bi-list-item-active.disabled:active { + background-color: transparent; +} .bi-list-item-select:hover, .bi-list-item-select.hover { color: #009de3; @@ -3017,6 +3062,31 @@ .bi-list-item-select.disabled:active .bi-high-light { color: #c4c6c6 !important; } +.bi-theme-dark .list-item-select:hover, +.bi-theme-dark .list-item-select.hover { + color: #009de3; + background-color: #04070d; +} +.bi-theme-dark .list-item-select:active, +.bi-theme-dark .list-item-select.active { + color: #ffffff; + background-color: #009de3; +} +.bi-theme-dark .list-item-select:active .bi-high-light, +.bi-theme-dark .list-item-select.active .bi-high-light { + color: #ffffff; +} +.bi-theme-dark .list-item-select.disabled, +.bi-theme-dark .list-item-select.disabled:hover, +.bi-theme-dark .list-item-select.disabled:active { + color: #c4c6c6 !important; + background-color: transparent !important; +} +.bi-theme-dark .list-item-select.disabled .bi-high-light, +.bi-theme-dark .list-item-select.disabled:hover .bi-high-light, +.bi-theme-dark .list-item-select.disabled:active .bi-high-light { + color: #c4c6c6 !important; +} /*****************cursor*****************/ .cursor-pointer { cursor: pointer; @@ -3447,3 +3517,19 @@ vertical-align: middle; content: ' '; } +/****添加计算宽度的--运算符直接需要space****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ +.bi-theme-dark { + background-color: #191a2c; + color: #b2b2b2; +} +.bi-theme-dark .bi-input { + color: #ffffff; +} +/****添加计算宽度的--运算符直接需要space****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ +/****添加计算宽度的--运算符直接需要space****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ diff --git a/dist/core.js b/dist/core.js index 5c1b203864..1e2ea58675 100644 --- a/dist/core.js +++ b/dist/core.js @@ -21029,7 +21029,8 @@ BI.LayerController = BI.inherit(BI.Controller, { return this.get(name); } var widget = BI.createWidget((op.render || {}), { - type: "bi.layout" + type: "bi.layout", + cls: op.cls }); var layout = BI.createWidget({ type: "bi.absolute", @@ -22670,6 +22671,14 @@ $(function () { return false; }, + //获取对比颜色 + getContrastColor: function (color) { + if (this.isDarkColor(color)) { + return "#ffffff"; + } + return "#1a1a1a"; + }, + rgb2hex: function (rgbColour) { if (!rgbColour || rgbColour.substr(0, 3) != "rgb") { return ""; diff --git a/dist/resource.css b/dist/resource.css index 9545b02e11..958773be0a 100644 --- a/dist/resource.css +++ b/dist/resource.css @@ -106,6 +106,20 @@ textarea::-webkit-scrollbar-thumb { border-radius: 0; background-color: #e2e2e2; } +.bi-theme-dark div::-webkit-scrollbar, +.bi-theme-dark textarea::-webkit-scrollbar { + -webkit-appearance: none; + background-color: #191a2c; + width: 6px; + height: 6px; +} +.bi-theme-dark div::-webkit-scrollbar-thumb, +.bi-theme-dark textarea::-webkit-scrollbar-thumb { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + background-color: #7d7d7d; +} .base-line-conn-background { background: url('icon/tree-vertical-line-1.png') repeat-y 0 0; _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/tree-vertical-line-1.png'); @@ -633,12 +647,12 @@ textarea::-webkit-scrollbar-thumb { /**** custom color(自定义颜色,用于特定场景) ****/ .close-font .b-font:before { content: "\e600"; - color: #808080; + color: inherit; } .close-font.native .b-font:before, .close-font.disabled .b-font:before { content: "\e600"; - color: #808080; + color: inherit; } .close-red-font .b-font:before { content: "\e600"; @@ -651,28 +665,28 @@ textarea::-webkit-scrollbar-thumb { } .close-h-font .b-font:before { content: "\e600"; - color: #808080; + color: inherit; } .close-h-font:hover .b-font:before, .close-h-font:focus .b-font:before, .close-h-font.hover .b-font:before { content: "\e600"; - color: #808080; + color: inherit; } .close-h-font.native .b-font:before, .close-h-font.disabled .b-font:before { content: "\e600"; - color: #808080; + color: inherit; } .close-e-font .b-font:before { content: "\e600"; - color: #808080; + color: inherit; } .close-e-font:hover .b-font:before, .close-e-font:focus .b-font:before, .close-e-font.hover .b-font:before { content: "\e600"; - color: #808080; + color: inherit; } .close-e-font.active .b-font:before { content: "\e600"; @@ -685,17 +699,17 @@ textarea::-webkit-scrollbar-thumb { .close-e-font.native .b-font:before, .close-e-font.disabled .b-font:before { content: "\e600"; - color: #808080; + color: inherit; } .close-ha-font .b-font:before { content: "\e600"; - color: #808080; + color: inherit; } .close-ha-font:hover .b-font:before, .close-ha-font:focus .b-font:before, .close-ha-font.hover .b-font:before { content: "\e600"; - color: #808080; + color: inherit; } .close-ha-font:active .b-font:before, .close-ha-font.active .b-font:before { @@ -705,11 +719,11 @@ textarea::-webkit-scrollbar-thumb { .close-ha-font.native .b-font:before, .close-ha-font.disabled .b-font:before { content: "\e600"; - color: #808080; + color: inherit; } .search-close-h-font .b-font:before { content: "\e600"; - color: #808080; + color: inherit; } .search-close-h-font:hover .b-font:before, .search-close-h-font:focus .b-font:before, @@ -720,41 +734,41 @@ textarea::-webkit-scrollbar-thumb { .search-close-h-font.native .b-font:before, .search-close-h-font.disabled .b-font:before { content: "\e600"; - color: #808080; + color: inherit; } .trigger-font .b-font:before { content: "\e603"; - color: #808080; + color: inherit; } .trigger-font.native .b-font:before, .trigger-font.disabled .b-font:before { content: "\e603"; - color: #808080; + color: inherit; } .trigger-h-font .b-font:before { content: "\e603"; - color: #808080; + color: inherit; } .trigger-h-font:hover .b-font:before, .trigger-h-font:focus .b-font:before, .trigger-h-font.hover .b-font:before { content: "\e603"; - color: #808080; + color: inherit; } .trigger-h-font.native .b-font:before, .trigger-h-font.disabled .b-font:before { content: "\e603"; - color: #808080; + color: inherit; } .trigger-ha-font .b-font:before { content: "\e603"; - color: #808080; + color: inherit; } .trigger-ha-font:hover .b-font:before, .trigger-ha-font:focus .b-font:before, .trigger-ha-font.hover .b-font:before { content: "\e603"; - color: #808080; + color: inherit; } .trigger-ha-font:active .b-font:before, .trigger-ha-font.active .b-font:before { @@ -764,41 +778,41 @@ textarea::-webkit-scrollbar-thumb { .trigger-ha-font.native .b-font:before, .trigger-ha-font.disabled .b-font:before { content: "\e603"; - color: #808080; + color: inherit; } .pre-page-font .b-font:before { content: "\e601"; - color: #808080; + color: inherit; } .pre-page-font.native .b-font:before, .pre-page-font.disabled .b-font:before { content: "\e601"; - color: #808080; + color: inherit; } .pre-page-h-font .b-font:before { content: "\e601"; - color: #808080; + color: inherit; } .pre-page-h-font:hover .b-font:before, .pre-page-h-font:focus .b-font:before, .pre-page-h-font.hover .b-font:before { content: "\e601"; - color: #808080; + color: inherit; } .pre-page-h-font.native .b-font:before, .pre-page-h-font.disabled .b-font:before { content: "\e601"; - color: #808080; + color: inherit; } .pre-page-ha-font .b-font:before { content: "\e601"; - color: #808080; + color: inherit; } .pre-page-ha-font:hover .b-font:before, .pre-page-ha-font:focus .b-font:before, .pre-page-ha-font.hover .b-font:before { content: "\e601"; - color: #808080; + color: inherit; } .pre-page-ha-font:active .b-font:before, .pre-page-ha-font.active .b-font:before { @@ -808,41 +822,41 @@ textarea::-webkit-scrollbar-thumb { .pre-page-ha-font.native .b-font:before, .pre-page-ha-font.disabled .b-font:before { content: "\e601"; - color: #808080; + color: inherit; } .next-page-font .b-font:before { content: "\e602"; - color: #808080; + color: inherit; } .next-page-font.native .b-font:before, .next-page-font.disabled .b-font:before { content: "\e602"; - color: #808080; + color: inherit; } .next-page-h-font .b-font:before { content: "\e602"; - color: #808080; + color: inherit; } .next-page-h-font:hover .b-font:before, .next-page-h-font:focus .b-font:before, .next-page-h-font.hover .b-font:before { content: "\e602"; - color: #808080; + color: inherit; } .next-page-h-font.native .b-font:before, .next-page-h-font.disabled .b-font:before { content: "\e602"; - color: #808080; + color: inherit; } .next-page-ha-font .b-font:before { content: "\e602"; - color: #808080; + color: inherit; } .next-page-ha-font:hover .b-font:before, .next-page-ha-font:focus .b-font:before, .next-page-ha-font.hover .b-font:before { content: "\e602"; - color: #808080; + color: inherit; } .next-page-ha-font:active .b-font:before, .next-page-ha-font.active .b-font:before { @@ -852,41 +866,41 @@ textarea::-webkit-scrollbar-thumb { .next-page-ha-font.native .b-font:before, .next-page-ha-font.disabled .b-font:before { content: "\e602"; - color: #808080; + color: inherit; } .search-font .b-font:before { content: "\e604"; - color: #808080; + color: inherit; } .search-font.native .b-font:before, .search-font.disabled .b-font:before { content: "\e604"; - color: #808080; + color: inherit; } .search-h-font .b-font:before { content: "\e604"; - color: #808080; + color: inherit; } .search-h-font:hover .b-font:before, .search-h-font:focus .b-font:before, .search-h-font.hover .b-font:before { content: "\e604"; - color: #808080; + color: inherit; } .search-h-font.native .b-font:before, .search-h-font.disabled .b-font:before { content: "\e604"; - color: #808080; + color: inherit; } .search-ha-font .b-font:before { content: "\e604"; - color: #808080; + color: inherit; } .search-ha-font:hover .b-font:before, .search-ha-font:focus .b-font:before, .search-ha-font.hover .b-font:before { content: "\e604"; - color: #808080; + color: inherit; } .search-ha-font:active .b-font:before, .search-ha-font.active .b-font:before { @@ -896,41 +910,41 @@ textarea::-webkit-scrollbar-thumb { .search-ha-font.native .b-font:before, .search-ha-font.disabled .b-font:before { content: "\e604"; - color: #808080; + color: inherit; } .share-font .b-font:before { content: "\e65a"; - color: #808080; + color: inherit; } .share-font.native .b-font:before, .share-font.disabled .b-font:before { content: "\e65a"; - color: #808080; + color: inherit; } .share-h-font .b-font:before { content: "\e65a"; - color: #808080; + color: inherit; } .share-h-font:hover .b-font:before, .share-h-font:focus .b-font:before, .share-h-font.hover .b-font:before { content: "\e65a"; - color: #808080; + color: inherit; } .share-h-font.native .b-font:before, .share-h-font.disabled .b-font:before { content: "\e65a"; - color: #808080; + color: inherit; } .share-ha-font .b-font:before { content: "\e65a"; - color: #808080; + color: inherit; } .share-ha-font:hover .b-font:before, .share-ha-font:focus .b-font:before, .share-ha-font.hover .b-font:before { content: "\e65a"; - color: #808080; + color: inherit; } .share-ha-font:active .b-font:before, .share-ha-font.active .b-font:before { @@ -940,7 +954,7 @@ textarea::-webkit-scrollbar-thumb { .share-ha-font.native .b-font:before, .share-ha-font.disabled .b-font:before { content: "\e65a"; - color: #808080; + color: inherit; } /**维度/指标 下拉列表图标字体 ~begin~**/ .delete-font .b-font:before { @@ -1481,21 +1495,21 @@ textarea::-webkit-scrollbar-thumb { } .hyper-link-font .b-font:before { content: "\e688"; - color: #808080; + color: inherit; } .hyper-link-font.native .b-font:before, .hyper-link-font.disabled .b-font:before { content: "\e688"; - color: #808080; + color: inherit; } .filter-font .b-font:before { content: "\e60f"; - color: #808080; + color: inherit; } .filter-font.native .b-font:before, .filter-font.disabled .b-font:before { content: "\e60f"; - color: #808080; + color: inherit; } .filter-h-font .b-font:before { content: "\e60f"; @@ -1668,21 +1682,21 @@ textarea::-webkit-scrollbar-thumb { /** dashboard组件/控件 下拉列表图标字体 ~end~**/ .tree-node-triangle-expand-font .b-font:before { content: "\e608"; - color: #808080; + color: inherit; } .tree-node-triangle-expand-font.native .b-font:before, .tree-node-triangle-expand-font.disabled .b-font:before { content: "\e608"; - color: #808080; + color: inherit; } .tree-node-triangle-collapse-font .b-font:before { content: "\e607"; - color: #808080; + color: inherit; } .tree-node-triangle-collapse-font.native .b-font:before, .tree-node-triangle-collapse-font.disabled .b-font:before { content: "\e607"; - color: #808080; + color: inherit; } .row-pre-page-h-font .b-font:before { content: "\e6be"; @@ -1766,82 +1780,82 @@ textarea::-webkit-scrollbar-thumb { } .widget-date-next-h-font .b-font:before { content: "\e62f"; - color: #808080; + color: inherit; } .widget-date-next-h-font:hover .b-font:before, .widget-date-next-h-font:focus .b-font:before, .widget-date-next-h-font.hover .b-font:before { content: "\e62f"; - color: #808080; + color: inherit; } .widget-date-next-h-font.native .b-font:before, .widget-date-next-h-font.disabled .b-font:before { content: "\e62f"; - color: #808080; + color: inherit; } .widget-date-pre-h-font .b-font:before { content: "\e62e"; - color: #808080; + color: inherit; } .widget-date-pre-h-font:hover .b-font:before, .widget-date-pre-h-font:focus .b-font:before, .widget-date-pre-h-font.hover .b-font:before { content: "\e62e"; - color: #808080; + color: inherit; } .widget-date-pre-h-font.native .b-font:before, .widget-date-pre-h-font.disabled .b-font:before { content: "\e62e"; - color: #808080; + color: inherit; } .widget-date-h-change-font .b-font:before { content: "\e660"; - color: #808080; + color: inherit; } .widget-date-h-change-font:hover .b-font:before, .widget-date-h-change-font:focus .b-font:before, .widget-date-h-change-font.hover .b-font:before { content: "\e660"; - color: #808080; + color: inherit; } .widget-date-h-change-font.native .b-font:before, .widget-date-h-change-font.disabled .b-font:before { content: "\e660"; - color: #808080; + color: inherit; } .pull-down-font .b-font:before { content: "\e608"; - color: #808080; + color: inherit; } .pull-down-font.native .b-font:before, .pull-down-font.disabled .b-font:before { content: "\e608"; - color: #808080; + color: inherit; } .pull-down-h-font .b-font:before { content: "\e608"; - color: #808080; + color: inherit; } .pull-down-h-font:hover .b-font:before, .pull-down-h-font:focus .b-font:before, .pull-down-h-font.hover .b-font:before { content: "\e608"; - color: #808080; + color: inherit; } .pull-down-h-font.native .b-font:before, .pull-down-h-font.disabled .b-font:before { content: "\e608"; - color: #808080; + color: inherit; } .pull-down-ha-font .b-font:before { content: "\e608"; - color: #808080; + color: inherit; } .pull-down-ha-font:hover .b-font:before, .pull-down-ha-font:focus .b-font:before, .pull-down-ha-font.hover .b-font:before { content: "\e608"; - color: #808080; + color: inherit; } .pull-down-ha-font:active .b-font:before, .pull-down-ha-font.active .b-font:before { @@ -1851,41 +1865,41 @@ textarea::-webkit-scrollbar-thumb { .pull-down-ha-font.native .b-font:before, .pull-down-ha-font.disabled .b-font:before { content: "\e608"; - color: #808080; + color: inherit; } .delete-field-font .b-font:before { content: "\e605"; - color: #808080; + color: inherit; } .delete-field-font.native .b-font:before, .delete-field-font.disabled .b-font:before { content: "\e605"; - color: #808080; + color: inherit; } .delete-field-h-font .b-font:before { content: "\e605"; - color: #808080; + color: inherit; } .delete-field-h-font:hover .b-font:before, .delete-field-h-font:focus .b-font:before, .delete-field-h-font.hover .b-font:before { content: "\e605"; - color: #808080; + color: inherit; } .delete-field-h-font.native .b-font:before, .delete-field-h-font.disabled .b-font:before { content: "\e605"; - color: #808080; + color: inherit; } .delete-field-ha-font .b-font:before { content: "\e605"; - color: #808080; + color: inherit; } .delete-field-ha-font:hover .b-font:before, .delete-field-ha-font:focus .b-font:before, .delete-field-ha-font.hover .b-font:before { content: "\e605"; - color: #808080; + color: inherit; } .delete-field-ha-font:active .b-font:before, .delete-field-ha-font.active .b-font:before { @@ -1895,92 +1909,92 @@ textarea::-webkit-scrollbar-thumb { .delete-field-ha-font.native .b-font:before, .delete-field-ha-font.disabled .b-font:before { content: "\e605"; - color: #808080; + color: inherit; } .toolbar-save-font .b-font:before { content: "\e617"; - color: #808080; + color: inherit; } .toolbar-save-font:hover .b-font:before, .toolbar-save-font:focus .b-font:before, .toolbar-save-font.hover .b-font:before { content: "\e617"; - color: #808080; + color: inherit; } .toolbar-save-font.native .b-font:before, .toolbar-save-font.disabled .b-font:before { content: "\e617"; - color: #808080; + color: inherit; } .toolbar-undo-font .b-font:before { content: "\e619"; - color: #808080; + color: inherit; } .toolbar-undo-font:hover .b-font:before, .toolbar-undo-font:focus .b-font:before, .toolbar-undo-font.hover .b-font:before { content: "\e619"; - color: #808080; + color: inherit; } .toolbar-undo-font.native .b-font:before, .toolbar-undo-font.disabled .b-font:before { content: "\e619"; - color: #808080; + color: inherit; } .toolbar-redo-font .b-font:before { content: "\e625"; - color: #808080; + color: inherit; } .toolbar-redo-font:hover .b-font:before, .toolbar-redo-font:focus .b-font:before, .toolbar-redo-font.hover .b-font:before { content: "\e625"; - color: #808080; + color: inherit; } .toolbar-redo-font.native .b-font:before, .toolbar-redo-font.disabled .b-font:before { content: "\e625"; - color: #808080; + color: inherit; } .toolbar-edit-font .b-font:before { content: "\e631"; - color: #808080; + color: inherit; } .toolbar-edit-font:hover .b-font:before, .toolbar-edit-font:focus .b-font:before, .toolbar-edit-font.hover .b-font:before { content: "\e631"; - color: #808080; + color: inherit; } .toolbar-edit-font.native .b-font:before, .toolbar-edit-font.disabled .b-font:before { content: "\e631"; - color: #808080; + color: inherit; } .toolbar-preview-font .b-font:before { content: "\e65f"; - color: #808080; + color: inherit; } .toolbar-preview-font:hover .b-font:before, .toolbar-preview-font:focus .b-font:before, .toolbar-preview-font.hover .b-font:before { content: "\e65f"; - color: #808080; + color: inherit; } .toolbar-preview-font.native .b-font:before, .toolbar-preview-font.disabled .b-font:before { content: "\e65f"; - color: #808080; + color: inherit; } .chart-table-font .b-font:before { content: "\e60e"; - color: #808080; + color: inherit; } .chart-table-font:hover .b-font:before, .chart-table-font:focus .b-font:before, .chart-table-font.hover .b-font:before { content: "\e60e"; - color: #808080; + color: inherit; } .chart-table-font:active .b-font:before, .chart-table-font.active .b-font:before { @@ -1990,17 +2004,17 @@ textarea::-webkit-scrollbar-thumb { .chart-table-font.native .b-font:before, .chart-table-font.disabled .b-font:before { content: "\e60e"; - color: #808080; + color: inherit; } .chart-axis-font .b-font:before { content: "\e626"; - color: #808080; + color: inherit; } .chart-axis-font:hover .b-font:before, .chart-axis-font:focus .b-font:before, .chart-axis-font.hover .b-font:before { content: "\e626"; - color: #808080; + color: inherit; } .chart-axis-font:active .b-font:before, .chart-axis-font.active .b-font:before { @@ -2010,17 +2024,17 @@ textarea::-webkit-scrollbar-thumb { .chart-axis-font.native .b-font:before, .chart-axis-font.disabled .b-font:before { content: "\e626"; - color: #808080; + color: inherit; } .chart-bar-font .b-font:before { content: "\e620"; - color: #808080; + color: inherit; } .chart-bar-font:hover .b-font:before, .chart-bar-font:focus .b-font:before, .chart-bar-font.hover .b-font:before { content: "\e620"; - color: #808080; + color: inherit; } .chart-bar-font:active .b-font:before, .chart-bar-font.active .b-font:before { @@ -2030,17 +2044,17 @@ textarea::-webkit-scrollbar-thumb { .chart-bar-font.native .b-font:before, .chart-bar-font.disabled .b-font:before { content: "\e620"; - color: #808080; + color: inherit; } .chart-accumulate-bar-font .b-font:before { content: "\e60a"; - color: #808080; + color: inherit; } .chart-accumulate-bar-font:hover .b-font:before, .chart-accumulate-bar-font:focus .b-font:before, .chart-accumulate-bar-font.hover .b-font:before { content: "\e60a"; - color: #808080; + color: inherit; } .chart-accumulate-bar-font:active .b-font:before, .chart-accumulate-bar-font.active .b-font:before { @@ -2050,17 +2064,17 @@ textarea::-webkit-scrollbar-thumb { .chart-accumulate-bar-font.native .b-font:before, .chart-accumulate-bar-font.disabled .b-font:before { content: "\e60a"; - color: #808080; + color: inherit; } .chart-pie-font .b-font:before { content: "\e618"; - color: #808080; + color: inherit; } .chart-pie-font:hover .b-font:before, .chart-pie-font:focus .b-font:before, .chart-pie-font.hover .b-font:before { content: "\e618"; - color: #808080; + color: inherit; } .chart-pie-font:active .b-font:before, .chart-pie-font.active .b-font:before { @@ -2070,17 +2084,17 @@ textarea::-webkit-scrollbar-thumb { .chart-pie-font.native .b-font:before, .chart-pie-font.disabled .b-font:before { content: "\e618"; - color: #808080; + color: inherit; } .chart-map-font .b-font:before { content: "\e62c"; - color: #808080; + color: inherit; } .chart-map-font:hover .b-font:before, .chart-map-font:focus .b-font:before, .chart-map-font.hover .b-font:before { content: "\e62c"; - color: #808080; + color: inherit; } .chart-map-font:active .b-font:before, .chart-map-font.active .b-font:before { @@ -2090,17 +2104,17 @@ textarea::-webkit-scrollbar-thumb { .chart-map-font.native .b-font:before, .chart-map-font.disabled .b-font:before { content: "\e62c"; - color: #808080; + color: inherit; } .chart-dashboard-font .b-font:before { content: "\e623"; - color: #808080; + color: inherit; } .chart-dashboard-font:hover .b-font:before, .chart-dashboard-font:focus .b-font:before, .chart-dashboard-font.hover .b-font:before { content: "\e623"; - color: #808080; + color: inherit; } .chart-dashboard-font:active .b-font:before, .chart-dashboard-font.active .b-font:before { @@ -2110,17 +2124,17 @@ textarea::-webkit-scrollbar-thumb { .chart-dashboard-font.native .b-font:before, .chart-dashboard-font.disabled .b-font:before { content: "\e623"; - color: #808080; + color: inherit; } .chart-doughnut-font .b-font:before { content: "\e624"; - color: #808080; + color: inherit; } .chart-doughnut-font:hover .b-font:before, .chart-doughnut-font:focus .b-font:before, .chart-doughnut-font.hover .b-font:before { content: "\e624"; - color: #808080; + color: inherit; } .chart-doughnut-font:active .b-font:before, .chart-doughnut-font.active .b-font:before { @@ -2130,17 +2144,17 @@ textarea::-webkit-scrollbar-thumb { .chart-doughnut-font.native .b-font:before, .chart-doughnut-font.disabled .b-font:before { content: "\e624"; - color: #808080; + color: inherit; } .chart-detail-font .b-font:before { content: "\e615"; - color: #808080; + color: inherit; } .chart-detail-font:hover .b-font:before, .chart-detail-font:focus .b-font:before, .chart-detail-font.hover .b-font:before { content: "\e615"; - color: #808080; + color: inherit; } .chart-detail-font:active .b-font:before, .chart-detail-font.active .b-font:before { @@ -2150,17 +2164,17 @@ textarea::-webkit-scrollbar-thumb { .chart-detail-font.native .b-font:before, .chart-detail-font.disabled .b-font:before { content: "\e615"; - color: #808080; + color: inherit; } .chart-more-font .b-font:before { content: "\e60d"; - color: #808080; + color: inherit; } .chart-more-font:hover .b-font:before, .chart-more-font:focus .b-font:before, .chart-more-font.hover .b-font:before { content: "\e60d"; - color: #808080; + color: inherit; } .chart-more-font:active .b-font:before, .chart-more-font.active .b-font:before { @@ -2170,17 +2184,17 @@ textarea::-webkit-scrollbar-thumb { .chart-more-font.native .b-font:before, .chart-more-font.disabled .b-font:before { content: "\e60d"; - color: #808080; + color: inherit; } .chart-bubble-font .b-font:before { content: "\e62a"; - color: #808080; + color: inherit; } .chart-bubble-font:hover .b-font:before, .chart-bubble-font:focus .b-font:before, .chart-bubble-font.hover .b-font:before { content: "\e62a"; - color: #808080; + color: inherit; } .chart-bubble-font:active .b-font:before, .chart-bubble-font.active .b-font:before { @@ -2190,17 +2204,17 @@ textarea::-webkit-scrollbar-thumb { .chart-bubble-font.native .b-font:before, .chart-bubble-font.disabled .b-font:before { content: "\e62a"; - color: #808080; + color: inherit; } .chart-scatter-font .b-font:before { content: "\e61d"; - color: #808080; + color: inherit; } .chart-scatter-font:hover .b-font:before, .chart-scatter-font:focus .b-font:before, .chart-scatter-font.hover .b-font:before { content: "\e61d"; - color: #808080; + color: inherit; } .chart-scatter-font:active .b-font:before, .chart-scatter-font.active .b-font:before { @@ -2210,17 +2224,17 @@ textarea::-webkit-scrollbar-thumb { .chart-scatter-font.native .b-font:before, .chart-scatter-font.disabled .b-font:before { content: "\e61d"; - color: #808080; + color: inherit; } .chart-radar-font .b-font:before { content: "\e614"; - color: #808080; + color: inherit; } .chart-radar-font:hover .b-font:before, .chart-radar-font:focus .b-font:before, .chart-radar-font.hover .b-font:before { content: "\e614"; - color: #808080; + color: inherit; } .chart-radar-font:active .b-font:before, .chart-radar-font.active .b-font:before { @@ -2230,17 +2244,17 @@ textarea::-webkit-scrollbar-thumb { .chart-radar-font.native .b-font:before, .chart-radar-font.disabled .b-font:before { content: "\e614"; - color: #808080; + color: inherit; } .chart-content-font .b-font:before { content: "\e621"; - color: #808080; + color: inherit; } .chart-content-font:hover .b-font:before, .chart-content-font:focus .b-font:before, .chart-content-font.hover .b-font:before { content: "\e621"; - color: #808080; + color: inherit; } .chart-content-font:active .b-font:before, .chart-content-font.active .b-font:before { @@ -2250,17 +2264,17 @@ textarea::-webkit-scrollbar-thumb { .chart-content-font.native .b-font:before, .chart-content-font.disabled .b-font:before { content: "\e621"; - color: #808080; + color: inherit; } .chart-image-font .b-font:before { content: "\e68d"; - color: #808080; + color: inherit; } .chart-image-font:hover .b-font:before, .chart-image-font:focus .b-font:before, .chart-image-font.hover .b-font:before { content: "\e68d"; - color: #808080; + color: inherit; } .chart-image-font:active .b-font:before, .chart-image-font.active .b-font:before { @@ -2270,17 +2284,17 @@ textarea::-webkit-scrollbar-thumb { .chart-image-font.native .b-font:before, .chart-image-font.disabled .b-font:before { content: "\e68d"; - color: #808080; + color: inherit; } .chart-web-font .b-font:before { content: "\e68c"; - color: #808080; + color: inherit; } .chart-web-font:hover .b-font:before, .chart-web-font:focus .b-font:before, .chart-web-font.hover .b-font:before { content: "\e68c"; - color: #808080; + color: inherit; } .chart-web-font:active .b-font:before, .chart-web-font.active .b-font:before { @@ -2290,17 +2304,17 @@ textarea::-webkit-scrollbar-thumb { .chart-web-font.native .b-font:before, .chart-web-font.disabled .b-font:before { content: "\e68c"; - color: #808080; + color: inherit; } .chart-string-font .b-font:before { content: "\e622"; - color: #808080; + color: inherit; } .chart-string-font:hover .b-font:before, .chart-string-font:focus .b-font:before, .chart-string-font.hover .b-font:before { content: "\e622"; - color: #808080; + color: inherit; } .chart-string-font:active .b-font:before, .chart-string-font.active .b-font:before { @@ -2310,17 +2324,17 @@ textarea::-webkit-scrollbar-thumb { .chart-string-font.native .b-font:before, .chart-string-font.disabled .b-font:before { content: "\e622"; - color: #808080; + color: inherit; } .chart-number-font .b-font:before { content: "\e61f"; - color: #808080; + color: inherit; } .chart-number-font:hover .b-font:before, .chart-number-font:focus .b-font:before, .chart-number-font.hover .b-font:before { content: "\e61f"; - color: #808080; + color: inherit; } .chart-number-font:active .b-font:before, .chart-number-font.active .b-font:before { @@ -2330,17 +2344,17 @@ textarea::-webkit-scrollbar-thumb { .chart-number-font.native .b-font:before, .chart-number-font.disabled .b-font:before { content: "\e61f"; - color: #808080; + color: inherit; } .chart-tree-font .b-font:before { content: "\e61e"; - color: #808080; + color: inherit; } .chart-tree-font:hover .b-font:before, .chart-tree-font:focus .b-font:before, .chart-tree-font.hover .b-font:before { content: "\e61e"; - color: #808080; + color: inherit; } .chart-tree-font:active .b-font:before, .chart-tree-font.active .b-font:before { @@ -2350,17 +2364,17 @@ textarea::-webkit-scrollbar-thumb { .chart-tree-font.native .b-font:before, .chart-tree-font.disabled .b-font:before { content: "\e61e"; - color: #808080; + color: inherit; } .chart-date-font .b-font:before { content: "\e61b"; - color: #808080; + color: inherit; } .chart-date-font:hover .b-font:before, .chart-date-font:focus .b-font:before, .chart-date-font.hover .b-font:before { content: "\e61b"; - color: #808080; + color: inherit; } .chart-date-font:active .b-font:before, .chart-date-font.active .b-font:before { @@ -2370,17 +2384,17 @@ textarea::-webkit-scrollbar-thumb { .chart-date-font.native .b-font:before, .chart-date-font.disabled .b-font:before { content: "\e61b"; - color: #808080; + color: inherit; } .chart-year-font .b-font:before { content: "\e628"; - color: #808080; + color: inherit; } .chart-year-font:hover .b-font:before, .chart-year-font:focus .b-font:before, .chart-year-font.hover .b-font:before { content: "\e628"; - color: #808080; + color: inherit; } .chart-year-font:active .b-font:before, .chart-year-font.active .b-font:before { @@ -2390,17 +2404,17 @@ textarea::-webkit-scrollbar-thumb { .chart-year-font.native .b-font:before, .chart-year-font.disabled .b-font:before { content: "\e628"; - color: #808080; + color: inherit; } .chart-month-font .b-font:before { content: "\e627"; - color: #808080; + color: inherit; } .chart-month-font:hover .b-font:before, .chart-month-font:focus .b-font:before, .chart-month-font.hover .b-font:before { content: "\e627"; - color: #808080; + color: inherit; } .chart-month-font:active .b-font:before, .chart-month-font.active .b-font:before { @@ -2410,17 +2424,17 @@ textarea::-webkit-scrollbar-thumb { .chart-month-font.native .b-font:before, .chart-month-font.disabled .b-font:before { content: "\e627"; - color: #808080; + color: inherit; } .chart-quarter-font .b-font:before { content: "\e629"; - color: #808080; + color: inherit; } .chart-quarter-font:hover .b-font:before, .chart-quarter-font:focus .b-font:before, .chart-quarter-font.hover .b-font:before { content: "\e629"; - color: #808080; + color: inherit; } .chart-quarter-font:active .b-font:before, .chart-quarter-font.active .b-font:before { @@ -2430,17 +2444,17 @@ textarea::-webkit-scrollbar-thumb { .chart-quarter-font.native .b-font:before, .chart-quarter-font.disabled .b-font:before { content: "\e629"; - color: #808080; + color: inherit; } .chart-ymd-font .b-font:before { content: "\e61c"; - color: #808080; + color: inherit; } .chart-ymd-font:hover .b-font:before, .chart-ymd-font:focus .b-font:before, .chart-ymd-font.hover .b-font:before { content: "\e61c"; - color: #808080; + color: inherit; } .chart-ymd-font:active .b-font:before, .chart-ymd-font.active .b-font:before { @@ -2450,17 +2464,17 @@ textarea::-webkit-scrollbar-thumb { .chart-ymd-font.native .b-font:before, .chart-ymd-font.disabled .b-font:before { content: "\e61c"; - color: #808080; + color: inherit; } .chart-date-range-font .b-font:before { content: "\e616"; - color: #808080; + color: inherit; } .chart-date-range-font:hover .b-font:before, .chart-date-range-font:focus .b-font:before, .chart-date-range-font.hover .b-font:before { content: "\e616"; - color: #808080; + color: inherit; } .chart-date-range-font:active .b-font:before, .chart-date-range-font.active .b-font:before { @@ -2470,17 +2484,17 @@ textarea::-webkit-scrollbar-thumb { .chart-date-range-font.native .b-font:before, .chart-date-range-font.disabled .b-font:before { content: "\e616"; - color: #808080; + color: inherit; } .chart-general-query-font .b-font:before { content: "\e62b"; - color: #808080; + color: inherit; } .chart-general-query-font:hover .b-font:before, .chart-general-query-font:focus .b-font:before, .chart-general-query-font.hover .b-font:before { content: "\e62b"; - color: #808080; + color: inherit; } .chart-general-query-font:active .b-font:before, .chart-general-query-font.active .b-font:before { @@ -2490,17 +2504,17 @@ textarea::-webkit-scrollbar-thumb { .chart-general-query-font.native .b-font:before, .chart-general-query-font.disabled .b-font:before { content: "\e62b"; - color: #808080; + color: inherit; } .chart-query-font .b-font:before { content: "\e609"; - color: #808080; + color: inherit; } .chart-query-font:hover .b-font:before, .chart-query-font:focus .b-font:before, .chart-query-font.hover .b-font:before { content: "\e609"; - color: #808080; + color: inherit; } .chart-query-font:active .b-font:before, .chart-query-font.active .b-font:before { @@ -2510,17 +2524,17 @@ textarea::-webkit-scrollbar-thumb { .chart-query-font.native .b-font:before, .chart-query-font.disabled .b-font:before { content: "\e609"; - color: #808080; + color: inherit; } .chart-reset-font .b-font:before { content: "\e61a"; - color: #808080; + color: inherit; } .chart-reset-font:hover .b-font:before, .chart-reset-font:focus .b-font:before, .chart-reset-font.hover .b-font:before { content: "\e61a"; - color: #808080; + color: inherit; } .chart-reset-font:active .b-font:before, .chart-reset-font.active .b-font:before { @@ -2530,17 +2544,17 @@ textarea::-webkit-scrollbar-thumb { .chart-reset-font.native .b-font:before, .chart-reset-font.disabled .b-font:before { content: "\e61a"; - color: #808080; + color: inherit; } .chart-textarea-font .b-font:before { content: "\e622"; - color: #808080; + color: inherit; } .chart-textarea-font:hover .b-font:before, .chart-textarea-font:focus .b-font:before, .chart-textarea-font.hover .b-font:before { content: "\e622"; - color: #808080; + color: inherit; } .chart-textarea-font:active .b-font:before, .chart-textarea-font.active .b-font:before { @@ -2550,17 +2564,17 @@ textarea::-webkit-scrollbar-thumb { .chart-textarea-font.native .b-font:before, .chart-textarea-font.disabled .b-font:before { content: "\e622"; - color: #808080; + color: inherit; } .chart-reuse-font .b-font:before { content: "\e60b"; - color: #808080; + color: inherit; } .chart-reuse-font:hover .b-font:before, .chart-reuse-font:focus .b-font:before, .chart-reuse-font.hover .b-font:before { content: "\e60b"; - color: #808080; + color: inherit; } .chart-reuse-font:active .b-font:before, .chart-reuse-font.active .b-font:before { @@ -2570,26 +2584,26 @@ textarea::-webkit-scrollbar-thumb { .chart-reuse-font.native .b-font:before, .chart-reuse-font.disabled .b-font:before { content: "\e60b"; - color: #808080; + color: inherit; } .chart-date-normal-font .b-font:before { content: "\e61b"; - color: #808080; + color: inherit; } .chart-date-normal-font.native .b-font:before, .chart-date-normal-font.disabled .b-font:before { content: "\e61b"; - color: #808080; + color: inherit; } .less-font .b-font:before { content: "\e633"; - color: #808080; + color: inherit; } .less-font:hover .b-font:before, .less-font:focus .b-font:before, .less-font.hover .b-font:before { content: "\e633"; - color: #808080; + color: inherit; } .less-font:active .b-font:before, .less-font.active .b-font:before { @@ -2599,17 +2613,17 @@ textarea::-webkit-scrollbar-thumb { .less-font.native .b-font:before, .less-font.disabled .b-font:before { content: "\e633"; - color: #808080; + color: inherit; } .less-equal-font .b-font:before { content: "\e636"; - color: #808080; + color: inherit; } .less-equal-font:hover .b-font:before, .less-equal-font:focus .b-font:before, .less-equal-font.hover .b-font:before { content: "\e636"; - color: #808080; + color: inherit; } .less-equal-font:active .b-font:before, .less-equal-font.active .b-font:before { @@ -2619,7 +2633,7 @@ textarea::-webkit-scrollbar-thumb { .less-equal-font.native .b-font:before, .less-equal-font.disabled .b-font:before { content: "\e636"; - color: #808080; + color: inherit; } .check-font .b-font:before { content: "\e611"; @@ -2721,30 +2735,30 @@ textarea::-webkit-scrollbar-thumb { } .select-data-field-string-group-font .b-font:before { content: "\e642"; - color: #808080; + color: inherit; } .select-data-field-string-group-font.native .b-font:before, .select-data-field-string-group-font.disabled .b-font:before { content: "\e642"; - color: #808080; + color: inherit; } .select-data-field-number-group-font .b-font:before { content: "\e641"; - color: #808080; + color: inherit; } .select-data-field-number-group-font.native .b-font:before, .select-data-field-number-group-font.disabled .b-font:before { content: "\e641"; - color: #808080; + color: inherit; } .select-data-field-date-group-font .b-font:before { content: "\e640"; - color: #808080; + color: inherit; } .select-data-field-date-group-font.native .b-font:before, .select-data-field-date-group-font.disabled .b-font:before { content: "\e640"; - color: #808080; + color: inherit; } .select-data-preview-font .b-font:before { content: "\e65f"; @@ -2768,18 +2782,18 @@ textarea::-webkit-scrollbar-thumb { } .detail-dimension-set-font .b-font:before { content: "\e678"; - color: #808080; + color: inherit; } .detail-dimension-set-font:hover .b-font:before, .detail-dimension-set-font:focus .b-font:before, .detail-dimension-set-font.hover .b-font:before { content: "\e678"; - color: #808080; + color: inherit; } .detail-dimension-set-font.native .b-font:before, .detail-dimension-set-font.disabled .b-font:before { content: "\e678"; - color: #808080; + color: inherit; } .detail-real-data-warning-font .b-font:before { content: "\e64e"; @@ -2858,18 +2872,18 @@ textarea::-webkit-scrollbar-thumb { } .dashboard-widget-combo-detail-set-font .b-font:before { content: "\e634"; - color: #808080; + color: inherit; } .dashboard-widget-combo-detail-set-font:hover .b-font:before, .dashboard-widget-combo-detail-set-font:focus .b-font:before, .dashboard-widget-combo-detail-set-font.hover .b-font:before { content: "\e634"; - color: #808080; + color: inherit; } .dashboard-widget-combo-detail-set-font.native .b-font:before, .dashboard-widget-combo-detail-set-font.disabled .b-font:before { content: "\e634"; - color: #808080; + color: inherit; } .group-add-font .b-font:before { content: "\e649"; @@ -2882,12 +2896,12 @@ textarea::-webkit-scrollbar-thumb { } .sortable-font .b-font:before { content: "\e63b"; - color: #808080; + color: inherit; } .sortable-font.native .b-font:before, .sortable-font.disabled .b-font:before { content: "\e63b"; - color: #808080; + color: inherit; } .text-bold-font .b-font:before { content: "\e64d"; @@ -3008,30 +3022,30 @@ textarea::-webkit-scrollbar-thumb { } .move-font .b-font:before { content: "\e65e"; - color: #808080; + color: inherit; } .move-font.native .b-font:before, .move-font.disabled .b-font:before { content: "\e65e"; - color: #808080; + color: inherit; } .share-font .b-font:before { content: "\e65a"; - color: #808080; + color: inherit; } .share-font.native .b-font:before, .share-font.disabled .b-font:before { content: "\e65a"; - color: #808080; + color: inherit; } .new-file-font .b-font:before { content: "\e65d"; - color: #808080; + color: inherit; } .new-file-font.native .b-font:before, .new-file-font.disabled .b-font:before { content: "\e65d"; - color: #808080; + color: inherit; } .file-font .b-font:before { content: "\e65b"; @@ -3053,13 +3067,13 @@ textarea::-webkit-scrollbar-thumb { } .letter-font .b-font:before { content: "\e659"; - color: #808080; + color: inherit; } .letter-font:hover .b-font:before, .letter-font:focus .b-font:before, .letter-font.hover .b-font:before { content: "\e659"; - color: #808080; + color: inherit; } .letter-font:active .b-font:before, .letter-font.active .b-font:before { @@ -3069,17 +3083,17 @@ textarea::-webkit-scrollbar-thumb { .letter-font.native .b-font:before, .letter-font.disabled .b-font:before { content: "\e659"; - color: #808080; + color: inherit; } .time-font .b-font:before { content: "\e658"; - color: #808080; + color: inherit; } .time-font:hover .b-font:before, .time-font:focus .b-font:before, .time-font.hover .b-font:before { content: "\e658"; - color: #808080; + color: inherit; } .time-font:active .b-font:before, .time-font.active .b-font:before { @@ -3089,16 +3103,16 @@ textarea::-webkit-scrollbar-thumb { .time-font.native .b-font:before, .time-font.disabled .b-font:before { content: "\e658"; - color: #808080; + color: inherit; } .rename-font .b-font:before { content: "\e687"; - color: #808080; + color: inherit; } .rename-font.native .b-font:before, .rename-font.disabled .b-font:before { content: "\e687"; - color: #808080; + color: inherit; } .delete-template-font .b-font:before { content: "\e605"; @@ -3200,12 +3214,12 @@ textarea::-webkit-scrollbar-thumb { } .refresh-table-font .b-font:before { content: "\e683"; - color: #808080; + color: inherit; } .refresh-table-font.native .b-font:before, .refresh-table-font.disabled .b-font:before { content: "\e683"; - color: #808080; + color: inherit; } .recover-chart-font-hightlight .b-font:before { content: "\e6b4"; @@ -3218,13 +3232,13 @@ textarea::-webkit-scrollbar-thumb { } .tables-tile-view-font .b-font:before { content: "\e685"; - color: #808080; + color: inherit; } .tables-tile-view-font:hover .b-font:before, .tables-tile-view-font:focus .b-font:before, .tables-tile-view-font.hover .b-font:before { content: "\e685"; - color: #808080; + color: inherit; } .tables-tile-view-font:active .b-font:before, .tables-tile-view-font.active .b-font:before { @@ -3234,17 +3248,17 @@ textarea::-webkit-scrollbar-thumb { .tables-tile-view-font.native .b-font:before, .tables-tile-view-font.disabled .b-font:before { content: "\e685"; - color: #808080; + color: inherit; } .tables-relation-view-font .b-font:before { content: "\e684"; - color: #808080; + color: inherit; } .tables-relation-view-font:hover .b-font:before, .tables-relation-view-font:focus .b-font:before, .tables-relation-view-font.hover .b-font:before { content: "\e684"; - color: #808080; + color: inherit; } .tables-relation-view-font:active .b-font:before, .tables-relation-view-font.active .b-font:before { @@ -3254,7 +3268,7 @@ textarea::-webkit-scrollbar-thumb { .tables-relation-view-font.native .b-font:before, .tables-relation-view-font.disabled .b-font:before { content: "\e684"; - color: #808080; + color: inherit; } .add-new-table-pull-down-font .b-font:before { content: "\e62d"; @@ -3287,18 +3301,18 @@ textarea::-webkit-scrollbar-thumb { } .edit-set-font .b-font:before { content: "\e634"; - color: #808080; + color: inherit; } .edit-set-font:hover .b-font:before, .edit-set-font:focus .b-font:before, .edit-set-font.hover .b-font:before { content: "\e634"; - color: #808080; + color: inherit; } .edit-set-font.native .b-font:before, .edit-set-font.disabled .b-font:before { content: "\e634"; - color: #808080; + color: inherit; } .new-analysis-font .b-font:before { content: "\e692"; @@ -3332,13 +3346,13 @@ textarea::-webkit-scrollbar-thumb { } .folder-list-view .b-font:before { content: "\e694"; - color: #808080; + color: inherit; } .folder-list-view:hover .b-font:before, .folder-list-view:focus .b-font:before, .folder-list-view.hover .b-font:before { content: "\e694"; - color: #808080; + color: inherit; } .folder-list-view:active .b-font:before, .folder-list-view.active .b-font:before { @@ -3348,17 +3362,17 @@ textarea::-webkit-scrollbar-thumb { .folder-list-view.native .b-font:before, .folder-list-view.disabled .b-font:before { content: "\e694"; - color: #808080; + color: inherit; } .folder-card-view .b-font:before { content: "\e685"; - color: #808080; + color: inherit; } .folder-card-view:hover .b-font:before, .folder-card-view:focus .b-font:before, .folder-card-view.hover .b-font:before { content: "\e685"; - color: #808080; + color: inherit; } .folder-card-view:active .b-font:before, .folder-card-view.active .b-font:before { @@ -3368,7 +3382,7 @@ textarea::-webkit-scrollbar-thumb { .folder-card-view.native .b-font:before, .folder-card-view.disabled .b-font:before { content: "\e685"; - color: #808080; + color: inherit; } .item-check-font .b-font:before { content: "\e611"; @@ -3497,28 +3511,28 @@ textarea::-webkit-scrollbar-thumb { } .primary-key-font .b-font:before { content: "\e67d;"; - color: #808080; + color: inherit; } .primary-key-font:hover .b-font:before, .primary-key-font:focus .b-font:before, .primary-key-font.hover .b-font:before { content: "\e67d;"; - color: #808080; + color: inherit; } .primary-key-font.native .b-font:before, .primary-key-font.disabled .b-font:before { content: "\e67d;"; - color: #808080; + color: inherit; } .table-open-row-style-font .b-font:before { content: "\e671"; - color: #808080; + color: inherit; } .table-open-row-style-font:hover .b-font:before, .table-open-row-style-font:focus .b-font:before, .table-open-row-style-font.hover .b-font:before { content: "\e671"; - color: #808080; + color: inherit; } .table-open-row-style-font:active .b-font:before, .table-open-row-style-font.active .b-font:before { @@ -3528,17 +3542,17 @@ textarea::-webkit-scrollbar-thumb { .table-open-row-style-font.native .b-font:before, .table-open-row-style-font.disabled .b-font:before { content: "\e671"; - color: #808080; + color: inherit; } .table-open-col-style-font .b-font:before { content: "\e672"; - color: #808080; + color: inherit; } .table-open-col-style-font:hover .b-font:before, .table-open-col-style-font:focus .b-font:before, .table-open-col-style-font.hover .b-font:before { content: "\e672"; - color: #808080; + color: inherit; } .table-open-col-style-font:active .b-font:before, .table-open-col-style-font.active .b-font:before { @@ -3548,7 +3562,7 @@ textarea::-webkit-scrollbar-thumb { .table-open-col-style-font.native .b-font:before, .table-open-col-style-font.disabled .b-font:before { content: "\e672"; - color: #808080; + color: inherit; } .calculate-function-font .b-font:before { content: "\e6a3"; @@ -3795,124 +3809,124 @@ textarea::-webkit-scrollbar-thumb { } .widget-combo-expand-font .b-font:before { content: "\e697"; - color: #808080; + color: inherit; } .widget-combo-expand-font.native .b-font:before, .widget-combo-expand-font.disabled .b-font:before { content: "\e697"; - color: #808080; + color: inherit; } .widget-combo-linkage-font .b-font:before { content: "\e63c"; - color: #808080; + color: inherit; } .widget-combo-linkage-font.native .b-font:before, .widget-combo-linkage-font.disabled .b-font:before { content: "\e63c"; - color: #808080; + color: inherit; } .widget-combo-rename-edit-font .b-font:before { content: "\e670"; - color: #808080; + color: inherit; } .widget-combo-rename-edit-font.native .b-font:before, .widget-combo-rename-edit-font.disabled .b-font:before { content: "\e670"; - color: #808080; + color: inherit; } .widget-combo-show-title-font .b-font:before { content: "\e64c"; - color: #808080; + color: inherit; } .widget-combo-show-title-font.native .b-font:before, .widget-combo-show-title-font.disabled .b-font:before { content: "\e64c"; - color: #808080; + color: inherit; } .widget-combo-title-left-font .b-font:before { content: "\e654"; - color: #808080; + color: inherit; } .widget-combo-title-left-font.native .b-font:before, .widget-combo-title-left-font.disabled .b-font:before { content: "\e654"; - color: #808080; + color: inherit; } .widget-combo-title-center-font .b-font:before { content: "\e64f"; - color: #808080; + color: inherit; } .widget-combo-title-center-font.native .b-font:before, .widget-combo-title-center-font.disabled .b-font:before { content: "\e64f"; - color: #808080; + color: inherit; } .widget-combo-show-filter-font .b-font:before { content: "\e60f"; - color: #808080; + color: inherit; } .widget-combo-show-filter-font.native .b-font:before, .widget-combo-show-filter-font.disabled .b-font:before { content: "\e60f"; - color: #808080; + color: inherit; } .widget-combo-export-excel-font .b-font:before { content: "\e635"; - color: #808080; + color: inherit; } .widget-combo-export-excel-font.native .b-font:before, .widget-combo-export-excel-font.disabled .b-font:before { content: "\e635"; - color: #808080; + color: inherit; } .widget-combo-copy .b-font:before { content: "\e610"; - color: #808080; + color: inherit; } .widget-combo-copy.native .b-font:before, .widget-combo-copy.disabled .b-font:before { content: "\e610"; - color: #808080; + color: inherit; } .widget-combo-delete .b-font:before { content: "\e605"; - color: #808080; + color: inherit; } .widget-combo-delete.native .b-font:before, .widget-combo-delete.disabled .b-font:before { content: "\e605"; - color: #808080; + color: inherit; } .widget-combo-asc-font .b-font:before { content: "\e63f"; - color: #808080; + color: inherit; } .widget-combo-asc-font.native .b-font:before, .widget-combo-asc-font.disabled .b-font:before { content: "\e63f"; - color: #808080; + color: inherit; } .widget-combo-des-font .b-font:before { content: "\e63a"; - color: #808080; + color: inherit; } .widget-combo-des-font.native .b-font:before, .widget-combo-des-font.disabled .b-font:before { content: "\e63a"; - color: #808080; + color: inherit; } .widget-combo-clear-font .b-font:before { content: "\e63d"; - color: #808080; + color: inherit; } .widget-combo-clear-font.native .b-font:before, .widget-combo-clear-font.disabled .b-font:before { content: "\e63d"; - color: #808080; + color: inherit; } .detail-table-popup-font .b-font:before { content: "\e6ac"; - color: #808080; + color: inherit; } .detail-table-popup-font:hover .b-font:before, .detail-table-popup-font:focus .b-font:before, @@ -3923,7 +3937,7 @@ textarea::-webkit-scrollbar-thumb { .detail-table-popup-font.native .b-font:before, .detail-table-popup-font.disabled .b-font:before { content: "\e6ac"; - color: #808080; + color: inherit; } .chart-drill-up .b-font:before { content: "\e6ad"; @@ -3945,21 +3959,21 @@ textarea::-webkit-scrollbar-thumb { } .report-filter-open-font .b-font:before { content: "\e648"; - color: #808080; + color: inherit; } .report-filter-open-font.native .b-font:before, .report-filter-open-font.disabled .b-font:before { content: "\e648"; - color: #808080; + color: inherit; } .report-filter-close-font .b-font:before { content: "\e645"; - color: #808080; + color: inherit; } .report-filter-close-font.native .b-font:before, .report-filter-close-font.disabled .b-font:before { content: "\e645"; - color: #808080; + color: inherit; } .report-apply-hangout-normal-font .b-font:before { content: "\e66d"; @@ -4080,21 +4094,21 @@ textarea::-webkit-scrollbar-thumb { } .drill-push-up-font .b-font:before { content: "\e630"; - color: #808080; + color: inherit; } .drill-push-up-font.native .b-font:before, .drill-push-up-font.disabled .b-font:before { content: "\e630"; - color: #808080; + color: inherit; } .drill-push-down-font .b-font:before { content: "\e62d"; - color: #808080; + color: inherit; } .drill-push-down-font.native .b-font:before, .drill-push-down-font.disabled .b-font:before { content: "\e62d"; - color: #808080; + color: inherit; } .drag-tag-font .b-font:before { content: "\e600"; diff --git a/dist/widget.css b/dist/widget.css index 8b7bfd0aa9..0d9edf19be 100644 --- a/dist/widget.css +++ b/dist/widget.css @@ -139,35 +139,12 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-down-list-combo .down-list-group.bi-combo-hover .bi-down-list-group-item, -.bi-down-list-combo .down-list-group.bi-combo-hover .bi-down-list-group-item .b-font:before { - background-color: #f4f4f4; -} -.bi-down-list-combo .down-list-group.bi-combo-hover .bi-down-list-group-item:disabled, -.bi-down-list-combo .down-list-group.bi-combo-hover .bi-down-list-group-item.disabled, -.bi-down-list-combo .down-list-group.bi-combo-hover .bi-down-list-group-item:disabled .b-font:before, -.bi-down-list-combo .down-list-group.bi-combo-hover .bi-down-list-group-item.disabled .b-font:before { - background-color: #ffffff; -} .bi-down-list-combo .bi-down-list-spliter { border-top: 1px solid #eaeaea; } /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-down-list-popup .bi-down-list-item:hover, -.bi-down-list-popup .bi-down-list-item.hover { - background-color: #f4f4f4; -} -.bi-down-list-popup .bi-down-list-item.disabled, -.bi-down-list-popup .bi-down-list-item.disabled:hover, -.bi-down-list-popup .bi-down-list-item.disabled:active { - background-color: #ffffff; -} -.bi-down-list-popup .bi-down-list-item:active { - color: #009de3; - background-color: #f4f4f4; -} .bi-down-list-popup .bi-down-list-item .list-item-text { max-width: 203px; } @@ -359,6 +336,9 @@ background-color: #ffffff; z-index: 1; } +.bi-theme-dark .bi-multi-select-check-selected-button { + background-color: #191a2c; +} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ diff --git a/dist/widget.js b/dist/widget.js index 41393c75ad..99ffd64b57 100644 --- a/dist/widget.js +++ b/dist/widget.js @@ -5670,7 +5670,7 @@ BI.shortcut("bi.down_list_group", BI.DownListGroup);BI.DownListItem = BI.inherit _defaultConfig: function () { var conf = BI.DownListItem.superclass._defaultConfig.apply(this, arguments); return BI.extend(conf, { - baseCls: "bi-down-list-item", + baseCls: "bi-down-list-item bi-list-item-active", cls: "", height: 25, logic: { diff --git a/docs/index.html b/docs/index.html index 816c4e7676..ce62e2948f 100644 --- a/docs/index.html +++ b/docs/index.html @@ -12,14 +12,16 @@ href="../dist/widget.css"/> + + -
Demo
-
+
\ No newline at end of file diff --git a/src/case/editor/editor.record.js b/src/case/editor/editor.record.js deleted file mode 100644 index 995aa3f788..0000000000 --- a/src/case/editor/editor.record.js +++ /dev/null @@ -1,227 +0,0 @@ -/** - * guy - * 记录内容的输入框 - * @class BI.RecordEditor - * @extends BI.Single - */ -BI.RecordEditor = BI.inherit(BI.Single, { - _defaultConfig: function () { - var conf = BI.RecordEditor.superclass._defaultConfig.apply(this, arguments); - return BI.extend(conf, { - baseCls: (conf.baseCls || "") + " bi-record-editor", - hgap: 4, - vgap: 2, - lgap: 0, - rgap: 0, - tgap: 0, - bgap: 0, - validationChecker: BI.emptyFn, - quitChecker: BI.emptyFn, - allowBlank: true, - watermark: "", - errorText: "", - height: 30 - }) - }, - - _init: function () { - BI.RecordEditor.superclass._init.apply(this, arguments); - this.contents = []; - var self = this, o = this.options; - - this.editor = BI.createWidget({ - type: "bi.editor", - height: o.height, - hgap: o.hgap, - vgap: o.vgap, - lgap: o.lgap, - rgap: o.rgap, - tgap: o.tgap, - bgap: o.bgap, - value: o.value, - validationChecker: o.validationChecker, - quitChecker: o.quitChecker, - mouseOut: o.mouseOut, - allowBlank: o.allowBlank, - watermark: o.watermark, - errorText: o.errorText - }); - this.textContainer = BI.createWidget({ - type: "bi.vertical_adapt", - hgap: 2, - height: o.height - }); - this.editor.on(BI.Controller.EVENT_CHANGE, function () { - self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); - }); - this.editor.on(BI.Editor.EVENT_FOCUS, function () { - self._checkInputState(); - self.fireEvent(BI.RecordEditor.EVENT_FOCUS, arguments); - }); - this.editor.on(BI.Editor.EVENT_BLUR, function () { - self._checkInputState(); - self.fireEvent(BI.RecordEditor.EVENT_BLUR, arguments); - }); - this.editor.on(BI.Editor.EVENT_CLICK, function () { - self.fireEvent(BI.RecordEditor.EVENT_CLICK, arguments); - }); - this.editor.on(BI.Editor.EVENT_CHANGE, function () { - self.fireEvent(BI.RecordEditor.EVENT_CHANGE, arguments); - }); - this.editor.on(BI.Editor.EVENT_KEY_DOWN, function (v) { - self.fireEvent(BI.RecordEditor.EVENT_KEY_DOWN, arguments); - }); - - this.editor.on(BI.Editor.EVENT_VALID, function () { - self.fireEvent(BI.RecordEditor.EVENT_VALID, arguments); - }); - this.editor.on(BI.Editor.EVENT_SPACE, function () { - self.fireEvent(BI.RecordEditor.EVENT_SPACE, arguments); - }); - this.editor.on(BI.Editor.EVENT_CONFIRM, function () { - self.setState(self.getValue()); - self.editor.isValid() && self.editor.setValue(""); - self.fireEvent(BI.RecordEditor.EVENT_CONFIRM, arguments); - }); - this.editor.on(BI.Editor.EVENT_START, function () { - self.fireEvent(BI.RecordEditor.EVENT_START, arguments); - }); - this.editor.on(BI.Editor.EVENT_PAUSE, function () { - self.fireEvent(BI.RecordEditor.EVENT_PAUSE, arguments); - }); - this.editor.on(BI.Editor.EVENT_STOP, function () { - self.fireEvent(BI.RecordEditor.EVENT_STOP, arguments); - }); - this.editor.on(BI.Editor.EVENT_ENTER, function () { - self.fireEvent(BI.RecordEditor.EVENT_ENTER, arguments); - }); - this.editor.on(BI.Editor.EVENT_BACKSPACE, function () { - self._checkInputState(); - }); - this.editor.on(BI.Editor.EVENT_REMOVE, function () { - if (!BI.isEmpty(self.contents)) { - self.contents.pop().destroy(); - self.setValue(self.getValue()); - self._adjustInputWidth(); - } - }); - this.editor.on(BI.Editor.EVENT_ERROR, function () { - self.fireEvent(BI.RecordEditor.EVENT_ERROR, arguments); - }); - this.editor.on(BI.Editor.EVENT_RESTRICT, function () { - self.fireEvent(BI.RecordEditor.EVENT_RESTRICT, arguments); - }); - this.editor.on(BI.Editor.EVENT_EMPTY, function () { - self.fireEvent(BI.RecordEditor.EVENT_EMPTY, arguments); - }); - BI.createWidget({ - type: "bi.inline", - element: this, - items: [this.textContainer, this.editor] - }); - BI.ResizeDetector.addResizeListener(this, BI.bind(this._adjustInputWidth, this)); - this._adjustInputWidth(); - }, - - _adjustInputWidth: function () { - BI.nextTick(BI.bind(function () { - this.editor.element.css("width", this.element.width() - this.textContainer.element.outerWidth() - 10); - }, this)); - }, - - _checkInputState: function () { - if (BI.isEmpty(this.contents)) { - this.editor.enableWarterMark(); - } else { - this.editor.disableWarterMark(); - } - }, - - focus: function () { - this.editor.focus(); - }, - - blur: function () { - this.editor.blur(); - }, - - isValid: function () { - return this.editor.isValid(); - }, - - setErrorText: function (text) { - this.editor.setErrorText(text); - }, - - getErrorText: function () { - return this.editor.getErrorText(); - }, - - isEditing: function () { - return this.editor.isEditing(); - }, - - getLastValidValue: function () { - return this.editor.getLastValidValue(); - }, - - setValue: function (k) { - this.editor.setValue(k); - }, - - getValue: function () { - return this.editor.getValue(); - }, - - getState: function () { - var values = BI.map(this.contents, function (i, lb) { - return lb.getText(); - }); - if (BI.isNotEmptyString(this.editor.getValue())) { - return values.concat([this.editor.getValue()]); - } - return values; - }, - - setState: function (v) { - BI.RecordEditor.superclass.setValue.apply(this, arguments); - v = BI.isArray(v) ? v : (v == "" ? [] : [v]); - var contents = this.contents = []; - BI.each(v, function (i, lb) { - contents.push(BI.createWidget({ - type: "bi.label", - height: 25, - cls: "record-editor-text", - text: lb - })) - }); - this.textContainer.empty(); - this.textContainer.populate(contents); - this.editor.isValid() && this.editor.setValue(""); - this._checkInputState(); - this._adjustInputWidth(); - }, - - destroy: function () { - BI.Resizers.remove(this.getName()); - BI.RecordEditor.superclass.destroy.apply(this, arguments); - } -}); -BI.RecordEditor.EVENT_CHANGE = "EVENT_CHANGE"; -BI.RecordEditor.EVENT_FOCUS = "EVENT_FOCUS"; -BI.RecordEditor.EVENT_BLUR = "EVENT_BLUR"; -BI.RecordEditor.EVENT_CLICK = "EVENT_CLICK"; -BI.RecordEditor.EVENT_KEY_DOWN = "EVENT_KEY_DOWN"; - -BI.RecordEditor.EVENT_START = "EVENT_START"; -BI.RecordEditor.EVENT_PAUSE = "EVENT_PAUSE"; -BI.RecordEditor.EVENT_STOP = "EVENT_STOP"; -BI.RecordEditor.EVENT_CONFIRM = "EVENT_CONFIRM"; -BI.RecordEditor.EVENT_VALID = "EVENT_VALID"; -BI.RecordEditor.EVENT_ERROR = "EVENT_ERROR"; -BI.RecordEditor.EVENT_ENTER = "EVENT_ENTER"; -BI.RecordEditor.EVENT_RESTRICT = "EVENT_RESTRICT"; -BI.RecordEditor.EVENT_SPACE = "EVENT_SPACE"; -BI.RecordEditor.EVENT_EMPTY = "EVENT_EMPTY"; - -BI.shortcut("bi.record_editor", BI.RecordEditor); \ No newline at end of file diff --git a/src/core/controller/controller.layer.js b/src/core/controller/controller.layer.js index b6ed987210..e42d938af2 100644 --- a/src/core/controller/controller.layer.js +++ b/src/core/controller/controller.layer.js @@ -68,7 +68,8 @@ BI.LayerController = BI.inherit(BI.Controller, { return this.get(name); } var widget = BI.createWidget((op.render || {}), { - type: "bi.layout" + type: "bi.layout", + cls: op.cls }); var layout = BI.createWidget({ type: "bi.absolute", diff --git a/src/core/func/function.js b/src/core/func/function.js index aa594e3a82..5ad687db66 100644 --- a/src/core/func/function.js +++ b/src/core/func/function.js @@ -117,6 +117,14 @@ $(function () { return false; }, + //获取对比颜色 + getContrastColor: function (color) { + if (this.isDarkColor(color)) { + return "#ffffff"; + } + return "#1a1a1a"; + }, + rgb2hex: function (rgbColour) { if (!rgbColour || rgbColour.substr(0, 3) != "rgb") { return ""; diff --git a/src/css/base/chart/chart.combine.css b/src/css/base/chart/chart.combine.css deleted file mode 100644 index 1c94930a02..0000000000 --- a/src/css/base/chart/chart.combine.css +++ /dev/null @@ -1,11 +0,0 @@ -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -.bi-combine-chart .bi-linkage-list { - background-color: #ffffff; - border: 1px solid #eaeaea; - z-index: 1000000000; -} -.bi-combine-chart .bi-linkage-list .bi-linkage-list-item:hover { - background-color: #f4f4f4; -} diff --git a/src/css/base/single/input/input.css b/src/css/base/single/input/input.css index c2425f2f3b..fa262401bc 100644 --- a/src/css/base/single/input/input.css +++ b/src/css/base/single/input/input.css @@ -17,6 +17,3 @@ border: none; color: #e85050 !important; } -.bi-input.disabled { - background-color: white; -} diff --git a/src/css/base/table/table.grid.scrollbar.css b/src/css/base/table/table.grid.scrollbar.css index 289bc820cd..ecbeaff0ee 100644 --- a/src/css/base/table/table.grid.scrollbar.css +++ b/src/css/base/table/table.grid.scrollbar.css @@ -80,11 +80,19 @@ .public-scrollbar-face:after { background-color: #c2c2c2; } +.bi-theme-dark .public-scrollbar-face:after { + background-color: #7d7d7d; +} .public-scrollbar-main:hover .public-scrollbar-face:after, .public-scrollbar-main-active .public-scrollbar-face:after, .public-scrollbar-faceActive:after { background-color: #7d7d7d; } +.bi-theme-dark .public-scrollbar-main:hover .public-scrollbar-face:after, +.bi-theme-dark .public-scrollbar-main-active .public-scrollbar-face:after, +.bi-theme-dark .public-scrollbar-faceActive:after { + background-color: #c2c2c2; +} .horizontal-scrollbar { bottom: 0; position: absolute; diff --git a/src/css/base/view/popupview.css b/src/css/base/view/popupview.css index 79efbe2ddd..09d70b9170 100644 --- a/src/css/base/view/popupview.css +++ b/src/css/base/view/popupview.css @@ -28,3 +28,7 @@ .bi-list-view .list-view-toolbar > .first-element { border-left: none; } +.bi-theme-dark .bi-list-view .list-view-outer { + color: #b2b2b2; + background: #191a2c; +} diff --git a/src/css/core/utils/common.css b/src/css/core/utils/common.css index c71debf988..23708de8e7 100644 --- a/src/css/core/utils/common.css +++ b/src/css/core/utils/common.css @@ -56,6 +56,16 @@ .bi-list-item.disabled:active { background-color: #ffffff; } +.bi-theme-dark .bi-list-item:hover, +.bi-theme-dark .bi-list-item.hover { + background-color: #04070d; + color: #ffffff; +} +.bi-theme-dark .bi-list-item.disabled, +.bi-theme-dark .bi-list-item.disabled:hover, +.bi-theme-dark .bi-list-item.disabled:active { + background-color: transparent; +} .bi-list-item-effect.active, .bi-list-item-effect:active { color: #009de3; @@ -63,7 +73,16 @@ .bi-list-item-effect.disabled, .bi-list-item-effect.disabled:hover, .bi-list-item-effect.disabled:active { - color: #1a1a1a; + color: #c4c6c6; +} +.bi-theme-dark .bi-list-item-effect.active, +.bi-theme-dark .bi-list-item-effect:active { + color: #009de3; +} +.bi-theme-dark .bi-list-item-effect.disabled, +.bi-theme-dark .bi-list-item-effect.disabled:hover, +.bi-theme-dark .bi-list-item-effect.disabled:active { + color: #c4c6c6; } .bi-list-item-hover:hover, .bi-list-item-hover.hover { @@ -73,9 +92,20 @@ .bi-list-item-hover.disabled, .bi-list-item-hover.disabled:hover, .bi-list-item-hover.disabled:active { - color: #1a1a1a; + color: #c4c6c6; background-color: #ffffff; } +.bi-theme-dark .bi-list-item-hover:hover, +.bi-theme-dark .bi-list-item-hover.hover { + color: #009de3; + background-color: #04070d; +} +.bi-theme-dark .bi-list-item-hover.disabled, +.bi-theme-dark .bi-list-item-hover.disabled:hover, +.bi-theme-dark .bi-list-item-hover.disabled:active { + color: #c4c6c6; + background-color: transparent; +} .bi-list-item-active:hover, .bi-list-item-active.hover { background-color: #f4f4f4; @@ -90,6 +120,21 @@ .bi-list-item-active.disabled:active { background-color: #ffffff; } +.bi-theme-dark .bi-list-item-active:hover, +.bi-theme-dark .bi-list-item-active.hover { + background-color: #04070d; + color: #ffffff; +} +.bi-theme-dark .bi-list-item-active.active, +.bi-theme-dark .bi-list-item-active:active { + color: #009de3; + background-color: #04070d; +} +.bi-theme-dark .bi-list-item-active.disabled, +.bi-theme-dark .bi-list-item-active.disabled:hover, +.bi-theme-dark .bi-list-item-active.disabled:active { + background-color: transparent; +} .bi-list-item-select:hover, .bi-list-item-select.hover { color: #009de3; @@ -115,3 +160,28 @@ .bi-list-item-select.disabled:active .bi-high-light { color: #c4c6c6 !important; } +.bi-theme-dark .list-item-select:hover, +.bi-theme-dark .list-item-select.hover { + color: #009de3; + background-color: #04070d; +} +.bi-theme-dark .list-item-select:active, +.bi-theme-dark .list-item-select.active { + color: #ffffff; + background-color: #009de3; +} +.bi-theme-dark .list-item-select:active .bi-high-light, +.bi-theme-dark .list-item-select.active .bi-high-light { + color: #ffffff; +} +.bi-theme-dark .list-item-select.disabled, +.bi-theme-dark .list-item-select.disabled:hover, +.bi-theme-dark .list-item-select.disabled:active { + color: #c4c6c6 !important; + background-color: transparent !important; +} +.bi-theme-dark .list-item-select.disabled .bi-high-light, +.bi-theme-dark .list-item-select.disabled:hover .bi-high-light, +.bi-theme-dark .list-item-select.disabled:active .bi-high-light { + color: #c4c6c6 !important; +} diff --git a/src/css/resource/app.css b/src/css/resource/app.css index 3b1b57c1cb..85b8a74649 100644 --- a/src/css/resource/app.css +++ b/src/css/resource/app.css @@ -106,3 +106,17 @@ textarea::-webkit-scrollbar-thumb { border-radius: 0; background-color: #e2e2e2; } +.bi-theme-dark div::-webkit-scrollbar, +.bi-theme-dark textarea::-webkit-scrollbar { + -webkit-appearance: none; + background-color: #191a2c; + width: 6px; + height: 6px; +} +.bi-theme-dark div::-webkit-scrollbar-thumb, +.bi-theme-dark textarea::-webkit-scrollbar-thumb { + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + background-color: #7d7d7d; +} diff --git a/src/css/resource/font.css b/src/css/resource/font.css index e197e78c19..a9cc42dd2b 100644 --- a/src/css/resource/font.css +++ b/src/css/resource/font.css @@ -2,12 +2,12 @@ /**** custom color(自定义颜色,用于特定场景) ****/ .close-font .b-font:before { content: "\e600"; - color: #808080; + color: inherit; } .close-font.native .b-font:before, .close-font.disabled .b-font:before { content: "\e600"; - color: #808080; + color: inherit; } .close-red-font .b-font:before { content: "\e600"; @@ -20,28 +20,28 @@ } .close-h-font .b-font:before { content: "\e600"; - color: #808080; + color: inherit; } .close-h-font:hover .b-font:before, .close-h-font:focus .b-font:before, .close-h-font.hover .b-font:before { content: "\e600"; - color: #808080; + color: inherit; } .close-h-font.native .b-font:before, .close-h-font.disabled .b-font:before { content: "\e600"; - color: #808080; + color: inherit; } .close-e-font .b-font:before { content: "\e600"; - color: #808080; + color: inherit; } .close-e-font:hover .b-font:before, .close-e-font:focus .b-font:before, .close-e-font.hover .b-font:before { content: "\e600"; - color: #808080; + color: inherit; } .close-e-font.active .b-font:before { content: "\e600"; @@ -54,17 +54,17 @@ .close-e-font.native .b-font:before, .close-e-font.disabled .b-font:before { content: "\e600"; - color: #808080; + color: inherit; } .close-ha-font .b-font:before { content: "\e600"; - color: #808080; + color: inherit; } .close-ha-font:hover .b-font:before, .close-ha-font:focus .b-font:before, .close-ha-font.hover .b-font:before { content: "\e600"; - color: #808080; + color: inherit; } .close-ha-font:active .b-font:before, .close-ha-font.active .b-font:before { @@ -74,11 +74,11 @@ .close-ha-font.native .b-font:before, .close-ha-font.disabled .b-font:before { content: "\e600"; - color: #808080; + color: inherit; } .search-close-h-font .b-font:before { content: "\e600"; - color: #808080; + color: inherit; } .search-close-h-font:hover .b-font:before, .search-close-h-font:focus .b-font:before, @@ -89,41 +89,41 @@ .search-close-h-font.native .b-font:before, .search-close-h-font.disabled .b-font:before { content: "\e600"; - color: #808080; + color: inherit; } .trigger-font .b-font:before { content: "\e603"; - color: #808080; + color: inherit; } .trigger-font.native .b-font:before, .trigger-font.disabled .b-font:before { content: "\e603"; - color: #808080; + color: inherit; } .trigger-h-font .b-font:before { content: "\e603"; - color: #808080; + color: inherit; } .trigger-h-font:hover .b-font:before, .trigger-h-font:focus .b-font:before, .trigger-h-font.hover .b-font:before { content: "\e603"; - color: #808080; + color: inherit; } .trigger-h-font.native .b-font:before, .trigger-h-font.disabled .b-font:before { content: "\e603"; - color: #808080; + color: inherit; } .trigger-ha-font .b-font:before { content: "\e603"; - color: #808080; + color: inherit; } .trigger-ha-font:hover .b-font:before, .trigger-ha-font:focus .b-font:before, .trigger-ha-font.hover .b-font:before { content: "\e603"; - color: #808080; + color: inherit; } .trigger-ha-font:active .b-font:before, .trigger-ha-font.active .b-font:before { @@ -133,41 +133,41 @@ .trigger-ha-font.native .b-font:before, .trigger-ha-font.disabled .b-font:before { content: "\e603"; - color: #808080; + color: inherit; } .pre-page-font .b-font:before { content: "\e601"; - color: #808080; + color: inherit; } .pre-page-font.native .b-font:before, .pre-page-font.disabled .b-font:before { content: "\e601"; - color: #808080; + color: inherit; } .pre-page-h-font .b-font:before { content: "\e601"; - color: #808080; + color: inherit; } .pre-page-h-font:hover .b-font:before, .pre-page-h-font:focus .b-font:before, .pre-page-h-font.hover .b-font:before { content: "\e601"; - color: #808080; + color: inherit; } .pre-page-h-font.native .b-font:before, .pre-page-h-font.disabled .b-font:before { content: "\e601"; - color: #808080; + color: inherit; } .pre-page-ha-font .b-font:before { content: "\e601"; - color: #808080; + color: inherit; } .pre-page-ha-font:hover .b-font:before, .pre-page-ha-font:focus .b-font:before, .pre-page-ha-font.hover .b-font:before { content: "\e601"; - color: #808080; + color: inherit; } .pre-page-ha-font:active .b-font:before, .pre-page-ha-font.active .b-font:before { @@ -177,41 +177,41 @@ .pre-page-ha-font.native .b-font:before, .pre-page-ha-font.disabled .b-font:before { content: "\e601"; - color: #808080; + color: inherit; } .next-page-font .b-font:before { content: "\e602"; - color: #808080; + color: inherit; } .next-page-font.native .b-font:before, .next-page-font.disabled .b-font:before { content: "\e602"; - color: #808080; + color: inherit; } .next-page-h-font .b-font:before { content: "\e602"; - color: #808080; + color: inherit; } .next-page-h-font:hover .b-font:before, .next-page-h-font:focus .b-font:before, .next-page-h-font.hover .b-font:before { content: "\e602"; - color: #808080; + color: inherit; } .next-page-h-font.native .b-font:before, .next-page-h-font.disabled .b-font:before { content: "\e602"; - color: #808080; + color: inherit; } .next-page-ha-font .b-font:before { content: "\e602"; - color: #808080; + color: inherit; } .next-page-ha-font:hover .b-font:before, .next-page-ha-font:focus .b-font:before, .next-page-ha-font.hover .b-font:before { content: "\e602"; - color: #808080; + color: inherit; } .next-page-ha-font:active .b-font:before, .next-page-ha-font.active .b-font:before { @@ -221,41 +221,41 @@ .next-page-ha-font.native .b-font:before, .next-page-ha-font.disabled .b-font:before { content: "\e602"; - color: #808080; + color: inherit; } .search-font .b-font:before { content: "\e604"; - color: #808080; + color: inherit; } .search-font.native .b-font:before, .search-font.disabled .b-font:before { content: "\e604"; - color: #808080; + color: inherit; } .search-h-font .b-font:before { content: "\e604"; - color: #808080; + color: inherit; } .search-h-font:hover .b-font:before, .search-h-font:focus .b-font:before, .search-h-font.hover .b-font:before { content: "\e604"; - color: #808080; + color: inherit; } .search-h-font.native .b-font:before, .search-h-font.disabled .b-font:before { content: "\e604"; - color: #808080; + color: inherit; } .search-ha-font .b-font:before { content: "\e604"; - color: #808080; + color: inherit; } .search-ha-font:hover .b-font:before, .search-ha-font:focus .b-font:before, .search-ha-font.hover .b-font:before { content: "\e604"; - color: #808080; + color: inherit; } .search-ha-font:active .b-font:before, .search-ha-font.active .b-font:before { @@ -265,41 +265,41 @@ .search-ha-font.native .b-font:before, .search-ha-font.disabled .b-font:before { content: "\e604"; - color: #808080; + color: inherit; } .share-font .b-font:before { content: "\e65a"; - color: #808080; + color: inherit; } .share-font.native .b-font:before, .share-font.disabled .b-font:before { content: "\e65a"; - color: #808080; + color: inherit; } .share-h-font .b-font:before { content: "\e65a"; - color: #808080; + color: inherit; } .share-h-font:hover .b-font:before, .share-h-font:focus .b-font:before, .share-h-font.hover .b-font:before { content: "\e65a"; - color: #808080; + color: inherit; } .share-h-font.native .b-font:before, .share-h-font.disabled .b-font:before { content: "\e65a"; - color: #808080; + color: inherit; } .share-ha-font .b-font:before { content: "\e65a"; - color: #808080; + color: inherit; } .share-ha-font:hover .b-font:before, .share-ha-font:focus .b-font:before, .share-ha-font.hover .b-font:before { content: "\e65a"; - color: #808080; + color: inherit; } .share-ha-font:active .b-font:before, .share-ha-font.active .b-font:before { @@ -309,7 +309,7 @@ .share-ha-font.native .b-font:before, .share-ha-font.disabled .b-font:before { content: "\e65a"; - color: #808080; + color: inherit; } /**维度/指标 下拉列表图标字体 ~begin~**/ .delete-font .b-font:before { @@ -850,21 +850,21 @@ } .hyper-link-font .b-font:before { content: "\e688"; - color: #808080; + color: inherit; } .hyper-link-font.native .b-font:before, .hyper-link-font.disabled .b-font:before { content: "\e688"; - color: #808080; + color: inherit; } .filter-font .b-font:before { content: "\e60f"; - color: #808080; + color: inherit; } .filter-font.native .b-font:before, .filter-font.disabled .b-font:before { content: "\e60f"; - color: #808080; + color: inherit; } .filter-h-font .b-font:before { content: "\e60f"; @@ -1037,21 +1037,21 @@ /** dashboard组件/控件 下拉列表图标字体 ~end~**/ .tree-node-triangle-expand-font .b-font:before { content: "\e608"; - color: #808080; + color: inherit; } .tree-node-triangle-expand-font.native .b-font:before, .tree-node-triangle-expand-font.disabled .b-font:before { content: "\e608"; - color: #808080; + color: inherit; } .tree-node-triangle-collapse-font .b-font:before { content: "\e607"; - color: #808080; + color: inherit; } .tree-node-triangle-collapse-font.native .b-font:before, .tree-node-triangle-collapse-font.disabled .b-font:before { content: "\e607"; - color: #808080; + color: inherit; } .row-pre-page-h-font .b-font:before { content: "\e6be"; @@ -1135,82 +1135,82 @@ } .widget-date-next-h-font .b-font:before { content: "\e62f"; - color: #808080; + color: inherit; } .widget-date-next-h-font:hover .b-font:before, .widget-date-next-h-font:focus .b-font:before, .widget-date-next-h-font.hover .b-font:before { content: "\e62f"; - color: #808080; + color: inherit; } .widget-date-next-h-font.native .b-font:before, .widget-date-next-h-font.disabled .b-font:before { content: "\e62f"; - color: #808080; + color: inherit; } .widget-date-pre-h-font .b-font:before { content: "\e62e"; - color: #808080; + color: inherit; } .widget-date-pre-h-font:hover .b-font:before, .widget-date-pre-h-font:focus .b-font:before, .widget-date-pre-h-font.hover .b-font:before { content: "\e62e"; - color: #808080; + color: inherit; } .widget-date-pre-h-font.native .b-font:before, .widget-date-pre-h-font.disabled .b-font:before { content: "\e62e"; - color: #808080; + color: inherit; } .widget-date-h-change-font .b-font:before { content: "\e660"; - color: #808080; + color: inherit; } .widget-date-h-change-font:hover .b-font:before, .widget-date-h-change-font:focus .b-font:before, .widget-date-h-change-font.hover .b-font:before { content: "\e660"; - color: #808080; + color: inherit; } .widget-date-h-change-font.native .b-font:before, .widget-date-h-change-font.disabled .b-font:before { content: "\e660"; - color: #808080; + color: inherit; } .pull-down-font .b-font:before { content: "\e608"; - color: #808080; + color: inherit; } .pull-down-font.native .b-font:before, .pull-down-font.disabled .b-font:before { content: "\e608"; - color: #808080; + color: inherit; } .pull-down-h-font .b-font:before { content: "\e608"; - color: #808080; + color: inherit; } .pull-down-h-font:hover .b-font:before, .pull-down-h-font:focus .b-font:before, .pull-down-h-font.hover .b-font:before { content: "\e608"; - color: #808080; + color: inherit; } .pull-down-h-font.native .b-font:before, .pull-down-h-font.disabled .b-font:before { content: "\e608"; - color: #808080; + color: inherit; } .pull-down-ha-font .b-font:before { content: "\e608"; - color: #808080; + color: inherit; } .pull-down-ha-font:hover .b-font:before, .pull-down-ha-font:focus .b-font:before, .pull-down-ha-font.hover .b-font:before { content: "\e608"; - color: #808080; + color: inherit; } .pull-down-ha-font:active .b-font:before, .pull-down-ha-font.active .b-font:before { @@ -1220,41 +1220,41 @@ .pull-down-ha-font.native .b-font:before, .pull-down-ha-font.disabled .b-font:before { content: "\e608"; - color: #808080; + color: inherit; } .delete-field-font .b-font:before { content: "\e605"; - color: #808080; + color: inherit; } .delete-field-font.native .b-font:before, .delete-field-font.disabled .b-font:before { content: "\e605"; - color: #808080; + color: inherit; } .delete-field-h-font .b-font:before { content: "\e605"; - color: #808080; + color: inherit; } .delete-field-h-font:hover .b-font:before, .delete-field-h-font:focus .b-font:before, .delete-field-h-font.hover .b-font:before { content: "\e605"; - color: #808080; + color: inherit; } .delete-field-h-font.native .b-font:before, .delete-field-h-font.disabled .b-font:before { content: "\e605"; - color: #808080; + color: inherit; } .delete-field-ha-font .b-font:before { content: "\e605"; - color: #808080; + color: inherit; } .delete-field-ha-font:hover .b-font:before, .delete-field-ha-font:focus .b-font:before, .delete-field-ha-font.hover .b-font:before { content: "\e605"; - color: #808080; + color: inherit; } .delete-field-ha-font:active .b-font:before, .delete-field-ha-font.active .b-font:before { @@ -1264,92 +1264,92 @@ .delete-field-ha-font.native .b-font:before, .delete-field-ha-font.disabled .b-font:before { content: "\e605"; - color: #808080; + color: inherit; } .toolbar-save-font .b-font:before { content: "\e617"; - color: #808080; + color: inherit; } .toolbar-save-font:hover .b-font:before, .toolbar-save-font:focus .b-font:before, .toolbar-save-font.hover .b-font:before { content: "\e617"; - color: #808080; + color: inherit; } .toolbar-save-font.native .b-font:before, .toolbar-save-font.disabled .b-font:before { content: "\e617"; - color: #808080; + color: inherit; } .toolbar-undo-font .b-font:before { content: "\e619"; - color: #808080; + color: inherit; } .toolbar-undo-font:hover .b-font:before, .toolbar-undo-font:focus .b-font:before, .toolbar-undo-font.hover .b-font:before { content: "\e619"; - color: #808080; + color: inherit; } .toolbar-undo-font.native .b-font:before, .toolbar-undo-font.disabled .b-font:before { content: "\e619"; - color: #808080; + color: inherit; } .toolbar-redo-font .b-font:before { content: "\e625"; - color: #808080; + color: inherit; } .toolbar-redo-font:hover .b-font:before, .toolbar-redo-font:focus .b-font:before, .toolbar-redo-font.hover .b-font:before { content: "\e625"; - color: #808080; + color: inherit; } .toolbar-redo-font.native .b-font:before, .toolbar-redo-font.disabled .b-font:before { content: "\e625"; - color: #808080; + color: inherit; } .toolbar-edit-font .b-font:before { content: "\e631"; - color: #808080; + color: inherit; } .toolbar-edit-font:hover .b-font:before, .toolbar-edit-font:focus .b-font:before, .toolbar-edit-font.hover .b-font:before { content: "\e631"; - color: #808080; + color: inherit; } .toolbar-edit-font.native .b-font:before, .toolbar-edit-font.disabled .b-font:before { content: "\e631"; - color: #808080; + color: inherit; } .toolbar-preview-font .b-font:before { content: "\e65f"; - color: #808080; + color: inherit; } .toolbar-preview-font:hover .b-font:before, .toolbar-preview-font:focus .b-font:before, .toolbar-preview-font.hover .b-font:before { content: "\e65f"; - color: #808080; + color: inherit; } .toolbar-preview-font.native .b-font:before, .toolbar-preview-font.disabled .b-font:before { content: "\e65f"; - color: #808080; + color: inherit; } .chart-table-font .b-font:before { content: "\e60e"; - color: #808080; + color: inherit; } .chart-table-font:hover .b-font:before, .chart-table-font:focus .b-font:before, .chart-table-font.hover .b-font:before { content: "\e60e"; - color: #808080; + color: inherit; } .chart-table-font:active .b-font:before, .chart-table-font.active .b-font:before { @@ -1359,17 +1359,17 @@ .chart-table-font.native .b-font:before, .chart-table-font.disabled .b-font:before { content: "\e60e"; - color: #808080; + color: inherit; } .chart-axis-font .b-font:before { content: "\e626"; - color: #808080; + color: inherit; } .chart-axis-font:hover .b-font:before, .chart-axis-font:focus .b-font:before, .chart-axis-font.hover .b-font:before { content: "\e626"; - color: #808080; + color: inherit; } .chart-axis-font:active .b-font:before, .chart-axis-font.active .b-font:before { @@ -1379,17 +1379,17 @@ .chart-axis-font.native .b-font:before, .chart-axis-font.disabled .b-font:before { content: "\e626"; - color: #808080; + color: inherit; } .chart-bar-font .b-font:before { content: "\e620"; - color: #808080; + color: inherit; } .chart-bar-font:hover .b-font:before, .chart-bar-font:focus .b-font:before, .chart-bar-font.hover .b-font:before { content: "\e620"; - color: #808080; + color: inherit; } .chart-bar-font:active .b-font:before, .chart-bar-font.active .b-font:before { @@ -1399,17 +1399,17 @@ .chart-bar-font.native .b-font:before, .chart-bar-font.disabled .b-font:before { content: "\e620"; - color: #808080; + color: inherit; } .chart-accumulate-bar-font .b-font:before { content: "\e60a"; - color: #808080; + color: inherit; } .chart-accumulate-bar-font:hover .b-font:before, .chart-accumulate-bar-font:focus .b-font:before, .chart-accumulate-bar-font.hover .b-font:before { content: "\e60a"; - color: #808080; + color: inherit; } .chart-accumulate-bar-font:active .b-font:before, .chart-accumulate-bar-font.active .b-font:before { @@ -1419,17 +1419,17 @@ .chart-accumulate-bar-font.native .b-font:before, .chart-accumulate-bar-font.disabled .b-font:before { content: "\e60a"; - color: #808080; + color: inherit; } .chart-pie-font .b-font:before { content: "\e618"; - color: #808080; + color: inherit; } .chart-pie-font:hover .b-font:before, .chart-pie-font:focus .b-font:before, .chart-pie-font.hover .b-font:before { content: "\e618"; - color: #808080; + color: inherit; } .chart-pie-font:active .b-font:before, .chart-pie-font.active .b-font:before { @@ -1439,17 +1439,17 @@ .chart-pie-font.native .b-font:before, .chart-pie-font.disabled .b-font:before { content: "\e618"; - color: #808080; + color: inherit; } .chart-map-font .b-font:before { content: "\e62c"; - color: #808080; + color: inherit; } .chart-map-font:hover .b-font:before, .chart-map-font:focus .b-font:before, .chart-map-font.hover .b-font:before { content: "\e62c"; - color: #808080; + color: inherit; } .chart-map-font:active .b-font:before, .chart-map-font.active .b-font:before { @@ -1459,17 +1459,17 @@ .chart-map-font.native .b-font:before, .chart-map-font.disabled .b-font:before { content: "\e62c"; - color: #808080; + color: inherit; } .chart-dashboard-font .b-font:before { content: "\e623"; - color: #808080; + color: inherit; } .chart-dashboard-font:hover .b-font:before, .chart-dashboard-font:focus .b-font:before, .chart-dashboard-font.hover .b-font:before { content: "\e623"; - color: #808080; + color: inherit; } .chart-dashboard-font:active .b-font:before, .chart-dashboard-font.active .b-font:before { @@ -1479,17 +1479,17 @@ .chart-dashboard-font.native .b-font:before, .chart-dashboard-font.disabled .b-font:before { content: "\e623"; - color: #808080; + color: inherit; } .chart-doughnut-font .b-font:before { content: "\e624"; - color: #808080; + color: inherit; } .chart-doughnut-font:hover .b-font:before, .chart-doughnut-font:focus .b-font:before, .chart-doughnut-font.hover .b-font:before { content: "\e624"; - color: #808080; + color: inherit; } .chart-doughnut-font:active .b-font:before, .chart-doughnut-font.active .b-font:before { @@ -1499,17 +1499,17 @@ .chart-doughnut-font.native .b-font:before, .chart-doughnut-font.disabled .b-font:before { content: "\e624"; - color: #808080; + color: inherit; } .chart-detail-font .b-font:before { content: "\e615"; - color: #808080; + color: inherit; } .chart-detail-font:hover .b-font:before, .chart-detail-font:focus .b-font:before, .chart-detail-font.hover .b-font:before { content: "\e615"; - color: #808080; + color: inherit; } .chart-detail-font:active .b-font:before, .chart-detail-font.active .b-font:before { @@ -1519,17 +1519,17 @@ .chart-detail-font.native .b-font:before, .chart-detail-font.disabled .b-font:before { content: "\e615"; - color: #808080; + color: inherit; } .chart-more-font .b-font:before { content: "\e60d"; - color: #808080; + color: inherit; } .chart-more-font:hover .b-font:before, .chart-more-font:focus .b-font:before, .chart-more-font.hover .b-font:before { content: "\e60d"; - color: #808080; + color: inherit; } .chart-more-font:active .b-font:before, .chart-more-font.active .b-font:before { @@ -1539,17 +1539,17 @@ .chart-more-font.native .b-font:before, .chart-more-font.disabled .b-font:before { content: "\e60d"; - color: #808080; + color: inherit; } .chart-bubble-font .b-font:before { content: "\e62a"; - color: #808080; + color: inherit; } .chart-bubble-font:hover .b-font:before, .chart-bubble-font:focus .b-font:before, .chart-bubble-font.hover .b-font:before { content: "\e62a"; - color: #808080; + color: inherit; } .chart-bubble-font:active .b-font:before, .chart-bubble-font.active .b-font:before { @@ -1559,17 +1559,17 @@ .chart-bubble-font.native .b-font:before, .chart-bubble-font.disabled .b-font:before { content: "\e62a"; - color: #808080; + color: inherit; } .chart-scatter-font .b-font:before { content: "\e61d"; - color: #808080; + color: inherit; } .chart-scatter-font:hover .b-font:before, .chart-scatter-font:focus .b-font:before, .chart-scatter-font.hover .b-font:before { content: "\e61d"; - color: #808080; + color: inherit; } .chart-scatter-font:active .b-font:before, .chart-scatter-font.active .b-font:before { @@ -1579,17 +1579,17 @@ .chart-scatter-font.native .b-font:before, .chart-scatter-font.disabled .b-font:before { content: "\e61d"; - color: #808080; + color: inherit; } .chart-radar-font .b-font:before { content: "\e614"; - color: #808080; + color: inherit; } .chart-radar-font:hover .b-font:before, .chart-radar-font:focus .b-font:before, .chart-radar-font.hover .b-font:before { content: "\e614"; - color: #808080; + color: inherit; } .chart-radar-font:active .b-font:before, .chart-radar-font.active .b-font:before { @@ -1599,17 +1599,17 @@ .chart-radar-font.native .b-font:before, .chart-radar-font.disabled .b-font:before { content: "\e614"; - color: #808080; + color: inherit; } .chart-content-font .b-font:before { content: "\e621"; - color: #808080; + color: inherit; } .chart-content-font:hover .b-font:before, .chart-content-font:focus .b-font:before, .chart-content-font.hover .b-font:before { content: "\e621"; - color: #808080; + color: inherit; } .chart-content-font:active .b-font:before, .chart-content-font.active .b-font:before { @@ -1619,17 +1619,17 @@ .chart-content-font.native .b-font:before, .chart-content-font.disabled .b-font:before { content: "\e621"; - color: #808080; + color: inherit; } .chart-image-font .b-font:before { content: "\e68d"; - color: #808080; + color: inherit; } .chart-image-font:hover .b-font:before, .chart-image-font:focus .b-font:before, .chart-image-font.hover .b-font:before { content: "\e68d"; - color: #808080; + color: inherit; } .chart-image-font:active .b-font:before, .chart-image-font.active .b-font:before { @@ -1639,17 +1639,17 @@ .chart-image-font.native .b-font:before, .chart-image-font.disabled .b-font:before { content: "\e68d"; - color: #808080; + color: inherit; } .chart-web-font .b-font:before { content: "\e68c"; - color: #808080; + color: inherit; } .chart-web-font:hover .b-font:before, .chart-web-font:focus .b-font:before, .chart-web-font.hover .b-font:before { content: "\e68c"; - color: #808080; + color: inherit; } .chart-web-font:active .b-font:before, .chart-web-font.active .b-font:before { @@ -1659,17 +1659,17 @@ .chart-web-font.native .b-font:before, .chart-web-font.disabled .b-font:before { content: "\e68c"; - color: #808080; + color: inherit; } .chart-string-font .b-font:before { content: "\e622"; - color: #808080; + color: inherit; } .chart-string-font:hover .b-font:before, .chart-string-font:focus .b-font:before, .chart-string-font.hover .b-font:before { content: "\e622"; - color: #808080; + color: inherit; } .chart-string-font:active .b-font:before, .chart-string-font.active .b-font:before { @@ -1679,17 +1679,17 @@ .chart-string-font.native .b-font:before, .chart-string-font.disabled .b-font:before { content: "\e622"; - color: #808080; + color: inherit; } .chart-number-font .b-font:before { content: "\e61f"; - color: #808080; + color: inherit; } .chart-number-font:hover .b-font:before, .chart-number-font:focus .b-font:before, .chart-number-font.hover .b-font:before { content: "\e61f"; - color: #808080; + color: inherit; } .chart-number-font:active .b-font:before, .chart-number-font.active .b-font:before { @@ -1699,17 +1699,17 @@ .chart-number-font.native .b-font:before, .chart-number-font.disabled .b-font:before { content: "\e61f"; - color: #808080; + color: inherit; } .chart-tree-font .b-font:before { content: "\e61e"; - color: #808080; + color: inherit; } .chart-tree-font:hover .b-font:before, .chart-tree-font:focus .b-font:before, .chart-tree-font.hover .b-font:before { content: "\e61e"; - color: #808080; + color: inherit; } .chart-tree-font:active .b-font:before, .chart-tree-font.active .b-font:before { @@ -1719,17 +1719,17 @@ .chart-tree-font.native .b-font:before, .chart-tree-font.disabled .b-font:before { content: "\e61e"; - color: #808080; + color: inherit; } .chart-date-font .b-font:before { content: "\e61b"; - color: #808080; + color: inherit; } .chart-date-font:hover .b-font:before, .chart-date-font:focus .b-font:before, .chart-date-font.hover .b-font:before { content: "\e61b"; - color: #808080; + color: inherit; } .chart-date-font:active .b-font:before, .chart-date-font.active .b-font:before { @@ -1739,17 +1739,17 @@ .chart-date-font.native .b-font:before, .chart-date-font.disabled .b-font:before { content: "\e61b"; - color: #808080; + color: inherit; } .chart-year-font .b-font:before { content: "\e628"; - color: #808080; + color: inherit; } .chart-year-font:hover .b-font:before, .chart-year-font:focus .b-font:before, .chart-year-font.hover .b-font:before { content: "\e628"; - color: #808080; + color: inherit; } .chart-year-font:active .b-font:before, .chart-year-font.active .b-font:before { @@ -1759,17 +1759,17 @@ .chart-year-font.native .b-font:before, .chart-year-font.disabled .b-font:before { content: "\e628"; - color: #808080; + color: inherit; } .chart-month-font .b-font:before { content: "\e627"; - color: #808080; + color: inherit; } .chart-month-font:hover .b-font:before, .chart-month-font:focus .b-font:before, .chart-month-font.hover .b-font:before { content: "\e627"; - color: #808080; + color: inherit; } .chart-month-font:active .b-font:before, .chart-month-font.active .b-font:before { @@ -1779,17 +1779,17 @@ .chart-month-font.native .b-font:before, .chart-month-font.disabled .b-font:before { content: "\e627"; - color: #808080; + color: inherit; } .chart-quarter-font .b-font:before { content: "\e629"; - color: #808080; + color: inherit; } .chart-quarter-font:hover .b-font:before, .chart-quarter-font:focus .b-font:before, .chart-quarter-font.hover .b-font:before { content: "\e629"; - color: #808080; + color: inherit; } .chart-quarter-font:active .b-font:before, .chart-quarter-font.active .b-font:before { @@ -1799,17 +1799,17 @@ .chart-quarter-font.native .b-font:before, .chart-quarter-font.disabled .b-font:before { content: "\e629"; - color: #808080; + color: inherit; } .chart-ymd-font .b-font:before { content: "\e61c"; - color: #808080; + color: inherit; } .chart-ymd-font:hover .b-font:before, .chart-ymd-font:focus .b-font:before, .chart-ymd-font.hover .b-font:before { content: "\e61c"; - color: #808080; + color: inherit; } .chart-ymd-font:active .b-font:before, .chart-ymd-font.active .b-font:before { @@ -1819,17 +1819,17 @@ .chart-ymd-font.native .b-font:before, .chart-ymd-font.disabled .b-font:before { content: "\e61c"; - color: #808080; + color: inherit; } .chart-date-range-font .b-font:before { content: "\e616"; - color: #808080; + color: inherit; } .chart-date-range-font:hover .b-font:before, .chart-date-range-font:focus .b-font:before, .chart-date-range-font.hover .b-font:before { content: "\e616"; - color: #808080; + color: inherit; } .chart-date-range-font:active .b-font:before, .chart-date-range-font.active .b-font:before { @@ -1839,17 +1839,17 @@ .chart-date-range-font.native .b-font:before, .chart-date-range-font.disabled .b-font:before { content: "\e616"; - color: #808080; + color: inherit; } .chart-general-query-font .b-font:before { content: "\e62b"; - color: #808080; + color: inherit; } .chart-general-query-font:hover .b-font:before, .chart-general-query-font:focus .b-font:before, .chart-general-query-font.hover .b-font:before { content: "\e62b"; - color: #808080; + color: inherit; } .chart-general-query-font:active .b-font:before, .chart-general-query-font.active .b-font:before { @@ -1859,17 +1859,17 @@ .chart-general-query-font.native .b-font:before, .chart-general-query-font.disabled .b-font:before { content: "\e62b"; - color: #808080; + color: inherit; } .chart-query-font .b-font:before { content: "\e609"; - color: #808080; + color: inherit; } .chart-query-font:hover .b-font:before, .chart-query-font:focus .b-font:before, .chart-query-font.hover .b-font:before { content: "\e609"; - color: #808080; + color: inherit; } .chart-query-font:active .b-font:before, .chart-query-font.active .b-font:before { @@ -1879,17 +1879,17 @@ .chart-query-font.native .b-font:before, .chart-query-font.disabled .b-font:before { content: "\e609"; - color: #808080; + color: inherit; } .chart-reset-font .b-font:before { content: "\e61a"; - color: #808080; + color: inherit; } .chart-reset-font:hover .b-font:before, .chart-reset-font:focus .b-font:before, .chart-reset-font.hover .b-font:before { content: "\e61a"; - color: #808080; + color: inherit; } .chart-reset-font:active .b-font:before, .chart-reset-font.active .b-font:before { @@ -1899,17 +1899,17 @@ .chart-reset-font.native .b-font:before, .chart-reset-font.disabled .b-font:before { content: "\e61a"; - color: #808080; + color: inherit; } .chart-textarea-font .b-font:before { content: "\e622"; - color: #808080; + color: inherit; } .chart-textarea-font:hover .b-font:before, .chart-textarea-font:focus .b-font:before, .chart-textarea-font.hover .b-font:before { content: "\e622"; - color: #808080; + color: inherit; } .chart-textarea-font:active .b-font:before, .chart-textarea-font.active .b-font:before { @@ -1919,17 +1919,17 @@ .chart-textarea-font.native .b-font:before, .chart-textarea-font.disabled .b-font:before { content: "\e622"; - color: #808080; + color: inherit; } .chart-reuse-font .b-font:before { content: "\e60b"; - color: #808080; + color: inherit; } .chart-reuse-font:hover .b-font:before, .chart-reuse-font:focus .b-font:before, .chart-reuse-font.hover .b-font:before { content: "\e60b"; - color: #808080; + color: inherit; } .chart-reuse-font:active .b-font:before, .chart-reuse-font.active .b-font:before { @@ -1939,26 +1939,26 @@ .chart-reuse-font.native .b-font:before, .chart-reuse-font.disabled .b-font:before { content: "\e60b"; - color: #808080; + color: inherit; } .chart-date-normal-font .b-font:before { content: "\e61b"; - color: #808080; + color: inherit; } .chart-date-normal-font.native .b-font:before, .chart-date-normal-font.disabled .b-font:before { content: "\e61b"; - color: #808080; + color: inherit; } .less-font .b-font:before { content: "\e633"; - color: #808080; + color: inherit; } .less-font:hover .b-font:before, .less-font:focus .b-font:before, .less-font.hover .b-font:before { content: "\e633"; - color: #808080; + color: inherit; } .less-font:active .b-font:before, .less-font.active .b-font:before { @@ -1968,17 +1968,17 @@ .less-font.native .b-font:before, .less-font.disabled .b-font:before { content: "\e633"; - color: #808080; + color: inherit; } .less-equal-font .b-font:before { content: "\e636"; - color: #808080; + color: inherit; } .less-equal-font:hover .b-font:before, .less-equal-font:focus .b-font:before, .less-equal-font.hover .b-font:before { content: "\e636"; - color: #808080; + color: inherit; } .less-equal-font:active .b-font:before, .less-equal-font.active .b-font:before { @@ -1988,7 +1988,7 @@ .less-equal-font.native .b-font:before, .less-equal-font.disabled .b-font:before { content: "\e636"; - color: #808080; + color: inherit; } .check-font .b-font:before { content: "\e611"; @@ -2090,30 +2090,30 @@ } .select-data-field-string-group-font .b-font:before { content: "\e642"; - color: #808080; + color: inherit; } .select-data-field-string-group-font.native .b-font:before, .select-data-field-string-group-font.disabled .b-font:before { content: "\e642"; - color: #808080; + color: inherit; } .select-data-field-number-group-font .b-font:before { content: "\e641"; - color: #808080; + color: inherit; } .select-data-field-number-group-font.native .b-font:before, .select-data-field-number-group-font.disabled .b-font:before { content: "\e641"; - color: #808080; + color: inherit; } .select-data-field-date-group-font .b-font:before { content: "\e640"; - color: #808080; + color: inherit; } .select-data-field-date-group-font.native .b-font:before, .select-data-field-date-group-font.disabled .b-font:before { content: "\e640"; - color: #808080; + color: inherit; } .select-data-preview-font .b-font:before { content: "\e65f"; @@ -2137,18 +2137,18 @@ } .detail-dimension-set-font .b-font:before { content: "\e678"; - color: #808080; + color: inherit; } .detail-dimension-set-font:hover .b-font:before, .detail-dimension-set-font:focus .b-font:before, .detail-dimension-set-font.hover .b-font:before { content: "\e678"; - color: #808080; + color: inherit; } .detail-dimension-set-font.native .b-font:before, .detail-dimension-set-font.disabled .b-font:before { content: "\e678"; - color: #808080; + color: inherit; } .detail-real-data-warning-font .b-font:before { content: "\e64e"; @@ -2227,18 +2227,18 @@ } .dashboard-widget-combo-detail-set-font .b-font:before { content: "\e634"; - color: #808080; + color: inherit; } .dashboard-widget-combo-detail-set-font:hover .b-font:before, .dashboard-widget-combo-detail-set-font:focus .b-font:before, .dashboard-widget-combo-detail-set-font.hover .b-font:before { content: "\e634"; - color: #808080; + color: inherit; } .dashboard-widget-combo-detail-set-font.native .b-font:before, .dashboard-widget-combo-detail-set-font.disabled .b-font:before { content: "\e634"; - color: #808080; + color: inherit; } .group-add-font .b-font:before { content: "\e649"; @@ -2251,12 +2251,12 @@ } .sortable-font .b-font:before { content: "\e63b"; - color: #808080; + color: inherit; } .sortable-font.native .b-font:before, .sortable-font.disabled .b-font:before { content: "\e63b"; - color: #808080; + color: inherit; } .text-bold-font .b-font:before { content: "\e64d"; @@ -2377,30 +2377,30 @@ } .move-font .b-font:before { content: "\e65e"; - color: #808080; + color: inherit; } .move-font.native .b-font:before, .move-font.disabled .b-font:before { content: "\e65e"; - color: #808080; + color: inherit; } .share-font .b-font:before { content: "\e65a"; - color: #808080; + color: inherit; } .share-font.native .b-font:before, .share-font.disabled .b-font:before { content: "\e65a"; - color: #808080; + color: inherit; } .new-file-font .b-font:before { content: "\e65d"; - color: #808080; + color: inherit; } .new-file-font.native .b-font:before, .new-file-font.disabled .b-font:before { content: "\e65d"; - color: #808080; + color: inherit; } .file-font .b-font:before { content: "\e65b"; @@ -2422,13 +2422,13 @@ } .letter-font .b-font:before { content: "\e659"; - color: #808080; + color: inherit; } .letter-font:hover .b-font:before, .letter-font:focus .b-font:before, .letter-font.hover .b-font:before { content: "\e659"; - color: #808080; + color: inherit; } .letter-font:active .b-font:before, .letter-font.active .b-font:before { @@ -2438,17 +2438,17 @@ .letter-font.native .b-font:before, .letter-font.disabled .b-font:before { content: "\e659"; - color: #808080; + color: inherit; } .time-font .b-font:before { content: "\e658"; - color: #808080; + color: inherit; } .time-font:hover .b-font:before, .time-font:focus .b-font:before, .time-font.hover .b-font:before { content: "\e658"; - color: #808080; + color: inherit; } .time-font:active .b-font:before, .time-font.active .b-font:before { @@ -2458,16 +2458,16 @@ .time-font.native .b-font:before, .time-font.disabled .b-font:before { content: "\e658"; - color: #808080; + color: inherit; } .rename-font .b-font:before { content: "\e687"; - color: #808080; + color: inherit; } .rename-font.native .b-font:before, .rename-font.disabled .b-font:before { content: "\e687"; - color: #808080; + color: inherit; } .delete-template-font .b-font:before { content: "\e605"; @@ -2569,12 +2569,12 @@ } .refresh-table-font .b-font:before { content: "\e683"; - color: #808080; + color: inherit; } .refresh-table-font.native .b-font:before, .refresh-table-font.disabled .b-font:before { content: "\e683"; - color: #808080; + color: inherit; } .recover-chart-font-hightlight .b-font:before { content: "\e6b4"; @@ -2587,13 +2587,13 @@ } .tables-tile-view-font .b-font:before { content: "\e685"; - color: #808080; + color: inherit; } .tables-tile-view-font:hover .b-font:before, .tables-tile-view-font:focus .b-font:before, .tables-tile-view-font.hover .b-font:before { content: "\e685"; - color: #808080; + color: inherit; } .tables-tile-view-font:active .b-font:before, .tables-tile-view-font.active .b-font:before { @@ -2603,17 +2603,17 @@ .tables-tile-view-font.native .b-font:before, .tables-tile-view-font.disabled .b-font:before { content: "\e685"; - color: #808080; + color: inherit; } .tables-relation-view-font .b-font:before { content: "\e684"; - color: #808080; + color: inherit; } .tables-relation-view-font:hover .b-font:before, .tables-relation-view-font:focus .b-font:before, .tables-relation-view-font.hover .b-font:before { content: "\e684"; - color: #808080; + color: inherit; } .tables-relation-view-font:active .b-font:before, .tables-relation-view-font.active .b-font:before { @@ -2623,7 +2623,7 @@ .tables-relation-view-font.native .b-font:before, .tables-relation-view-font.disabled .b-font:before { content: "\e684"; - color: #808080; + color: inherit; } .add-new-table-pull-down-font .b-font:before { content: "\e62d"; @@ -2656,18 +2656,18 @@ } .edit-set-font .b-font:before { content: "\e634"; - color: #808080; + color: inherit; } .edit-set-font:hover .b-font:before, .edit-set-font:focus .b-font:before, .edit-set-font.hover .b-font:before { content: "\e634"; - color: #808080; + color: inherit; } .edit-set-font.native .b-font:before, .edit-set-font.disabled .b-font:before { content: "\e634"; - color: #808080; + color: inherit; } .new-analysis-font .b-font:before { content: "\e692"; @@ -2701,13 +2701,13 @@ } .folder-list-view .b-font:before { content: "\e694"; - color: #808080; + color: inherit; } .folder-list-view:hover .b-font:before, .folder-list-view:focus .b-font:before, .folder-list-view.hover .b-font:before { content: "\e694"; - color: #808080; + color: inherit; } .folder-list-view:active .b-font:before, .folder-list-view.active .b-font:before { @@ -2717,17 +2717,17 @@ .folder-list-view.native .b-font:before, .folder-list-view.disabled .b-font:before { content: "\e694"; - color: #808080; + color: inherit; } .folder-card-view .b-font:before { content: "\e685"; - color: #808080; + color: inherit; } .folder-card-view:hover .b-font:before, .folder-card-view:focus .b-font:before, .folder-card-view.hover .b-font:before { content: "\e685"; - color: #808080; + color: inherit; } .folder-card-view:active .b-font:before, .folder-card-view.active .b-font:before { @@ -2737,7 +2737,7 @@ .folder-card-view.native .b-font:before, .folder-card-view.disabled .b-font:before { content: "\e685"; - color: #808080; + color: inherit; } .item-check-font .b-font:before { content: "\e611"; @@ -2866,28 +2866,28 @@ } .primary-key-font .b-font:before { content: "\e67d;"; - color: #808080; + color: inherit; } .primary-key-font:hover .b-font:before, .primary-key-font:focus .b-font:before, .primary-key-font.hover .b-font:before { content: "\e67d;"; - color: #808080; + color: inherit; } .primary-key-font.native .b-font:before, .primary-key-font.disabled .b-font:before { content: "\e67d;"; - color: #808080; + color: inherit; } .table-open-row-style-font .b-font:before { content: "\e671"; - color: #808080; + color: inherit; } .table-open-row-style-font:hover .b-font:before, .table-open-row-style-font:focus .b-font:before, .table-open-row-style-font.hover .b-font:before { content: "\e671"; - color: #808080; + color: inherit; } .table-open-row-style-font:active .b-font:before, .table-open-row-style-font.active .b-font:before { @@ -2897,17 +2897,17 @@ .table-open-row-style-font.native .b-font:before, .table-open-row-style-font.disabled .b-font:before { content: "\e671"; - color: #808080; + color: inherit; } .table-open-col-style-font .b-font:before { content: "\e672"; - color: #808080; + color: inherit; } .table-open-col-style-font:hover .b-font:before, .table-open-col-style-font:focus .b-font:before, .table-open-col-style-font.hover .b-font:before { content: "\e672"; - color: #808080; + color: inherit; } .table-open-col-style-font:active .b-font:before, .table-open-col-style-font.active .b-font:before { @@ -2917,7 +2917,7 @@ .table-open-col-style-font.native .b-font:before, .table-open-col-style-font.disabled .b-font:before { content: "\e672"; - color: #808080; + color: inherit; } .calculate-function-font .b-font:before { content: "\e6a3"; @@ -3164,124 +3164,124 @@ } .widget-combo-expand-font .b-font:before { content: "\e697"; - color: #808080; + color: inherit; } .widget-combo-expand-font.native .b-font:before, .widget-combo-expand-font.disabled .b-font:before { content: "\e697"; - color: #808080; + color: inherit; } .widget-combo-linkage-font .b-font:before { content: "\e63c"; - color: #808080; + color: inherit; } .widget-combo-linkage-font.native .b-font:before, .widget-combo-linkage-font.disabled .b-font:before { content: "\e63c"; - color: #808080; + color: inherit; } .widget-combo-rename-edit-font .b-font:before { content: "\e670"; - color: #808080; + color: inherit; } .widget-combo-rename-edit-font.native .b-font:before, .widget-combo-rename-edit-font.disabled .b-font:before { content: "\e670"; - color: #808080; + color: inherit; } .widget-combo-show-title-font .b-font:before { content: "\e64c"; - color: #808080; + color: inherit; } .widget-combo-show-title-font.native .b-font:before, .widget-combo-show-title-font.disabled .b-font:before { content: "\e64c"; - color: #808080; + color: inherit; } .widget-combo-title-left-font .b-font:before { content: "\e654"; - color: #808080; + color: inherit; } .widget-combo-title-left-font.native .b-font:before, .widget-combo-title-left-font.disabled .b-font:before { content: "\e654"; - color: #808080; + color: inherit; } .widget-combo-title-center-font .b-font:before { content: "\e64f"; - color: #808080; + color: inherit; } .widget-combo-title-center-font.native .b-font:before, .widget-combo-title-center-font.disabled .b-font:before { content: "\e64f"; - color: #808080; + color: inherit; } .widget-combo-show-filter-font .b-font:before { content: "\e60f"; - color: #808080; + color: inherit; } .widget-combo-show-filter-font.native .b-font:before, .widget-combo-show-filter-font.disabled .b-font:before { content: "\e60f"; - color: #808080; + color: inherit; } .widget-combo-export-excel-font .b-font:before { content: "\e635"; - color: #808080; + color: inherit; } .widget-combo-export-excel-font.native .b-font:before, .widget-combo-export-excel-font.disabled .b-font:before { content: "\e635"; - color: #808080; + color: inherit; } .widget-combo-copy .b-font:before { content: "\e610"; - color: #808080; + color: inherit; } .widget-combo-copy.native .b-font:before, .widget-combo-copy.disabled .b-font:before { content: "\e610"; - color: #808080; + color: inherit; } .widget-combo-delete .b-font:before { content: "\e605"; - color: #808080; + color: inherit; } .widget-combo-delete.native .b-font:before, .widget-combo-delete.disabled .b-font:before { content: "\e605"; - color: #808080; + color: inherit; } .widget-combo-asc-font .b-font:before { content: "\e63f"; - color: #808080; + color: inherit; } .widget-combo-asc-font.native .b-font:before, .widget-combo-asc-font.disabled .b-font:before { content: "\e63f"; - color: #808080; + color: inherit; } .widget-combo-des-font .b-font:before { content: "\e63a"; - color: #808080; + color: inherit; } .widget-combo-des-font.native .b-font:before, .widget-combo-des-font.disabled .b-font:before { content: "\e63a"; - color: #808080; + color: inherit; } .widget-combo-clear-font .b-font:before { content: "\e63d"; - color: #808080; + color: inherit; } .widget-combo-clear-font.native .b-font:before, .widget-combo-clear-font.disabled .b-font:before { content: "\e63d"; - color: #808080; + color: inherit; } .detail-table-popup-font .b-font:before { content: "\e6ac"; - color: #808080; + color: inherit; } .detail-table-popup-font:hover .b-font:before, .detail-table-popup-font:focus .b-font:before, @@ -3292,7 +3292,7 @@ .detail-table-popup-font.native .b-font:before, .detail-table-popup-font.disabled .b-font:before { content: "\e6ac"; - color: #808080; + color: inherit; } .chart-drill-up .b-font:before { content: "\e6ad"; @@ -3314,21 +3314,21 @@ } .report-filter-open-font .b-font:before { content: "\e648"; - color: #808080; + color: inherit; } .report-filter-open-font.native .b-font:before, .report-filter-open-font.disabled .b-font:before { content: "\e648"; - color: #808080; + color: inherit; } .report-filter-close-font .b-font:before { content: "\e645"; - color: #808080; + color: inherit; } .report-filter-close-font.native .b-font:before, .report-filter-close-font.disabled .b-font:before { content: "\e645"; - color: #808080; + color: inherit; } .report-apply-hangout-normal-font .b-font:before { content: "\e66d"; @@ -3449,21 +3449,21 @@ } .drill-push-up-font .b-font:before { content: "\e630"; - color: #808080; + color: inherit; } .drill-push-up-font.native .b-font:before, .drill-push-up-font.disabled .b-font:before { content: "\e630"; - color: #808080; + color: inherit; } .drill-push-down-font .b-font:before { content: "\e62d"; - color: #808080; + color: inherit; } .drill-push-down-font.native .b-font:before, .drill-push-down-font.disabled .b-font:before { content: "\e62d"; - color: #808080; + color: inherit; } .drag-tag-font .b-font:before { content: "\e600"; diff --git a/src/css/theme/dark.css b/src/css/theme/dark.css new file mode 100644 index 0000000000..203568cd4c --- /dev/null +++ b/src/css/theme/dark.css @@ -0,0 +1,10 @@ +/****添加计算宽度的--运算符直接需要space****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ +.bi-theme-dark { + background-color: #191a2c; + color: #b2b2b2; +} +.bi-theme-dark .bi-input { + color: #ffffff; +} diff --git a/src/css/base/single/editor/editor.record.css b/src/css/theme/default.css similarity index 68% rename from src/css/base/single/editor/editor.record.css rename to src/css/theme/default.css index 5252e6e7fe..2f6491e13f 100644 --- a/src/css/base/single/editor/editor.record.css +++ b/src/css/theme/default.css @@ -1,7 +1,3 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-record-editor .record-editor-text { - font-size: 12px; - background: #f4f4f4; -} diff --git a/src/css/theme/light.css b/src/css/theme/light.css new file mode 100644 index 0000000000..2f6491e13f --- /dev/null +++ b/src/css/theme/light.css @@ -0,0 +1,3 @@ +/****添加计算宽度的--运算符直接需要space****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ diff --git a/src/css/widget/downlist/combo.downlist.css b/src/css/widget/downlist/combo.downlist.css index edfed09c68..5e01fa8457 100644 --- a/src/css/widget/downlist/combo.downlist.css +++ b/src/css/widget/downlist/combo.downlist.css @@ -1,16 +1,6 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-down-list-combo .down-list-group.bi-combo-hover .bi-down-list-group-item, -.bi-down-list-combo .down-list-group.bi-combo-hover .bi-down-list-group-item .b-font:before { - background-color: #f4f4f4; -} -.bi-down-list-combo .down-list-group.bi-combo-hover .bi-down-list-group-item:disabled, -.bi-down-list-combo .down-list-group.bi-combo-hover .bi-down-list-group-item.disabled, -.bi-down-list-combo .down-list-group.bi-combo-hover .bi-down-list-group-item:disabled .b-font:before, -.bi-down-list-combo .down-list-group.bi-combo-hover .bi-down-list-group-item.disabled .b-font:before { - background-color: #ffffff; -} .bi-down-list-combo .bi-down-list-spliter { border-top: 1px solid #eaeaea; } diff --git a/src/css/widget/downlist/popup.downlist.css b/src/css/widget/downlist/popup.downlist.css index 0d60861477..0e82c44b1b 100644 --- a/src/css/widget/downlist/popup.downlist.css +++ b/src/css/widget/downlist/popup.downlist.css @@ -1,19 +1,6 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-down-list-popup .bi-down-list-item:hover, -.bi-down-list-popup .bi-down-list-item.hover { - background-color: #f4f4f4; -} -.bi-down-list-popup .bi-down-list-item.disabled, -.bi-down-list-popup .bi-down-list-item.disabled:hover, -.bi-down-list-popup .bi-down-list-item.disabled:active { - background-color: #ffffff; -} -.bi-down-list-popup .bi-down-list-item:active { - color: #009de3; - background-color: #f4f4f4; -} .bi-down-list-popup .bi-down-list-item .list-item-text { max-width: 203px; } diff --git a/src/css/widget/multiselect/trigger/button.checkselected.css b/src/css/widget/multiselect/trigger/button.checkselected.css index 5756a2ff77..1ebfc22ab3 100644 --- a/src/css/widget/multiselect/trigger/button.checkselected.css +++ b/src/css/widget/multiselect/trigger/button.checkselected.css @@ -10,3 +10,6 @@ background-color: #ffffff; z-index: 1; } +.bi-theme-dark .bi-multi-select-check-selected-button { + background-color: #191a2c; +} diff --git a/src/less/base/chart/chart.combine.less b/src/less/base/chart/chart.combine.less deleted file mode 100644 index 5a04261067..0000000000 --- a/src/less/base/chart/chart.combine.less +++ /dev/null @@ -1,13 +0,0 @@ -@import "../../bibase"; -.bi-combine-chart { - & .bi-linkage-list { - background-color: @background-color-default; - border: 1px solid @border-color-line; - z-index: @zIndex-tip; - & .bi-linkage-list-item { - &:hover { - background-color: @color-bi-background-gray; - } - } - } -} \ No newline at end of file diff --git a/src/less/base/single/editor/editor.record.less b/src/less/base/single/editor/editor.record.less deleted file mode 100644 index 9e20a744ba..0000000000 --- a/src/less/base/single/editor/editor.record.less +++ /dev/null @@ -1,8 +0,0 @@ -@import "../../../bibase"; - -.bi-record-editor{ - .record-editor-text{ - font-size: @font-size-12; - background: @color-bi-background-gray; - } -} \ No newline at end of file diff --git a/src/less/base/single/input/input.less b/src/less/base/single/input/input.less index 382527f879..c82699fb53 100644 --- a/src/less/base/single/input/input.less +++ b/src/less/base/single/input/input.less @@ -16,7 +16,4 @@ border: none; color:@color-bi-text-warning !important; } - &.disabled{ - background-color: white; - } } \ No newline at end of file diff --git a/src/less/base/table/table.grid.scrollbar.less b/src/less/base/table/table.grid.scrollbar.less index 408c42002e..515791b8ff 100644 --- a/src/less/base/table/table.grid.scrollbar.less +++ b/src/less/base/table/table.grid.scrollbar.less @@ -7,14 +7,14 @@ transition-timing-function: ease; user-select: none; background-color: rgba(0, 0, 0, 0.1); - border-radius:5px; + border-radius: 5px; } .scrollbar-layout-main-vertical { bottom: 0; right: 0; top: 0; - transition-property: background-color ; + transition-property: background-color; width: 10px; } @@ -27,7 +27,7 @@ bottom: 0; height: 10px; left: 0; - transition-property: background-color ; + transition-property: background-color; background-color: rgba(0, 0, 0, 0.1); } @@ -104,12 +104,26 @@ background-color: #c2c2c2; } +.bi-theme-dark { + .public-scrollbar-face:after { + background-color: #7d7d7d; + } +} + .public-scrollbar-main:hover .public-scrollbar-face:after, .public-scrollbar-main-active .public-scrollbar-face:after, .public-scrollbar-faceActive:after { background-color: #7d7d7d; } +.bi-theme-dark { + .public-scrollbar-main:hover .public-scrollbar-face:after, + .public-scrollbar-main-active .public-scrollbar-face:after, + .public-scrollbar-faceActive:after { + background-color: #c2c2c2; + } +} + //horizontalScrollbar .horizontal-scrollbar { bottom: 0; diff --git a/src/less/base/view/popupview.less b/src/less/base/view/popupview.less index 74b58045b0..4894479c57 100644 --- a/src/less/base/view/popupview.less +++ b/src/less/base/view/popupview.less @@ -1,6 +1,5 @@ @import "../../bibase"; - /**********BI.BIListView*************/ .bi-list-view { position: fixed !important; @@ -8,11 +7,11 @@ overflow-x: visible !important; overflow: visible !important; cursor: default; - & .list-view-outer{ + & .list-view-outer { border: 1px solid @color-bi-split-dark; .border-radius(2px); color: @color-bi-text-black; - background:@color-bi-background-default; + background: @color-bi-background-default; } & .list-view-toolbar { border-top: 1px solid @color-bi-split-light; @@ -21,8 +20,17 @@ & > .center-element { border-left: 1px solid @color-bi-split-light; } - & > .first-element{ + & > .first-element { border-left: none; } } +} + +.bi-theme-dark { + .bi-list-view { + & .list-view-outer { + color: @color-bi-text-theme-dark; + background: @color-bi-background-theme-dark; + } + } } \ No newline at end of file diff --git a/src/less/core/utils/common.less b/src/less/core/utils/common.less index 9b08351273..7dd5086eea 100644 --- a/src/less/core/utils/common.less +++ b/src/less/core/utils/common.less @@ -39,33 +39,119 @@ } //resize -.bi-resizer{ - background:@color-bi-background-virtual-blue; +.bi-resizer { + background: @color-bi-background-virtual-blue; .opacity(0.8); z-index: @zIndex-tip; } -.bi-z-index-mask{ +.bi-z-index-mask { background-color: @color-bi-background-black; .opacity(0.5); } +@color-list-item-hover: #04070d; .bi-list-item { .list-item(); } +.bi-theme-dark { + .bi-list-item { + &:hover, &.hover { + background-color: @color-list-item-hover; + color: @color-bi-text; + } + &.disabled { + &, &:hover, &:active { + background-color: transparent; + } + } + } +} + .bi-list-item-effect { .list-item-effect(); } +.bi-theme-dark { + .bi-list-item-effect { + &.active, &:active { + color: @color-bi-text-highlight; + } + &.disabled { + &, &:hover, &:active { + color: @color-bi-text-disabled; + } + } + } +} + .bi-list-item-hover { .list-item-hover(); } +.bi-theme-dark { + .bi-list-item-hover { + &:hover, &.hover { + color: @color-bi-text-highlight; + background-color: @color-list-item-hover; + } + &.disabled { + &, &:hover, &:active { + color: @color-bi-text-disabled; + background-color: transparent; + } + } + } +} + .bi-list-item-active { .list-item-active(); } +.bi-theme-dark { + .bi-list-item-active { + &:hover, &.hover { + background-color: @color-list-item-hover; + color: @color-bi-text; + } + &.active, &:active { + color: @color-bi-text-highlight; + background-color: @color-list-item-hover; + } + &.disabled { + &, &:hover, &:active { + background-color: transparent; + } + } + } +} + .bi-list-item-select { .list-item-select(); +} + +.bi-theme-dark { + .list-item-select { + &:hover, &.hover { + color: @color-bi-text-highlight; + background-color: @color-list-item-hover; + } + &:active, &.active { + color: @color-bi-text; + background-color: @color-bi-background-highlight; + & .bi-high-light { + color: @color-bi-text; + } + } + &.disabled { + &, &:hover, &:active { + color: @color-bi-text-disabled !important; + background-color: transparent !important; + & .bi-high-light { + color: @color-bi-text-disabled !important; + } + } + } + } } \ No newline at end of file diff --git a/src/less/image.less b/src/less/image.less index 78ffd747c5..9ae872c9f0 100644 --- a/src/less/image.less +++ b/src/less/image.less @@ -168,9 +168,9 @@ } // -@color-bi-font-native: #808080; +@color-bi-font-native: inherit; //active -@color-bi-font-hover: #808080; +@color-bi-font-hover: inherit; //hover @color-bi-font-active: #009de3; diff --git a/src/less/lib/colors.less b/src/less/lib/colors.less index 97c56da69f..1d15c62a00 100644 --- a/src/less/lib/colors.less +++ b/src/less/lib/colors.less @@ -3,8 +3,10 @@ // 色彩库,从constant.less中获取相关颜色,不要出现#xxxxxx /****** common color(常用颜色,可用于普遍场景) *****/ -//黑色字体颜色 +//默认字体颜色 @color-bi-text-black: @font-color-normal; +//深色主题默认字体颜色 +@color-bi-text-theme-dark: #b2b2b2; //深灰色字体颜色 @color-bi-text-dark: @font-color-dark; //灰色字体颜色 @@ -26,6 +28,8 @@ //默认背景 @color-bi-background-default: @background-color-default; +//深色主题默认背景 +@color-bi-background-theme-dark: #191A2C; //普通背景 @color-bi-background-normal: @background-color-normal; //黑色背景 diff --git a/src/less/lib/style.less b/src/less/lib/style.less index 4ee1508796..6b5bcc74a8 100644 --- a/src/less/lib/style.less +++ b/src/less/lib/style.less @@ -21,7 +21,7 @@ } &.disabled { &, &:hover, &:active { - color: @color-bi-text-black; + color: @color-bi-text-disabled; } } } @@ -34,7 +34,7 @@ } &.disabled { &, &:hover, &:active { - color: @color-bi-text-black; + color: @color-bi-text-disabled; background-color: @color-bi-background-default; } } diff --git a/src/less/resource/app.less b/src/less/resource/app.less index c41df04a84..12f841f65c 100644 --- a/src/less/resource/app.less +++ b/src/less/resource/app.less @@ -107,4 +107,18 @@ div, textarea { .border-radius(0); background-color: @scroll-thumb-color; } +} +.bi-theme-dark{ + div, textarea { + &::-webkit-scrollbar { + -webkit-appearance: none; + background-color: @color-bi-background-theme-dark; + width: 6px; + height: 6px; + } + &::-webkit-scrollbar-thumb { + .border-radius(0); + background-color: #7d7d7d; + } + } } \ No newline at end of file diff --git a/src/less/theme/dark.less b/src/less/theme/dark.less new file mode 100644 index 0000000000..7957da6f1f --- /dev/null +++ b/src/less/theme/dark.less @@ -0,0 +1,9 @@ +@import "../bibase"; + +.bi-theme-dark { + background-color: @color-bi-background-theme-dark; + color: @color-bi-text-theme-dark; + & .bi-input { + color: @color-bi-text; + } +} \ No newline at end of file diff --git a/src/less/theme/default.less b/src/less/theme/default.less new file mode 100644 index 0000000000..0edd5d4ac7 --- /dev/null +++ b/src/less/theme/default.less @@ -0,0 +1,5 @@ +@import "../bibase"; + +.bi-theme-default{ + +} \ No newline at end of file diff --git a/src/less/theme/light.less b/src/less/theme/light.less new file mode 100644 index 0000000000..d0c8634243 --- /dev/null +++ b/src/less/theme/light.less @@ -0,0 +1,4 @@ +@import "../bibase"; + +.bi-theme-light { +} \ No newline at end of file diff --git a/src/less/widget/downlist/combo.downlist.less b/src/less/widget/downlist/combo.downlist.less index 726ffb6638..1c9c95f5ba 100644 --- a/src/less/widget/downlist/combo.downlist.less +++ b/src/less/widget/downlist/combo.downlist.less @@ -4,18 +4,6 @@ .bi-down-list-combo{ & .down-list-group{ - &.bi-combo-hover{ - & .bi-down-list-group-item{ - &, & .b-font:before{ - background-color: @color-bi-background-gray; - } - &:disabled, &.disabled{ - &, & .b-font:before{ - background-color: @color-bi-background-default - } - } - } - } } & .bi-down-list-spliter{ border-top: 1px solid @color-bi-split-light; diff --git a/src/less/widget/downlist/popup.downlist.less b/src/less/widget/downlist/popup.downlist.less index 78e10e04a9..0dd179e4b4 100644 --- a/src/less/widget/downlist/popup.downlist.less +++ b/src/less/widget/downlist/popup.downlist.less @@ -2,18 +2,6 @@ .bi-down-list-popup { & .bi-down-list-item { - &:hover, &.hover { - background-color: @color-bi-background-gray; - } - &.disabled { - &, &:hover, &:active { - background-color: @color-bi-background-default; - } - } - &:active { - color: @color-bi-text-highlight; - background-color: @color-bi-background-gray; - } & .list-item-text { max-width: 203px; } diff --git a/src/less/widget/multiselect/trigger/button.checkselected.less b/src/less/widget/multiselect/trigger/button.checkselected.less index 20645ae5eb..a185e1d0e9 100644 --- a/src/less/widget/multiselect/trigger/button.checkselected.less +++ b/src/less/widget/multiselect/trigger/button.checkselected.less @@ -6,4 +6,10 @@ color: @color-bi-text-highlight; background-color: @color-bi-background-default; z-index: 1; +} + +.bi-theme-dark { + .bi-multi-select-check-selected-button { + background-color: @color-bi-background-theme-dark; + } } \ No newline at end of file diff --git a/src/widget/downlist/item.downlist.js b/src/widget/downlist/item.downlist.js index 0016e23455..5f8ffeaffe 100644 --- a/src/widget/downlist/item.downlist.js +++ b/src/widget/downlist/item.downlist.js @@ -2,7 +2,7 @@ BI.DownListItem = BI.inherit(BI.Single, { _defaultConfig: function () { var conf = BI.DownListItem.superclass._defaultConfig.apply(this, arguments); return BI.extend(conf, { - baseCls: "bi-down-list-item", + baseCls: "bi-down-list-item bi-list-item-active", cls: "", height: 25, logic: {