From f4818b702c67dd31bead067ec2bad840eb16c521 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Tue, 7 Aug 2018 11:32:05 +0800 Subject: [PATCH] update --- demo/js/case/demo.click.effect.js | 7 +- dist/base.js | 3 + dist/bundle.css | 280 +++++++++--------- dist/bundle.js | 15 +- dist/core.css | 280 +++++++++--------- dist/core_without_normalize.css | 280 +++++++++--------- dist/demo.js | 7 +- dist/fineui.css | 280 +++++++++--------- dist/fineui.js | 15 +- dist/widget.js | 12 +- src/base/tree/treeview.js | 3 + src/css/core/utils/common.css | 280 +++++++++--------- src/css/widget/singleselect/singleselect.css | 22 ++ src/less/core/utils/common.less | 209 +++++++------ src/widget/numbereditor/number.editor.js | 4 +- .../singleslider/button/iconbutton.slider.js | 2 +- src/widget/year/combo.year.js | 2 +- src/widget/yearmonth/combo.yearmonth.js | 2 +- src/widget/yearquarter/combo.yearquarter.js | 2 +- 19 files changed, 855 insertions(+), 850 deletions(-) create mode 100644 src/css/widget/singleselect/singleselect.css diff --git a/demo/js/case/demo.click.effect.js b/demo/js/case/demo.click.effect.js index 5a2f5f8a1..4d36952c9 100644 --- a/demo/js/case/demo.click.effect.js +++ b/demo/js/case/demo.click.effect.js @@ -21,15 +21,14 @@ Demo.Func = BI.inherit(BI.Widget, { }, { text: "bi-list-item-active2", cls: "bi-list-item-active2 close-font" - }, { - text: "bi-list-item-active3", - cls: "bi-list-item-active3 close-font" }, { text: "bi-list-item-select", cls: "bi-list-item-select close-font" + }, { + text: "bi-list-item-select2", + cls: "bi-list-item-select2 close-font" }], { type: "bi.icon_text_item", - disabled: true, logic: { dynamic: true } diff --git a/dist/base.js b/dist/base.js index 4e0e78ad4..98f27236a 100644 --- a/dist/base.js +++ b/dist/base.js @@ -1644,6 +1644,9 @@ BI.TreeView = BI.inherit(BI.Pane, { if(BI.isNotNull(o.value)){ this.setSelectedValue(o.value); } + if (BI.isIE9Below()) { + this.element.addClass("hack"); + } }, _createTree: function () { diff --git a/dist/bundle.css b/dist/bundle.css index ce4a62ac8..6f06a70cc 100644 --- a/dist/bundle.css +++ b/dist/bundle.css @@ -837,6 +837,8 @@ textarea { .bi-list-item-active2:hover, .bi-list-item-active2.hover { color: #232e40; + background-color: rgba(54, 133, 242, 0.06); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2); } .bi-list-item-active2:hover .bi-input, .bi-list-item-active2.hover .bi-input { @@ -846,34 +848,19 @@ textarea { .bi-list-item-active2.hover .bi-textarea { color: #232e40; } -.bi-list-item-active2:hover.bi-border, -.bi-list-item-active2.hover.bi-border { - border-color: #3685f2; -} -.bi-list-item-active2:active { - color: #3685f2; -} -.bi-list-item-active2:active .bi-input { - color: #3685f2; -} -.bi-list-item-active2:active .bi-textarea { - color: #3685f2; -} -.bi-list-item-active2:active.bi-border { - border-color: #3685f2; -} +.bi-list-item-active2:active, .bi-list-item-active2.active { - color: #ffffff; - background-color: #3685f2; + color: #3685f2; + background-color: rgba(54, 133, 242, 0.06); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2); } +.bi-list-item-active2:active .bi-input, .bi-list-item-active2.active .bi-input { - color: #ffffff; + color: #3685f2; } +.bi-list-item-active2:active .bi-textarea, .bi-list-item-active2.active .bi-textarea { - color: #ffffff; -} -.bi-list-item-active2.active.bi-border { - border-color: #3685f2; + color: #3685f2; } .bi-list-item-active2.disabled, .bi-list-item-active2.disabled:hover, @@ -899,7 +886,8 @@ textarea { .bi-theme-dark .bi-list-item-active2:hover, .bi-theme-dark .bi-list-item-active2.hover { color: #ffffff; - background-color: #242640; + background-color: rgba(54, 133, 242, 0.06); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2); } .bi-theme-dark .bi-list-item-active2:hover .bi-input, .bi-theme-dark .bi-list-item-active2.hover .bi-input { @@ -909,17 +897,18 @@ textarea { .bi-theme-dark .bi-list-item-active2.hover .bi-textarea { color: #ffffff; } -.bi-theme-dark .bi-list-item-active2.active, -.bi-theme-dark .bi-list-item-active2:active { +.bi-theme-dark .bi-list-item-active2:active, +.bi-theme-dark .bi-list-item-active2.active { color: #3685f2; - background-color: #242640; + background-color: rgba(54, 133, 242, 0.06); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2); } -.bi-theme-dark .bi-list-item-active2.active .bi-input, -.bi-theme-dark .bi-list-item-active2:active .bi-input { +.bi-theme-dark .bi-list-item-active2:active .bi-input, +.bi-theme-dark .bi-list-item-active2.active .bi-input { color: #3685f2; } -.bi-theme-dark .bi-list-item-active2.active .bi-textarea, -.bi-theme-dark .bi-list-item-active2:active .bi-textarea { +.bi-theme-dark .bi-list-item-active2:active .bi-textarea, +.bi-theme-dark .bi-list-item-active2.active .bi-textarea { color: #3685f2; } .bi-theme-dark .bi-list-item-active2.disabled, @@ -943,104 +932,6 @@ textarea { .bi-theme-dark .bi-list-item-active2.disabled:active .bi-high-light { color: #878d9f !important; } -.bi-list-item-active3:hover, -.bi-list-item-active3.hover { - color: #232e40; - background-color: rgba(54, 133, 242, 0.06); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2); -} -.bi-list-item-active3:hover .bi-input, -.bi-list-item-active3.hover .bi-input { - color: #232e40; -} -.bi-list-item-active3:hover .bi-textarea, -.bi-list-item-active3.hover .bi-textarea { - color: #232e40; -} -.bi-list-item-active3:active, -.bi-list-item-active3.active { - color: #3685f2; - background-color: rgba(54, 133, 242, 0.06); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2); -} -.bi-list-item-active3:active .bi-input, -.bi-list-item-active3.active .bi-input { - color: #3685f2; -} -.bi-list-item-active3:active .bi-textarea, -.bi-list-item-active3.active .bi-textarea { - color: #3685f2; -} -.bi-list-item-active3.disabled, -.bi-list-item-active3.disabled:hover, -.bi-list-item-active3.disabled:active { - background-color: transparent !important; - color: #9ea6b2 !important; -} -.bi-list-item-active3.disabled .bi-input, -.bi-list-item-active3.disabled:hover .bi-input, -.bi-list-item-active3.disabled:active .bi-input { - color: #9ea6b2 !important; -} -.bi-list-item-active3.disabled .bi-textarea, -.bi-list-item-active3.disabled:hover .bi-textarea, -.bi-list-item-active3.disabled:active .bi-textarea { - color: #9ea6b2 !important; -} -.bi-list-item-active3.disabled .bi-high-light, -.bi-list-item-active3.disabled:hover .bi-high-light, -.bi-list-item-active3.disabled:active .bi-high-light { - color: #9ea6b2 !important; -} -.bi-theme-dark .bi-list-item-active3:hover, -.bi-theme-dark .bi-list-item-active3.hover { - color: #ffffff; - background-color: rgba(54, 133, 242, 0.06); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2); -} -.bi-theme-dark .bi-list-item-active3:hover .bi-input, -.bi-theme-dark .bi-list-item-active3.hover .bi-input { - color: #ffffff; -} -.bi-theme-dark .bi-list-item-active3:hover .bi-textarea, -.bi-theme-dark .bi-list-item-active3.hover .bi-textarea { - color: #ffffff; -} -.bi-theme-dark .bi-list-item-active3:active, -.bi-theme-dark .bi-list-item-active3.active { - color: #3685f2; - background-color: rgba(54, 133, 242, 0.06); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2); -} -.bi-theme-dark .bi-list-item-active3:active .bi-input, -.bi-theme-dark .bi-list-item-active3.active .bi-input { - color: #3685f2; -} -.bi-theme-dark .bi-list-item-active3:active .bi-textarea, -.bi-theme-dark .bi-list-item-active3.active .bi-textarea { - color: #3685f2; -} -.bi-theme-dark .bi-list-item-active3.disabled, -.bi-theme-dark .bi-list-item-active3.disabled:hover, -.bi-theme-dark .bi-list-item-active3.disabled:active { - background-color: transparent !important; - color: #878d9f !important; -} -.bi-theme-dark .bi-list-item-active3.disabled .bi-input, -.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-input, -.bi-theme-dark .bi-list-item-active3.disabled:active .bi-input { - color: #878d9f !important; -} -.bi-theme-dark .bi-list-item-active3.disabled .bi-textarea, -.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-textarea, -.bi-theme-dark .bi-list-item-active3.disabled:active .bi-textarea { - color: #878d9f !important; -} -.bi-theme-dark .bi-list-item-active3.disabled .bi-high-light, -.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-high-light, -.bi-theme-dark .bi-list-item-active3.disabled:active .bi-high-light { - color: #878d9f !important; -} .bi-list-item-select:hover, .bi-list-item-select.hover { background-color: rgba(54, 133, 242, 0.06); @@ -1180,29 +1071,134 @@ textarea { } .bi-list-item-select2:hover, .bi-list-item-select2.hover { - background-color: #f7f8fa; + color: #232e40; +} +.bi-list-item-select2:hover .bi-input, +.bi-list-item-select2.hover .bi-input { + color: #232e40; +} +.bi-list-item-select2:hover .bi-textarea, +.bi-list-item-select2.hover .bi-textarea { + color: #232e40; +} +.bi-list-item-select2:hover.bi-border, +.bi-list-item-select2.hover.bi-border { + border-color: #3685f2; +} +.bi-list-item-select2:active { + color: #3685f2; +} +.bi-list-item-select2:active .bi-input { + color: #3685f2; +} +.bi-list-item-select2:active .bi-textarea { + color: #3685f2; +} +.bi-list-item-select2:active.bi-border { + border-color: #3685f2; } -.bi-list-item-select2:active, .bi-list-item-select2.active { color: #ffffff; - background-color: #f7f8fa; + background-color: #3685f2; } -.bi-list-item-select2:active .bi-input, .bi-list-item-select2.active .bi-input { - color: #3685f2; + color: #ffffff; } -.bi-list-item-select2:active .bi-textarea, .bi-list-item-select2.active .bi-textarea { - color: #3685f2; -} -.bi-list-item-select2:active .bi-high-light, -.bi-list-item-select2.active .bi-high-light { color: #ffffff; } +.bi-list-item-select2.active.bi-border { + border-color: #3685f2; +} +.bi-list-item-select2.disabled, .bi-list-item-select2.disabled:hover, -.bi-list-item-select2.disabled.hover, -.bi-list-item-select2.disabled:active, -.bi-list-item-select2.disabled.active { +.bi-list-item-select2.disabled:active { + background-color: transparent !important; + color: #9ea6b2 !important; +} +.bi-list-item-select2.disabled .bi-input, +.bi-list-item-select2.disabled:hover .bi-input, +.bi-list-item-select2.disabled:active .bi-input { + color: #9ea6b2 !important; +} +.bi-list-item-select2.disabled .bi-textarea, +.bi-list-item-select2.disabled:hover .bi-textarea, +.bi-list-item-select2.disabled:active .bi-textarea { + color: #9ea6b2 !important; +} +.bi-list-item-select2.disabled .bi-high-light, +.bi-list-item-select2.disabled:hover .bi-high-light, +.bi-list-item-select2.disabled:active .bi-high-light { + color: #9ea6b2 !important; +} +.bi-theme-dark .bi-list-item-select2:hover, +.bi-theme-dark .bi-list-item-select2.hover { + color: #ffffff; + background-color: #242640; +} +.bi-theme-dark .bi-list-item-select2:hover .bi-input, +.bi-theme-dark .bi-list-item-select2.hover .bi-input { + color: #ffffff; +} +.bi-theme-dark .bi-list-item-select2:hover .bi-textarea, +.bi-theme-dark .bi-list-item-select2.hover .bi-textarea { + color: #ffffff; +} +.bi-theme-dark .bi-list-item-select2.active, +.bi-theme-dark .bi-list-item-select2:active { + color: #3685f2; + background-color: #242640; +} +.bi-theme-dark .bi-list-item-select2.active .bi-input, +.bi-theme-dark .bi-list-item-select2:active .bi-input { + color: #3685f2; +} +.bi-theme-dark .bi-list-item-select2.active .bi-textarea, +.bi-theme-dark .bi-list-item-select2:active .bi-textarea { + color: #3685f2; +} +.bi-theme-dark .bi-list-item-select2.disabled, +.bi-theme-dark .bi-list-item-select2.disabled:hover, +.bi-theme-dark .bi-list-item-select2.disabled:active { + background-color: transparent !important; + color: #878d9f !important; +} +.bi-theme-dark .bi-list-item-select2.disabled .bi-input, +.bi-theme-dark .bi-list-item-select2.disabled:hover .bi-input, +.bi-theme-dark .bi-list-item-select2.disabled:active .bi-input { + color: #878d9f !important; +} +.bi-theme-dark .bi-list-item-select2.disabled .bi-textarea, +.bi-theme-dark .bi-list-item-select2.disabled:hover .bi-textarea, +.bi-theme-dark .bi-list-item-select2.disabled:active .bi-textarea { + color: #878d9f !important; +} +.bi-theme-dark .bi-list-item-select2.disabled .bi-high-light, +.bi-theme-dark .bi-list-item-select2.disabled:hover .bi-high-light, +.bi-theme-dark .bi-list-item-select2.disabled:active .bi-high-light { + color: #878d9f !important; +} +.bi-list-item-select3:hover, +.bi-list-item-select3.hover { + background-color: #f7f8fa; +} +.bi-list-item-select3:active, +.bi-list-item-select3.active { + color: #3685f2; + background-color: #f7f8fa; +} +.bi-list-item-select3:active .bi-input, +.bi-list-item-select3.active .bi-input { + color: #3685f2; +} +.bi-list-item-select3:active .bi-textarea, +.bi-list-item-select3.active .bi-textarea { + color: #3685f2; +} +.bi-list-item-select3.disabled:hover, +.bi-list-item-select3.disabled.hover, +.bi-list-item-select3.disabled:active, +.bi-list-item-select3.disabled.active { background-color: #ffffff !important; } .bi-theme-dark .bi-list-item-select:hover, diff --git a/dist/bundle.js b/dist/bundle.js index ad8391b71..af285924e 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -37566,6 +37566,9 @@ BI.TreeView = BI.inherit(BI.Pane, { if(BI.isNotNull(o.value)){ this.setSelectedValue(o.value); } + if (BI.isIE9Below()) { + this.element.addClass("hack"); + } }, _createTree: function () { @@ -102563,7 +102566,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, { type: "bi.icon_button", forceNotSelected: true, trigger: "lclick,", - cls: "add-up-font top-button bi-border-left bi-list-item-active3 icon-size-12" + cls: "add-up-font top-button bi-border-left bi-list-item-active2 icon-size-12" }); this.topBtn.on(BI.IconButton.EVENT_CHANGE, function () { self._finetuning(o.step); @@ -102574,7 +102577,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, { type: "bi.icon_button", trigger: "lclick,", forceNotSelected: true, - cls: "minus-down-font bottom-button bi-border-left bi-list-item-active3 icon-size-12" + cls: "minus-down-font bottom-button bi-border-left bi-list-item-active2 icon-size-12" }); this.bottomBtn.on(BI.IconButton.EVENT_CHANGE, function () { self._finetuning(-o.step); @@ -108535,7 +108538,7 @@ BI.SliderIconButton = BI.inherit(BI.Widget, { el: { type: "bi.text_button", forceNotSelected: true, - cls: "slider-button bi-list-item-select2", + cls: "slider-button bi-list-item-select3", ref: function () { self.slider = this; } @@ -110372,7 +110375,7 @@ BI.StaticYearCard.EVENT_CHANGE = "EVENT_CHANGE"; BI.shortcut("bi.static_year_card", BI.StaticYearCard);BI.DynamicYearCombo = BI.inherit(BI.Widget, { props: { - baseCls: "bi-year-combo bi-border", + baseCls: "bi-year-combo bi-border bi-focus-shadow", behaviors: {}, min: "1900-01-01", // 最小日期 max: "2099-12-31", // 最大日期 @@ -111105,7 +111108,7 @@ BI.shortcut("bi.static_year_month_card", BI.StaticYearMonthCard); BI.DynamicYearMonthCombo = BI.inherit(BI.Single, { props: { - baseCls: "bi-year-month-combo bi-border", + baseCls: "bi-year-month-combo bi-border bi-focus-shadow", behaviors: {}, min: "1900-01-01", // 最小日期 max: "2099-12-31", // 最大日期 @@ -112133,7 +112136,7 @@ BI.shortcut("bi.static_year_quarter_card", BI.StaticYearQuarterCard); BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, { props: { - baseCls: "bi-year-quarter-combo bi-border", + baseCls: "bi-year-quarter-combo bi-border bi-focus-shadow", behaviors: {}, min: "1900-01-01", // 最小日期 max: "2099-12-31", // 最大日期 diff --git a/dist/core.css b/dist/core.css index bef07138a..f2f6da376 100644 --- a/dist/core.css +++ b/dist/core.css @@ -837,6 +837,8 @@ textarea { .bi-list-item-active2:hover, .bi-list-item-active2.hover { color: #232e40; + background-color: rgba(54, 133, 242, 0.06); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2); } .bi-list-item-active2:hover .bi-input, .bi-list-item-active2.hover .bi-input { @@ -846,34 +848,19 @@ textarea { .bi-list-item-active2.hover .bi-textarea { color: #232e40; } -.bi-list-item-active2:hover.bi-border, -.bi-list-item-active2.hover.bi-border { - border-color: #3685f2; -} -.bi-list-item-active2:active { - color: #3685f2; -} -.bi-list-item-active2:active .bi-input { - color: #3685f2; -} -.bi-list-item-active2:active .bi-textarea { - color: #3685f2; -} -.bi-list-item-active2:active.bi-border { - border-color: #3685f2; -} +.bi-list-item-active2:active, .bi-list-item-active2.active { - color: #ffffff; - background-color: #3685f2; + color: #3685f2; + background-color: rgba(54, 133, 242, 0.06); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2); } +.bi-list-item-active2:active .bi-input, .bi-list-item-active2.active .bi-input { - color: #ffffff; + color: #3685f2; } +.bi-list-item-active2:active .bi-textarea, .bi-list-item-active2.active .bi-textarea { - color: #ffffff; -} -.bi-list-item-active2.active.bi-border { - border-color: #3685f2; + color: #3685f2; } .bi-list-item-active2.disabled, .bi-list-item-active2.disabled:hover, @@ -899,7 +886,8 @@ textarea { .bi-theme-dark .bi-list-item-active2:hover, .bi-theme-dark .bi-list-item-active2.hover { color: #ffffff; - background-color: #242640; + background-color: rgba(54, 133, 242, 0.06); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2); } .bi-theme-dark .bi-list-item-active2:hover .bi-input, .bi-theme-dark .bi-list-item-active2.hover .bi-input { @@ -909,17 +897,18 @@ textarea { .bi-theme-dark .bi-list-item-active2.hover .bi-textarea { color: #ffffff; } -.bi-theme-dark .bi-list-item-active2.active, -.bi-theme-dark .bi-list-item-active2:active { +.bi-theme-dark .bi-list-item-active2:active, +.bi-theme-dark .bi-list-item-active2.active { color: #3685f2; - background-color: #242640; + background-color: rgba(54, 133, 242, 0.06); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2); } -.bi-theme-dark .bi-list-item-active2.active .bi-input, -.bi-theme-dark .bi-list-item-active2:active .bi-input { +.bi-theme-dark .bi-list-item-active2:active .bi-input, +.bi-theme-dark .bi-list-item-active2.active .bi-input { color: #3685f2; } -.bi-theme-dark .bi-list-item-active2.active .bi-textarea, -.bi-theme-dark .bi-list-item-active2:active .bi-textarea { +.bi-theme-dark .bi-list-item-active2:active .bi-textarea, +.bi-theme-dark .bi-list-item-active2.active .bi-textarea { color: #3685f2; } .bi-theme-dark .bi-list-item-active2.disabled, @@ -943,104 +932,6 @@ textarea { .bi-theme-dark .bi-list-item-active2.disabled:active .bi-high-light { color: #878d9f !important; } -.bi-list-item-active3:hover, -.bi-list-item-active3.hover { - color: #232e40; - background-color: rgba(54, 133, 242, 0.06); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2); -} -.bi-list-item-active3:hover .bi-input, -.bi-list-item-active3.hover .bi-input { - color: #232e40; -} -.bi-list-item-active3:hover .bi-textarea, -.bi-list-item-active3.hover .bi-textarea { - color: #232e40; -} -.bi-list-item-active3:active, -.bi-list-item-active3.active { - color: #3685f2; - background-color: rgba(54, 133, 242, 0.06); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2); -} -.bi-list-item-active3:active .bi-input, -.bi-list-item-active3.active .bi-input { - color: #3685f2; -} -.bi-list-item-active3:active .bi-textarea, -.bi-list-item-active3.active .bi-textarea { - color: #3685f2; -} -.bi-list-item-active3.disabled, -.bi-list-item-active3.disabled:hover, -.bi-list-item-active3.disabled:active { - background-color: transparent !important; - color: #9ea6b2 !important; -} -.bi-list-item-active3.disabled .bi-input, -.bi-list-item-active3.disabled:hover .bi-input, -.bi-list-item-active3.disabled:active .bi-input { - color: #9ea6b2 !important; -} -.bi-list-item-active3.disabled .bi-textarea, -.bi-list-item-active3.disabled:hover .bi-textarea, -.bi-list-item-active3.disabled:active .bi-textarea { - color: #9ea6b2 !important; -} -.bi-list-item-active3.disabled .bi-high-light, -.bi-list-item-active3.disabled:hover .bi-high-light, -.bi-list-item-active3.disabled:active .bi-high-light { - color: #9ea6b2 !important; -} -.bi-theme-dark .bi-list-item-active3:hover, -.bi-theme-dark .bi-list-item-active3.hover { - color: #ffffff; - background-color: rgba(54, 133, 242, 0.06); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2); -} -.bi-theme-dark .bi-list-item-active3:hover .bi-input, -.bi-theme-dark .bi-list-item-active3.hover .bi-input { - color: #ffffff; -} -.bi-theme-dark .bi-list-item-active3:hover .bi-textarea, -.bi-theme-dark .bi-list-item-active3.hover .bi-textarea { - color: #ffffff; -} -.bi-theme-dark .bi-list-item-active3:active, -.bi-theme-dark .bi-list-item-active3.active { - color: #3685f2; - background-color: rgba(54, 133, 242, 0.06); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2); -} -.bi-theme-dark .bi-list-item-active3:active .bi-input, -.bi-theme-dark .bi-list-item-active3.active .bi-input { - color: #3685f2; -} -.bi-theme-dark .bi-list-item-active3:active .bi-textarea, -.bi-theme-dark .bi-list-item-active3.active .bi-textarea { - color: #3685f2; -} -.bi-theme-dark .bi-list-item-active3.disabled, -.bi-theme-dark .bi-list-item-active3.disabled:hover, -.bi-theme-dark .bi-list-item-active3.disabled:active { - background-color: transparent !important; - color: #878d9f !important; -} -.bi-theme-dark .bi-list-item-active3.disabled .bi-input, -.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-input, -.bi-theme-dark .bi-list-item-active3.disabled:active .bi-input { - color: #878d9f !important; -} -.bi-theme-dark .bi-list-item-active3.disabled .bi-textarea, -.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-textarea, -.bi-theme-dark .bi-list-item-active3.disabled:active .bi-textarea { - color: #878d9f !important; -} -.bi-theme-dark .bi-list-item-active3.disabled .bi-high-light, -.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-high-light, -.bi-theme-dark .bi-list-item-active3.disabled:active .bi-high-light { - color: #878d9f !important; -} .bi-list-item-select:hover, .bi-list-item-select.hover { background-color: rgba(54, 133, 242, 0.06); @@ -1180,29 +1071,134 @@ textarea { } .bi-list-item-select2:hover, .bi-list-item-select2.hover { - background-color: #f7f8fa; + color: #232e40; +} +.bi-list-item-select2:hover .bi-input, +.bi-list-item-select2.hover .bi-input { + color: #232e40; +} +.bi-list-item-select2:hover .bi-textarea, +.bi-list-item-select2.hover .bi-textarea { + color: #232e40; +} +.bi-list-item-select2:hover.bi-border, +.bi-list-item-select2.hover.bi-border { + border-color: #3685f2; +} +.bi-list-item-select2:active { + color: #3685f2; +} +.bi-list-item-select2:active .bi-input { + color: #3685f2; +} +.bi-list-item-select2:active .bi-textarea { + color: #3685f2; +} +.bi-list-item-select2:active.bi-border { + border-color: #3685f2; } -.bi-list-item-select2:active, .bi-list-item-select2.active { color: #ffffff; - background-color: #f7f8fa; + background-color: #3685f2; } -.bi-list-item-select2:active .bi-input, .bi-list-item-select2.active .bi-input { - color: #3685f2; + color: #ffffff; } -.bi-list-item-select2:active .bi-textarea, .bi-list-item-select2.active .bi-textarea { - color: #3685f2; -} -.bi-list-item-select2:active .bi-high-light, -.bi-list-item-select2.active .bi-high-light { color: #ffffff; } +.bi-list-item-select2.active.bi-border { + border-color: #3685f2; +} +.bi-list-item-select2.disabled, .bi-list-item-select2.disabled:hover, -.bi-list-item-select2.disabled.hover, -.bi-list-item-select2.disabled:active, -.bi-list-item-select2.disabled.active { +.bi-list-item-select2.disabled:active { + background-color: transparent !important; + color: #9ea6b2 !important; +} +.bi-list-item-select2.disabled .bi-input, +.bi-list-item-select2.disabled:hover .bi-input, +.bi-list-item-select2.disabled:active .bi-input { + color: #9ea6b2 !important; +} +.bi-list-item-select2.disabled .bi-textarea, +.bi-list-item-select2.disabled:hover .bi-textarea, +.bi-list-item-select2.disabled:active .bi-textarea { + color: #9ea6b2 !important; +} +.bi-list-item-select2.disabled .bi-high-light, +.bi-list-item-select2.disabled:hover .bi-high-light, +.bi-list-item-select2.disabled:active .bi-high-light { + color: #9ea6b2 !important; +} +.bi-theme-dark .bi-list-item-select2:hover, +.bi-theme-dark .bi-list-item-select2.hover { + color: #ffffff; + background-color: #242640; +} +.bi-theme-dark .bi-list-item-select2:hover .bi-input, +.bi-theme-dark .bi-list-item-select2.hover .bi-input { + color: #ffffff; +} +.bi-theme-dark .bi-list-item-select2:hover .bi-textarea, +.bi-theme-dark .bi-list-item-select2.hover .bi-textarea { + color: #ffffff; +} +.bi-theme-dark .bi-list-item-select2.active, +.bi-theme-dark .bi-list-item-select2:active { + color: #3685f2; + background-color: #242640; +} +.bi-theme-dark .bi-list-item-select2.active .bi-input, +.bi-theme-dark .bi-list-item-select2:active .bi-input { + color: #3685f2; +} +.bi-theme-dark .bi-list-item-select2.active .bi-textarea, +.bi-theme-dark .bi-list-item-select2:active .bi-textarea { + color: #3685f2; +} +.bi-theme-dark .bi-list-item-select2.disabled, +.bi-theme-dark .bi-list-item-select2.disabled:hover, +.bi-theme-dark .bi-list-item-select2.disabled:active { + background-color: transparent !important; + color: #878d9f !important; +} +.bi-theme-dark .bi-list-item-select2.disabled .bi-input, +.bi-theme-dark .bi-list-item-select2.disabled:hover .bi-input, +.bi-theme-dark .bi-list-item-select2.disabled:active .bi-input { + color: #878d9f !important; +} +.bi-theme-dark .bi-list-item-select2.disabled .bi-textarea, +.bi-theme-dark .bi-list-item-select2.disabled:hover .bi-textarea, +.bi-theme-dark .bi-list-item-select2.disabled:active .bi-textarea { + color: #878d9f !important; +} +.bi-theme-dark .bi-list-item-select2.disabled .bi-high-light, +.bi-theme-dark .bi-list-item-select2.disabled:hover .bi-high-light, +.bi-theme-dark .bi-list-item-select2.disabled:active .bi-high-light { + color: #878d9f !important; +} +.bi-list-item-select3:hover, +.bi-list-item-select3.hover { + background-color: #f7f8fa; +} +.bi-list-item-select3:active, +.bi-list-item-select3.active { + color: #3685f2; + background-color: #f7f8fa; +} +.bi-list-item-select3:active .bi-input, +.bi-list-item-select3.active .bi-input { + color: #3685f2; +} +.bi-list-item-select3:active .bi-textarea, +.bi-list-item-select3.active .bi-textarea { + color: #3685f2; +} +.bi-list-item-select3.disabled:hover, +.bi-list-item-select3.disabled.hover, +.bi-list-item-select3.disabled:active, +.bi-list-item-select3.disabled.active { background-color: #ffffff !important; } .bi-theme-dark .bi-list-item-select:hover, diff --git a/dist/core_without_normalize.css b/dist/core_without_normalize.css index 226643bfb..c0b09ff36 100644 --- a/dist/core_without_normalize.css +++ b/dist/core_without_normalize.css @@ -556,6 +556,8 @@ textarea { .bi-list-item-active2:hover, .bi-list-item-active2.hover { color: #232e40; + background-color: rgba(54, 133, 242, 0.06); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2); } .bi-list-item-active2:hover .bi-input, .bi-list-item-active2.hover .bi-input { @@ -565,34 +567,19 @@ textarea { .bi-list-item-active2.hover .bi-textarea { color: #232e40; } -.bi-list-item-active2:hover.bi-border, -.bi-list-item-active2.hover.bi-border { - border-color: #3685f2; -} -.bi-list-item-active2:active { - color: #3685f2; -} -.bi-list-item-active2:active .bi-input { - color: #3685f2; -} -.bi-list-item-active2:active .bi-textarea { - color: #3685f2; -} -.bi-list-item-active2:active.bi-border { - border-color: #3685f2; -} +.bi-list-item-active2:active, .bi-list-item-active2.active { - color: #ffffff; - background-color: #3685f2; + color: #3685f2; + background-color: rgba(54, 133, 242, 0.06); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2); } +.bi-list-item-active2:active .bi-input, .bi-list-item-active2.active .bi-input { - color: #ffffff; + color: #3685f2; } +.bi-list-item-active2:active .bi-textarea, .bi-list-item-active2.active .bi-textarea { - color: #ffffff; -} -.bi-list-item-active2.active.bi-border { - border-color: #3685f2; + color: #3685f2; } .bi-list-item-active2.disabled, .bi-list-item-active2.disabled:hover, @@ -618,7 +605,8 @@ textarea { .bi-theme-dark .bi-list-item-active2:hover, .bi-theme-dark .bi-list-item-active2.hover { color: #ffffff; - background-color: #242640; + background-color: rgba(54, 133, 242, 0.06); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2); } .bi-theme-dark .bi-list-item-active2:hover .bi-input, .bi-theme-dark .bi-list-item-active2.hover .bi-input { @@ -628,17 +616,18 @@ textarea { .bi-theme-dark .bi-list-item-active2.hover .bi-textarea { color: #ffffff; } -.bi-theme-dark .bi-list-item-active2.active, -.bi-theme-dark .bi-list-item-active2:active { +.bi-theme-dark .bi-list-item-active2:active, +.bi-theme-dark .bi-list-item-active2.active { color: #3685f2; - background-color: #242640; + background-color: rgba(54, 133, 242, 0.06); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2); } -.bi-theme-dark .bi-list-item-active2.active .bi-input, -.bi-theme-dark .bi-list-item-active2:active .bi-input { +.bi-theme-dark .bi-list-item-active2:active .bi-input, +.bi-theme-dark .bi-list-item-active2.active .bi-input { color: #3685f2; } -.bi-theme-dark .bi-list-item-active2.active .bi-textarea, -.bi-theme-dark .bi-list-item-active2:active .bi-textarea { +.bi-theme-dark .bi-list-item-active2:active .bi-textarea, +.bi-theme-dark .bi-list-item-active2.active .bi-textarea { color: #3685f2; } .bi-theme-dark .bi-list-item-active2.disabled, @@ -662,104 +651,6 @@ textarea { .bi-theme-dark .bi-list-item-active2.disabled:active .bi-high-light { color: #878d9f !important; } -.bi-list-item-active3:hover, -.bi-list-item-active3.hover { - color: #232e40; - background-color: rgba(54, 133, 242, 0.06); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2); -} -.bi-list-item-active3:hover .bi-input, -.bi-list-item-active3.hover .bi-input { - color: #232e40; -} -.bi-list-item-active3:hover .bi-textarea, -.bi-list-item-active3.hover .bi-textarea { - color: #232e40; -} -.bi-list-item-active3:active, -.bi-list-item-active3.active { - color: #3685f2; - background-color: rgba(54, 133, 242, 0.06); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2); -} -.bi-list-item-active3:active .bi-input, -.bi-list-item-active3.active .bi-input { - color: #3685f2; -} -.bi-list-item-active3:active .bi-textarea, -.bi-list-item-active3.active .bi-textarea { - color: #3685f2; -} -.bi-list-item-active3.disabled, -.bi-list-item-active3.disabled:hover, -.bi-list-item-active3.disabled:active { - background-color: transparent !important; - color: #9ea6b2 !important; -} -.bi-list-item-active3.disabled .bi-input, -.bi-list-item-active3.disabled:hover .bi-input, -.bi-list-item-active3.disabled:active .bi-input { - color: #9ea6b2 !important; -} -.bi-list-item-active3.disabled .bi-textarea, -.bi-list-item-active3.disabled:hover .bi-textarea, -.bi-list-item-active3.disabled:active .bi-textarea { - color: #9ea6b2 !important; -} -.bi-list-item-active3.disabled .bi-high-light, -.bi-list-item-active3.disabled:hover .bi-high-light, -.bi-list-item-active3.disabled:active .bi-high-light { - color: #9ea6b2 !important; -} -.bi-theme-dark .bi-list-item-active3:hover, -.bi-theme-dark .bi-list-item-active3.hover { - color: #ffffff; - background-color: rgba(54, 133, 242, 0.06); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2); -} -.bi-theme-dark .bi-list-item-active3:hover .bi-input, -.bi-theme-dark .bi-list-item-active3.hover .bi-input { - color: #ffffff; -} -.bi-theme-dark .bi-list-item-active3:hover .bi-textarea, -.bi-theme-dark .bi-list-item-active3.hover .bi-textarea { - color: #ffffff; -} -.bi-theme-dark .bi-list-item-active3:active, -.bi-theme-dark .bi-list-item-active3.active { - color: #3685f2; - background-color: rgba(54, 133, 242, 0.06); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2); -} -.bi-theme-dark .bi-list-item-active3:active .bi-input, -.bi-theme-dark .bi-list-item-active3.active .bi-input { - color: #3685f2; -} -.bi-theme-dark .bi-list-item-active3:active .bi-textarea, -.bi-theme-dark .bi-list-item-active3.active .bi-textarea { - color: #3685f2; -} -.bi-theme-dark .bi-list-item-active3.disabled, -.bi-theme-dark .bi-list-item-active3.disabled:hover, -.bi-theme-dark .bi-list-item-active3.disabled:active { - background-color: transparent !important; - color: #878d9f !important; -} -.bi-theme-dark .bi-list-item-active3.disabled .bi-input, -.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-input, -.bi-theme-dark .bi-list-item-active3.disabled:active .bi-input { - color: #878d9f !important; -} -.bi-theme-dark .bi-list-item-active3.disabled .bi-textarea, -.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-textarea, -.bi-theme-dark .bi-list-item-active3.disabled:active .bi-textarea { - color: #878d9f !important; -} -.bi-theme-dark .bi-list-item-active3.disabled .bi-high-light, -.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-high-light, -.bi-theme-dark .bi-list-item-active3.disabled:active .bi-high-light { - color: #878d9f !important; -} .bi-list-item-select:hover, .bi-list-item-select.hover { background-color: rgba(54, 133, 242, 0.06); @@ -899,29 +790,134 @@ textarea { } .bi-list-item-select2:hover, .bi-list-item-select2.hover { - background-color: #f7f8fa; + color: #232e40; +} +.bi-list-item-select2:hover .bi-input, +.bi-list-item-select2.hover .bi-input { + color: #232e40; +} +.bi-list-item-select2:hover .bi-textarea, +.bi-list-item-select2.hover .bi-textarea { + color: #232e40; +} +.bi-list-item-select2:hover.bi-border, +.bi-list-item-select2.hover.bi-border { + border-color: #3685f2; +} +.bi-list-item-select2:active { + color: #3685f2; +} +.bi-list-item-select2:active .bi-input { + color: #3685f2; +} +.bi-list-item-select2:active .bi-textarea { + color: #3685f2; +} +.bi-list-item-select2:active.bi-border { + border-color: #3685f2; } -.bi-list-item-select2:active, .bi-list-item-select2.active { color: #ffffff; - background-color: #f7f8fa; + background-color: #3685f2; } -.bi-list-item-select2:active .bi-input, .bi-list-item-select2.active .bi-input { - color: #3685f2; + color: #ffffff; } -.bi-list-item-select2:active .bi-textarea, .bi-list-item-select2.active .bi-textarea { - color: #3685f2; -} -.bi-list-item-select2:active .bi-high-light, -.bi-list-item-select2.active .bi-high-light { color: #ffffff; } +.bi-list-item-select2.active.bi-border { + border-color: #3685f2; +} +.bi-list-item-select2.disabled, .bi-list-item-select2.disabled:hover, -.bi-list-item-select2.disabled.hover, -.bi-list-item-select2.disabled:active, -.bi-list-item-select2.disabled.active { +.bi-list-item-select2.disabled:active { + background-color: transparent !important; + color: #9ea6b2 !important; +} +.bi-list-item-select2.disabled .bi-input, +.bi-list-item-select2.disabled:hover .bi-input, +.bi-list-item-select2.disabled:active .bi-input { + color: #9ea6b2 !important; +} +.bi-list-item-select2.disabled .bi-textarea, +.bi-list-item-select2.disabled:hover .bi-textarea, +.bi-list-item-select2.disabled:active .bi-textarea { + color: #9ea6b2 !important; +} +.bi-list-item-select2.disabled .bi-high-light, +.bi-list-item-select2.disabled:hover .bi-high-light, +.bi-list-item-select2.disabled:active .bi-high-light { + color: #9ea6b2 !important; +} +.bi-theme-dark .bi-list-item-select2:hover, +.bi-theme-dark .bi-list-item-select2.hover { + color: #ffffff; + background-color: #242640; +} +.bi-theme-dark .bi-list-item-select2:hover .bi-input, +.bi-theme-dark .bi-list-item-select2.hover .bi-input { + color: #ffffff; +} +.bi-theme-dark .bi-list-item-select2:hover .bi-textarea, +.bi-theme-dark .bi-list-item-select2.hover .bi-textarea { + color: #ffffff; +} +.bi-theme-dark .bi-list-item-select2.active, +.bi-theme-dark .bi-list-item-select2:active { + color: #3685f2; + background-color: #242640; +} +.bi-theme-dark .bi-list-item-select2.active .bi-input, +.bi-theme-dark .bi-list-item-select2:active .bi-input { + color: #3685f2; +} +.bi-theme-dark .bi-list-item-select2.active .bi-textarea, +.bi-theme-dark .bi-list-item-select2:active .bi-textarea { + color: #3685f2; +} +.bi-theme-dark .bi-list-item-select2.disabled, +.bi-theme-dark .bi-list-item-select2.disabled:hover, +.bi-theme-dark .bi-list-item-select2.disabled:active { + background-color: transparent !important; + color: #878d9f !important; +} +.bi-theme-dark .bi-list-item-select2.disabled .bi-input, +.bi-theme-dark .bi-list-item-select2.disabled:hover .bi-input, +.bi-theme-dark .bi-list-item-select2.disabled:active .bi-input { + color: #878d9f !important; +} +.bi-theme-dark .bi-list-item-select2.disabled .bi-textarea, +.bi-theme-dark .bi-list-item-select2.disabled:hover .bi-textarea, +.bi-theme-dark .bi-list-item-select2.disabled:active .bi-textarea { + color: #878d9f !important; +} +.bi-theme-dark .bi-list-item-select2.disabled .bi-high-light, +.bi-theme-dark .bi-list-item-select2.disabled:hover .bi-high-light, +.bi-theme-dark .bi-list-item-select2.disabled:active .bi-high-light { + color: #878d9f !important; +} +.bi-list-item-select3:hover, +.bi-list-item-select3.hover { + background-color: #f7f8fa; +} +.bi-list-item-select3:active, +.bi-list-item-select3.active { + color: #3685f2; + background-color: #f7f8fa; +} +.bi-list-item-select3:active .bi-input, +.bi-list-item-select3.active .bi-input { + color: #3685f2; +} +.bi-list-item-select3:active .bi-textarea, +.bi-list-item-select3.active .bi-textarea { + color: #3685f2; +} +.bi-list-item-select3.disabled:hover, +.bi-list-item-select3.disabled.hover, +.bi-list-item-select3.disabled:active, +.bi-list-item-select3.disabled.active { background-color: #ffffff !important; } .bi-theme-dark .bi-list-item-select:hover, diff --git a/dist/demo.js b/dist/demo.js index df79b596e..def100f0e 100644 --- a/dist/demo.js +++ b/dist/demo.js @@ -2436,15 +2436,14 @@ BI.shortcut("demo.calendar", Demo.Func);Demo.Func = BI.inherit(BI.Widget, { }, { text: "bi-list-item-active2", cls: "bi-list-item-active2 close-font" - }, { - text: "bi-list-item-active3", - cls: "bi-list-item-active3 close-font" }, { text: "bi-list-item-select", cls: "bi-list-item-select close-font" + }, { + text: "bi-list-item-select2", + cls: "bi-list-item-select2 close-font" }], { type: "bi.icon_text_item", - disabled: true, logic: { dynamic: true } diff --git a/dist/fineui.css b/dist/fineui.css index 14bb3b998..e48cc4615 100644 --- a/dist/fineui.css +++ b/dist/fineui.css @@ -837,6 +837,8 @@ textarea { .bi-list-item-active2:hover, .bi-list-item-active2.hover { color: #232e40; + background-color: rgba(54, 133, 242, 0.06); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2); } .bi-list-item-active2:hover .bi-input, .bi-list-item-active2.hover .bi-input { @@ -846,34 +848,19 @@ textarea { .bi-list-item-active2.hover .bi-textarea { color: #232e40; } -.bi-list-item-active2:hover.bi-border, -.bi-list-item-active2.hover.bi-border { - border-color: #3685f2; -} -.bi-list-item-active2:active { - color: #3685f2; -} -.bi-list-item-active2:active .bi-input { - color: #3685f2; -} -.bi-list-item-active2:active .bi-textarea { - color: #3685f2; -} -.bi-list-item-active2:active.bi-border { - border-color: #3685f2; -} +.bi-list-item-active2:active, .bi-list-item-active2.active { - color: #ffffff; - background-color: #3685f2; + color: #3685f2; + background-color: rgba(54, 133, 242, 0.06); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2); } +.bi-list-item-active2:active .bi-input, .bi-list-item-active2.active .bi-input { - color: #ffffff; + color: #3685f2; } +.bi-list-item-active2:active .bi-textarea, .bi-list-item-active2.active .bi-textarea { - color: #ffffff; -} -.bi-list-item-active2.active.bi-border { - border-color: #3685f2; + color: #3685f2; } .bi-list-item-active2.disabled, .bi-list-item-active2.disabled:hover, @@ -899,7 +886,8 @@ textarea { .bi-theme-dark .bi-list-item-active2:hover, .bi-theme-dark .bi-list-item-active2.hover { color: #ffffff; - background-color: #242640; + background-color: rgba(54, 133, 242, 0.06); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2); } .bi-theme-dark .bi-list-item-active2:hover .bi-input, .bi-theme-dark .bi-list-item-active2.hover .bi-input { @@ -909,17 +897,18 @@ textarea { .bi-theme-dark .bi-list-item-active2.hover .bi-textarea { color: #ffffff; } -.bi-theme-dark .bi-list-item-active2.active, -.bi-theme-dark .bi-list-item-active2:active { +.bi-theme-dark .bi-list-item-active2:active, +.bi-theme-dark .bi-list-item-active2.active { color: #3685f2; - background-color: #242640; + background-color: rgba(54, 133, 242, 0.06); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2); } -.bi-theme-dark .bi-list-item-active2.active .bi-input, -.bi-theme-dark .bi-list-item-active2:active .bi-input { +.bi-theme-dark .bi-list-item-active2:active .bi-input, +.bi-theme-dark .bi-list-item-active2.active .bi-input { color: #3685f2; } -.bi-theme-dark .bi-list-item-active2.active .bi-textarea, -.bi-theme-dark .bi-list-item-active2:active .bi-textarea { +.bi-theme-dark .bi-list-item-active2:active .bi-textarea, +.bi-theme-dark .bi-list-item-active2.active .bi-textarea { color: #3685f2; } .bi-theme-dark .bi-list-item-active2.disabled, @@ -943,104 +932,6 @@ textarea { .bi-theme-dark .bi-list-item-active2.disabled:active .bi-high-light { color: #878d9f !important; } -.bi-list-item-active3:hover, -.bi-list-item-active3.hover { - color: #232e40; - background-color: rgba(54, 133, 242, 0.06); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2); -} -.bi-list-item-active3:hover .bi-input, -.bi-list-item-active3.hover .bi-input { - color: #232e40; -} -.bi-list-item-active3:hover .bi-textarea, -.bi-list-item-active3.hover .bi-textarea { - color: #232e40; -} -.bi-list-item-active3:active, -.bi-list-item-active3.active { - color: #3685f2; - background-color: rgba(54, 133, 242, 0.06); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2); -} -.bi-list-item-active3:active .bi-input, -.bi-list-item-active3.active .bi-input { - color: #3685f2; -} -.bi-list-item-active3:active .bi-textarea, -.bi-list-item-active3.active .bi-textarea { - color: #3685f2; -} -.bi-list-item-active3.disabled, -.bi-list-item-active3.disabled:hover, -.bi-list-item-active3.disabled:active { - background-color: transparent !important; - color: #9ea6b2 !important; -} -.bi-list-item-active3.disabled .bi-input, -.bi-list-item-active3.disabled:hover .bi-input, -.bi-list-item-active3.disabled:active .bi-input { - color: #9ea6b2 !important; -} -.bi-list-item-active3.disabled .bi-textarea, -.bi-list-item-active3.disabled:hover .bi-textarea, -.bi-list-item-active3.disabled:active .bi-textarea { - color: #9ea6b2 !important; -} -.bi-list-item-active3.disabled .bi-high-light, -.bi-list-item-active3.disabled:hover .bi-high-light, -.bi-list-item-active3.disabled:active .bi-high-light { - color: #9ea6b2 !important; -} -.bi-theme-dark .bi-list-item-active3:hover, -.bi-theme-dark .bi-list-item-active3.hover { - color: #ffffff; - background-color: rgba(54, 133, 242, 0.06); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2); -} -.bi-theme-dark .bi-list-item-active3:hover .bi-input, -.bi-theme-dark .bi-list-item-active3.hover .bi-input { - color: #ffffff; -} -.bi-theme-dark .bi-list-item-active3:hover .bi-textarea, -.bi-theme-dark .bi-list-item-active3.hover .bi-textarea { - color: #ffffff; -} -.bi-theme-dark .bi-list-item-active3:active, -.bi-theme-dark .bi-list-item-active3.active { - color: #3685f2; - background-color: rgba(54, 133, 242, 0.06); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2); -} -.bi-theme-dark .bi-list-item-active3:active .bi-input, -.bi-theme-dark .bi-list-item-active3.active .bi-input { - color: #3685f2; -} -.bi-theme-dark .bi-list-item-active3:active .bi-textarea, -.bi-theme-dark .bi-list-item-active3.active .bi-textarea { - color: #3685f2; -} -.bi-theme-dark .bi-list-item-active3.disabled, -.bi-theme-dark .bi-list-item-active3.disabled:hover, -.bi-theme-dark .bi-list-item-active3.disabled:active { - background-color: transparent !important; - color: #878d9f !important; -} -.bi-theme-dark .bi-list-item-active3.disabled .bi-input, -.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-input, -.bi-theme-dark .bi-list-item-active3.disabled:active .bi-input { - color: #878d9f !important; -} -.bi-theme-dark .bi-list-item-active3.disabled .bi-textarea, -.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-textarea, -.bi-theme-dark .bi-list-item-active3.disabled:active .bi-textarea { - color: #878d9f !important; -} -.bi-theme-dark .bi-list-item-active3.disabled .bi-high-light, -.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-high-light, -.bi-theme-dark .bi-list-item-active3.disabled:active .bi-high-light { - color: #878d9f !important; -} .bi-list-item-select:hover, .bi-list-item-select.hover { background-color: rgba(54, 133, 242, 0.06); @@ -1180,29 +1071,134 @@ textarea { } .bi-list-item-select2:hover, .bi-list-item-select2.hover { - background-color: #f7f8fa; + color: #232e40; +} +.bi-list-item-select2:hover .bi-input, +.bi-list-item-select2.hover .bi-input { + color: #232e40; +} +.bi-list-item-select2:hover .bi-textarea, +.bi-list-item-select2.hover .bi-textarea { + color: #232e40; +} +.bi-list-item-select2:hover.bi-border, +.bi-list-item-select2.hover.bi-border { + border-color: #3685f2; +} +.bi-list-item-select2:active { + color: #3685f2; +} +.bi-list-item-select2:active .bi-input { + color: #3685f2; +} +.bi-list-item-select2:active .bi-textarea { + color: #3685f2; +} +.bi-list-item-select2:active.bi-border { + border-color: #3685f2; } -.bi-list-item-select2:active, .bi-list-item-select2.active { color: #ffffff; - background-color: #f7f8fa; + background-color: #3685f2; } -.bi-list-item-select2:active .bi-input, .bi-list-item-select2.active .bi-input { - color: #3685f2; + color: #ffffff; } -.bi-list-item-select2:active .bi-textarea, .bi-list-item-select2.active .bi-textarea { - color: #3685f2; -} -.bi-list-item-select2:active .bi-high-light, -.bi-list-item-select2.active .bi-high-light { color: #ffffff; } +.bi-list-item-select2.active.bi-border { + border-color: #3685f2; +} +.bi-list-item-select2.disabled, .bi-list-item-select2.disabled:hover, -.bi-list-item-select2.disabled.hover, -.bi-list-item-select2.disabled:active, -.bi-list-item-select2.disabled.active { +.bi-list-item-select2.disabled:active { + background-color: transparent !important; + color: #9ea6b2 !important; +} +.bi-list-item-select2.disabled .bi-input, +.bi-list-item-select2.disabled:hover .bi-input, +.bi-list-item-select2.disabled:active .bi-input { + color: #9ea6b2 !important; +} +.bi-list-item-select2.disabled .bi-textarea, +.bi-list-item-select2.disabled:hover .bi-textarea, +.bi-list-item-select2.disabled:active .bi-textarea { + color: #9ea6b2 !important; +} +.bi-list-item-select2.disabled .bi-high-light, +.bi-list-item-select2.disabled:hover .bi-high-light, +.bi-list-item-select2.disabled:active .bi-high-light { + color: #9ea6b2 !important; +} +.bi-theme-dark .bi-list-item-select2:hover, +.bi-theme-dark .bi-list-item-select2.hover { + color: #ffffff; + background-color: #242640; +} +.bi-theme-dark .bi-list-item-select2:hover .bi-input, +.bi-theme-dark .bi-list-item-select2.hover .bi-input { + color: #ffffff; +} +.bi-theme-dark .bi-list-item-select2:hover .bi-textarea, +.bi-theme-dark .bi-list-item-select2.hover .bi-textarea { + color: #ffffff; +} +.bi-theme-dark .bi-list-item-select2.active, +.bi-theme-dark .bi-list-item-select2:active { + color: #3685f2; + background-color: #242640; +} +.bi-theme-dark .bi-list-item-select2.active .bi-input, +.bi-theme-dark .bi-list-item-select2:active .bi-input { + color: #3685f2; +} +.bi-theme-dark .bi-list-item-select2.active .bi-textarea, +.bi-theme-dark .bi-list-item-select2:active .bi-textarea { + color: #3685f2; +} +.bi-theme-dark .bi-list-item-select2.disabled, +.bi-theme-dark .bi-list-item-select2.disabled:hover, +.bi-theme-dark .bi-list-item-select2.disabled:active { + background-color: transparent !important; + color: #878d9f !important; +} +.bi-theme-dark .bi-list-item-select2.disabled .bi-input, +.bi-theme-dark .bi-list-item-select2.disabled:hover .bi-input, +.bi-theme-dark .bi-list-item-select2.disabled:active .bi-input { + color: #878d9f !important; +} +.bi-theme-dark .bi-list-item-select2.disabled .bi-textarea, +.bi-theme-dark .bi-list-item-select2.disabled:hover .bi-textarea, +.bi-theme-dark .bi-list-item-select2.disabled:active .bi-textarea { + color: #878d9f !important; +} +.bi-theme-dark .bi-list-item-select2.disabled .bi-high-light, +.bi-theme-dark .bi-list-item-select2.disabled:hover .bi-high-light, +.bi-theme-dark .bi-list-item-select2.disabled:active .bi-high-light { + color: #878d9f !important; +} +.bi-list-item-select3:hover, +.bi-list-item-select3.hover { + background-color: #f7f8fa; +} +.bi-list-item-select3:active, +.bi-list-item-select3.active { + color: #3685f2; + background-color: #f7f8fa; +} +.bi-list-item-select3:active .bi-input, +.bi-list-item-select3.active .bi-input { + color: #3685f2; +} +.bi-list-item-select3:active .bi-textarea, +.bi-list-item-select3.active .bi-textarea { + color: #3685f2; +} +.bi-list-item-select3.disabled:hover, +.bi-list-item-select3.disabled.hover, +.bi-list-item-select3.disabled:active, +.bi-list-item-select3.disabled.active { background-color: #ffffff !important; } .bi-theme-dark .bi-list-item-select:hover, diff --git a/dist/fineui.js b/dist/fineui.js index 2dfb86870..061490677 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -37787,6 +37787,9 @@ BI.TreeView = BI.inherit(BI.Pane, { if(BI.isNotNull(o.value)){ this.setSelectedValue(o.value); } + if (BI.isIE9Below()) { + this.element.addClass("hack"); + } }, _createTree: function () { @@ -102784,7 +102787,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, { type: "bi.icon_button", forceNotSelected: true, trigger: "lclick,", - cls: "add-up-font top-button bi-border-left bi-list-item-active3 icon-size-12" + cls: "add-up-font top-button bi-border-left bi-list-item-active2 icon-size-12" }); this.topBtn.on(BI.IconButton.EVENT_CHANGE, function () { self._finetuning(o.step); @@ -102795,7 +102798,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, { type: "bi.icon_button", trigger: "lclick,", forceNotSelected: true, - cls: "minus-down-font bottom-button bi-border-left bi-list-item-active3 icon-size-12" + cls: "minus-down-font bottom-button bi-border-left bi-list-item-active2 icon-size-12" }); this.bottomBtn.on(BI.IconButton.EVENT_CHANGE, function () { self._finetuning(-o.step); @@ -108756,7 +108759,7 @@ BI.SliderIconButton = BI.inherit(BI.Widget, { el: { type: "bi.text_button", forceNotSelected: true, - cls: "slider-button bi-list-item-select2", + cls: "slider-button bi-list-item-select3", ref: function () { self.slider = this; } @@ -110593,7 +110596,7 @@ BI.StaticYearCard.EVENT_CHANGE = "EVENT_CHANGE"; BI.shortcut("bi.static_year_card", BI.StaticYearCard);BI.DynamicYearCombo = BI.inherit(BI.Widget, { props: { - baseCls: "bi-year-combo bi-border", + baseCls: "bi-year-combo bi-border bi-focus-shadow", behaviors: {}, min: "1900-01-01", // 最小日期 max: "2099-12-31", // 最大日期 @@ -111326,7 +111329,7 @@ BI.shortcut("bi.static_year_month_card", BI.StaticYearMonthCard); BI.DynamicYearMonthCombo = BI.inherit(BI.Single, { props: { - baseCls: "bi-year-month-combo bi-border", + baseCls: "bi-year-month-combo bi-border bi-focus-shadow", behaviors: {}, min: "1900-01-01", // 最小日期 max: "2099-12-31", // 最大日期 @@ -112354,7 +112357,7 @@ BI.shortcut("bi.static_year_quarter_card", BI.StaticYearQuarterCard); BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, { props: { - baseCls: "bi-year-quarter-combo bi-border", + baseCls: "bi-year-quarter-combo bi-border bi-focus-shadow", behaviors: {}, min: "1900-01-01", // 最小日期 max: "2099-12-31", // 最大日期 diff --git a/dist/widget.js b/dist/widget.js index 380f3cf58..8d2bf02ed 100644 --- a/dist/widget.js +++ b/dist/widget.js @@ -14290,7 +14290,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, { type: "bi.icon_button", forceNotSelected: true, trigger: "lclick,", - cls: "add-up-font top-button bi-border-left bi-list-item-active3 icon-size-12" + cls: "add-up-font top-button bi-border-left bi-list-item-active2 icon-size-12" }); this.topBtn.on(BI.IconButton.EVENT_CHANGE, function () { self._finetuning(o.step); @@ -14301,7 +14301,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, { type: "bi.icon_button", trigger: "lclick,", forceNotSelected: true, - cls: "minus-down-font bottom-button bi-border-left bi-list-item-active3 icon-size-12" + cls: "minus-down-font bottom-button bi-border-left bi-list-item-active2 icon-size-12" }); this.bottomBtn.on(BI.IconButton.EVENT_CHANGE, function () { self._finetuning(-o.step); @@ -20262,7 +20262,7 @@ BI.SliderIconButton = BI.inherit(BI.Widget, { el: { type: "bi.text_button", forceNotSelected: true, - cls: "slider-button bi-list-item-select2", + cls: "slider-button bi-list-item-select3", ref: function () { self.slider = this; } @@ -22099,7 +22099,7 @@ BI.StaticYearCard.EVENT_CHANGE = "EVENT_CHANGE"; BI.shortcut("bi.static_year_card", BI.StaticYearCard);BI.DynamicYearCombo = BI.inherit(BI.Widget, { props: { - baseCls: "bi-year-combo bi-border", + baseCls: "bi-year-combo bi-border bi-focus-shadow", behaviors: {}, min: "1900-01-01", // 最小日期 max: "2099-12-31", // 最大日期 @@ -22832,7 +22832,7 @@ BI.shortcut("bi.static_year_month_card", BI.StaticYearMonthCard); BI.DynamicYearMonthCombo = BI.inherit(BI.Single, { props: { - baseCls: "bi-year-month-combo bi-border", + baseCls: "bi-year-month-combo bi-border bi-focus-shadow", behaviors: {}, min: "1900-01-01", // 最小日期 max: "2099-12-31", // 最大日期 @@ -23860,7 +23860,7 @@ BI.shortcut("bi.static_year_quarter_card", BI.StaticYearQuarterCard); BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, { props: { - baseCls: "bi-year-quarter-combo bi-border", + baseCls: "bi-year-quarter-combo bi-border bi-focus-shadow", behaviors: {}, min: "1900-01-01", // 最小日期 max: "2099-12-31", // 最大日期 diff --git a/src/base/tree/treeview.js b/src/base/tree/treeview.js index cb087d819..920b4b38b 100644 --- a/src/base/tree/treeview.js +++ b/src/base/tree/treeview.js @@ -33,6 +33,9 @@ BI.TreeView = BI.inherit(BI.Pane, { if(BI.isNotNull(o.value)){ this.setSelectedValue(o.value); } + if (BI.isIE9Below()) { + this.element.addClass("hack"); + } }, _createTree: function () { diff --git a/src/css/core/utils/common.css b/src/css/core/utils/common.css index 972833d6d..b58abae2c 100644 --- a/src/css/core/utils/common.css +++ b/src/css/core/utils/common.css @@ -556,6 +556,8 @@ textarea { .bi-list-item-active2:hover, .bi-list-item-active2.hover { color: #232e40; + background-color: rgba(54, 133, 242, 0.06); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2); } .bi-list-item-active2:hover .bi-input, .bi-list-item-active2.hover .bi-input { @@ -565,34 +567,19 @@ textarea { .bi-list-item-active2.hover .bi-textarea { color: #232e40; } -.bi-list-item-active2:hover.bi-border, -.bi-list-item-active2.hover.bi-border { - border-color: #3685f2; -} -.bi-list-item-active2:active { - color: #3685f2; -} -.bi-list-item-active2:active .bi-input { - color: #3685f2; -} -.bi-list-item-active2:active .bi-textarea { - color: #3685f2; -} -.bi-list-item-active2:active.bi-border { - border-color: #3685f2; -} +.bi-list-item-active2:active, .bi-list-item-active2.active { - color: #ffffff; - background-color: #3685f2; + color: #3685f2; + background-color: rgba(54, 133, 242, 0.06); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2); } +.bi-list-item-active2:active .bi-input, .bi-list-item-active2.active .bi-input { - color: #ffffff; + color: #3685f2; } +.bi-list-item-active2:active .bi-textarea, .bi-list-item-active2.active .bi-textarea { - color: #ffffff; -} -.bi-list-item-active2.active.bi-border { - border-color: #3685f2; + color: #3685f2; } .bi-list-item-active2.disabled, .bi-list-item-active2.disabled:hover, @@ -618,7 +605,8 @@ textarea { .bi-theme-dark .bi-list-item-active2:hover, .bi-theme-dark .bi-list-item-active2.hover { color: #ffffff; - background-color: #242640; + background-color: rgba(54, 133, 242, 0.06); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2); } .bi-theme-dark .bi-list-item-active2:hover .bi-input, .bi-theme-dark .bi-list-item-active2.hover .bi-input { @@ -628,17 +616,18 @@ textarea { .bi-theme-dark .bi-list-item-active2.hover .bi-textarea { color: #ffffff; } -.bi-theme-dark .bi-list-item-active2.active, -.bi-theme-dark .bi-list-item-active2:active { +.bi-theme-dark .bi-list-item-active2:active, +.bi-theme-dark .bi-list-item-active2.active { color: #3685f2; - background-color: #242640; + background-color: rgba(54, 133, 242, 0.06); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2); } -.bi-theme-dark .bi-list-item-active2.active .bi-input, -.bi-theme-dark .bi-list-item-active2:active .bi-input { +.bi-theme-dark .bi-list-item-active2:active .bi-input, +.bi-theme-dark .bi-list-item-active2.active .bi-input { color: #3685f2; } -.bi-theme-dark .bi-list-item-active2.active .bi-textarea, -.bi-theme-dark .bi-list-item-active2:active .bi-textarea { +.bi-theme-dark .bi-list-item-active2:active .bi-textarea, +.bi-theme-dark .bi-list-item-active2.active .bi-textarea { color: #3685f2; } .bi-theme-dark .bi-list-item-active2.disabled, @@ -662,104 +651,6 @@ textarea { .bi-theme-dark .bi-list-item-active2.disabled:active .bi-high-light { color: #878d9f !important; } -.bi-list-item-active3:hover, -.bi-list-item-active3.hover { - color: #232e40; - background-color: rgba(54, 133, 242, 0.06); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2); -} -.bi-list-item-active3:hover .bi-input, -.bi-list-item-active3.hover .bi-input { - color: #232e40; -} -.bi-list-item-active3:hover .bi-textarea, -.bi-list-item-active3.hover .bi-textarea { - color: #232e40; -} -.bi-list-item-active3:active, -.bi-list-item-active3.active { - color: #3685f2; - background-color: rgba(54, 133, 242, 0.06); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2); -} -.bi-list-item-active3:active .bi-input, -.bi-list-item-active3.active .bi-input { - color: #3685f2; -} -.bi-list-item-active3:active .bi-textarea, -.bi-list-item-active3.active .bi-textarea { - color: #3685f2; -} -.bi-list-item-active3.disabled, -.bi-list-item-active3.disabled:hover, -.bi-list-item-active3.disabled:active { - background-color: transparent !important; - color: #9ea6b2 !important; -} -.bi-list-item-active3.disabled .bi-input, -.bi-list-item-active3.disabled:hover .bi-input, -.bi-list-item-active3.disabled:active .bi-input { - color: #9ea6b2 !important; -} -.bi-list-item-active3.disabled .bi-textarea, -.bi-list-item-active3.disabled:hover .bi-textarea, -.bi-list-item-active3.disabled:active .bi-textarea { - color: #9ea6b2 !important; -} -.bi-list-item-active3.disabled .bi-high-light, -.bi-list-item-active3.disabled:hover .bi-high-light, -.bi-list-item-active3.disabled:active .bi-high-light { - color: #9ea6b2 !important; -} -.bi-theme-dark .bi-list-item-active3:hover, -.bi-theme-dark .bi-list-item-active3.hover { - color: #ffffff; - background-color: rgba(54, 133, 242, 0.06); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2); -} -.bi-theme-dark .bi-list-item-active3:hover .bi-input, -.bi-theme-dark .bi-list-item-active3.hover .bi-input { - color: #ffffff; -} -.bi-theme-dark .bi-list-item-active3:hover .bi-textarea, -.bi-theme-dark .bi-list-item-active3.hover .bi-textarea { - color: #ffffff; -} -.bi-theme-dark .bi-list-item-active3:active, -.bi-theme-dark .bi-list-item-active3.active { - color: #3685f2; - background-color: rgba(54, 133, 242, 0.06); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2); -} -.bi-theme-dark .bi-list-item-active3:active .bi-input, -.bi-theme-dark .bi-list-item-active3.active .bi-input { - color: #3685f2; -} -.bi-theme-dark .bi-list-item-active3:active .bi-textarea, -.bi-theme-dark .bi-list-item-active3.active .bi-textarea { - color: #3685f2; -} -.bi-theme-dark .bi-list-item-active3.disabled, -.bi-theme-dark .bi-list-item-active3.disabled:hover, -.bi-theme-dark .bi-list-item-active3.disabled:active { - background-color: transparent !important; - color: #878d9f !important; -} -.bi-theme-dark .bi-list-item-active3.disabled .bi-input, -.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-input, -.bi-theme-dark .bi-list-item-active3.disabled:active .bi-input { - color: #878d9f !important; -} -.bi-theme-dark .bi-list-item-active3.disabled .bi-textarea, -.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-textarea, -.bi-theme-dark .bi-list-item-active3.disabled:active .bi-textarea { - color: #878d9f !important; -} -.bi-theme-dark .bi-list-item-active3.disabled .bi-high-light, -.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-high-light, -.bi-theme-dark .bi-list-item-active3.disabled:active .bi-high-light { - color: #878d9f !important; -} .bi-list-item-select:hover, .bi-list-item-select.hover { background-color: rgba(54, 133, 242, 0.06); @@ -899,29 +790,134 @@ textarea { } .bi-list-item-select2:hover, .bi-list-item-select2.hover { - background-color: #f7f8fa; + color: #232e40; +} +.bi-list-item-select2:hover .bi-input, +.bi-list-item-select2.hover .bi-input { + color: #232e40; +} +.bi-list-item-select2:hover .bi-textarea, +.bi-list-item-select2.hover .bi-textarea { + color: #232e40; +} +.bi-list-item-select2:hover.bi-border, +.bi-list-item-select2.hover.bi-border { + border-color: #3685f2; +} +.bi-list-item-select2:active { + color: #3685f2; +} +.bi-list-item-select2:active .bi-input { + color: #3685f2; +} +.bi-list-item-select2:active .bi-textarea { + color: #3685f2; +} +.bi-list-item-select2:active.bi-border { + border-color: #3685f2; } -.bi-list-item-select2:active, .bi-list-item-select2.active { color: #ffffff; - background-color: #f7f8fa; + background-color: #3685f2; } -.bi-list-item-select2:active .bi-input, .bi-list-item-select2.active .bi-input { - color: #3685f2; + color: #ffffff; } -.bi-list-item-select2:active .bi-textarea, .bi-list-item-select2.active .bi-textarea { - color: #3685f2; -} -.bi-list-item-select2:active .bi-high-light, -.bi-list-item-select2.active .bi-high-light { color: #ffffff; } +.bi-list-item-select2.active.bi-border { + border-color: #3685f2; +} +.bi-list-item-select2.disabled, .bi-list-item-select2.disabled:hover, -.bi-list-item-select2.disabled.hover, -.bi-list-item-select2.disabled:active, -.bi-list-item-select2.disabled.active { +.bi-list-item-select2.disabled:active { + background-color: transparent !important; + color: #9ea6b2 !important; +} +.bi-list-item-select2.disabled .bi-input, +.bi-list-item-select2.disabled:hover .bi-input, +.bi-list-item-select2.disabled:active .bi-input { + color: #9ea6b2 !important; +} +.bi-list-item-select2.disabled .bi-textarea, +.bi-list-item-select2.disabled:hover .bi-textarea, +.bi-list-item-select2.disabled:active .bi-textarea { + color: #9ea6b2 !important; +} +.bi-list-item-select2.disabled .bi-high-light, +.bi-list-item-select2.disabled:hover .bi-high-light, +.bi-list-item-select2.disabled:active .bi-high-light { + color: #9ea6b2 !important; +} +.bi-theme-dark .bi-list-item-select2:hover, +.bi-theme-dark .bi-list-item-select2.hover { + color: #ffffff; + background-color: #242640; +} +.bi-theme-dark .bi-list-item-select2:hover .bi-input, +.bi-theme-dark .bi-list-item-select2.hover .bi-input { + color: #ffffff; +} +.bi-theme-dark .bi-list-item-select2:hover .bi-textarea, +.bi-theme-dark .bi-list-item-select2.hover .bi-textarea { + color: #ffffff; +} +.bi-theme-dark .bi-list-item-select2.active, +.bi-theme-dark .bi-list-item-select2:active { + color: #3685f2; + background-color: #242640; +} +.bi-theme-dark .bi-list-item-select2.active .bi-input, +.bi-theme-dark .bi-list-item-select2:active .bi-input { + color: #3685f2; +} +.bi-theme-dark .bi-list-item-select2.active .bi-textarea, +.bi-theme-dark .bi-list-item-select2:active .bi-textarea { + color: #3685f2; +} +.bi-theme-dark .bi-list-item-select2.disabled, +.bi-theme-dark .bi-list-item-select2.disabled:hover, +.bi-theme-dark .bi-list-item-select2.disabled:active { + background-color: transparent !important; + color: #878d9f !important; +} +.bi-theme-dark .bi-list-item-select2.disabled .bi-input, +.bi-theme-dark .bi-list-item-select2.disabled:hover .bi-input, +.bi-theme-dark .bi-list-item-select2.disabled:active .bi-input { + color: #878d9f !important; +} +.bi-theme-dark .bi-list-item-select2.disabled .bi-textarea, +.bi-theme-dark .bi-list-item-select2.disabled:hover .bi-textarea, +.bi-theme-dark .bi-list-item-select2.disabled:active .bi-textarea { + color: #878d9f !important; +} +.bi-theme-dark .bi-list-item-select2.disabled .bi-high-light, +.bi-theme-dark .bi-list-item-select2.disabled:hover .bi-high-light, +.bi-theme-dark .bi-list-item-select2.disabled:active .bi-high-light { + color: #878d9f !important; +} +.bi-list-item-select3:hover, +.bi-list-item-select3.hover { + background-color: #f7f8fa; +} +.bi-list-item-select3:active, +.bi-list-item-select3.active { + color: #3685f2; + background-color: #f7f8fa; +} +.bi-list-item-select3:active .bi-input, +.bi-list-item-select3.active .bi-input { + color: #3685f2; +} +.bi-list-item-select3:active .bi-textarea, +.bi-list-item-select3.active .bi-textarea { + color: #3685f2; +} +.bi-list-item-select3.disabled:hover, +.bi-list-item-select3.disabled.hover, +.bi-list-item-select3.disabled:active, +.bi-list-item-select3.disabled.active { background-color: #ffffff !important; } .bi-theme-dark .bi-list-item-select:hover, diff --git a/src/css/widget/singleselect/singleselect.css b/src/css/widget/singleselect/singleselect.css new file mode 100644 index 000000000..72678d430 --- /dev/null +++ b/src/css/widget/singleselect/singleselect.css @@ -0,0 +1,22 @@ +.bi-single-select-combo .single-select-trigger-icon-button { + font-size: 16px; +} +.bi-single-select-combo .trigger-up { + display: none; +} +.bi-single-select-combo .trigger-down { + display: block; +} +.bi-single-select-combo.combo-show .trigger-up { + display: block; +} +.bi-single-select-combo.combo-show .trigger-down { + display: none; +} +.bi-single-select-combo:hover .search-text-value-trigger { + border-color: #3685f2; +} +.bi-single-select-combo:focus .bi-combo.bi-combo-popup .bi-single-select-trigger, +.bi-single-select-combo:focus-within .bi-combo.bi-combo-popup .bi-single-select-trigger { + border-color: #3685f2; +} diff --git a/src/less/core/utils/common.less b/src/less/core/utils/common.less index 486ff7d50..a18e6c925 100644 --- a/src/less/core/utils/common.less +++ b/src/less/core/utils/common.less @@ -42,11 +42,7 @@ textarea { } .bi-focus-shadow { - &:focus-within, &:focus { - border-color: @color-bi-border-highlight; - .box-shadow(0 0 5px 2px, @color-bi-blue-20); - } - &:hover { + &:focus-within, &:focus, &:hover { border-color: @color-bi-border-highlight; } } @@ -586,104 +582,8 @@ textarea { } } -//文字和背景hover和active时变化 hover和点击时边框变化，active后背景和边框变化 -.bi-list-item-active2 { - &:hover, &.hover { - color: @color-bi-text-black; - & .bi-input { - color: @color-bi-text-black; - } - & .bi-textarea { - color: @color-bi-text-black; - } - &.bi-border { - border-color: @color-bi-border-highlight; - } - } - &:active { - color: @color-bi-text-highlight; - & .bi-input { - color: @color-bi-text-highlight; - } - & .bi-textarea { - color: @color-bi-text-highlight; - } - &.bi-border { - border-color: @color-bi-border-highlight; - } - } - &.active { - color: @color-bi-text; - & .bi-input { - color: @color-bi-text; - } - & .bi-textarea { - color: @color-bi-text; - } - &.bi-border { - border-color: @color-bi-border-highlight; - } - background-color: @color-bi-background-highlight; - } - &.disabled { - &, &:hover, &:active { - background-color: transparent !important; - color: @color-bi-text-disabled !important; - & .bi-input { - color: @color-bi-text-disabled !important; - } - & .bi-textarea { - color: @color-bi-text-disabled !important; - } - & .bi-high-light { - color: @color-bi-text-disabled !important; - } - } - } -} - -.bi-theme-dark { - .bi-list-item-active2 { - &:hover, &.hover { - color: @color-bi-text; - & .bi-input { - color: @color-bi-text; - } - & .bi-textarea { - color: @color-bi-text; - } - background-color: @color-bi-background-default-theme-dark; - } - &.active, &:active { - color: @color-bi-text-highlight; - & .bi-input { - color: @color-bi-text-highlight; - } - & .bi-textarea { - color: @color-bi-text-highlight; - } - background-color: @color-bi-background-default-theme-dark; - } - &.disabled { - &, &:hover, &:active { - background-color: transparent !important; - color: @color-bi-text-disabled-theme-dark !important; - & .bi-input { - color: @color-bi-text-disabled-theme-dark !important; - } - & .bi-textarea { - color: @color-bi-text-disabled-theme-dark !important; - } - & .bi-high-light { - color: @color-bi-text-disabled-theme-dark !important; - } - } - } - } -} - //文字和背景hover和active时变化 hover -.bi-list-item-active3 { +.bi-list-item-active2 { &:hover, &.hover { color: @color-bi-text-black; & .bi-input { @@ -722,7 +622,7 @@ textarea { } .bi-theme-dark { - .bi-list-item-active3 { + .bi-list-item-active2 { &:hover, &.hover { color: @color-bi-text; & .bi-input { @@ -880,13 +780,109 @@ textarea { } } -//与bi-list-item-select的区别是背景是灰的 +//文字和背景hover和active时变化 hover和点击时边框变化，active后背景和边框变化 .bi-list-item-select2 { + &:hover, &.hover { + color: @color-bi-text-black; + & .bi-input { + color: @color-bi-text-black; + } + & .bi-textarea { + color: @color-bi-text-black; + } + &.bi-border { + border-color: @color-bi-border-highlight; + } + } + &:active { + color: @color-bi-text-highlight; + & .bi-input { + color: @color-bi-text-highlight; + } + & .bi-textarea { + color: @color-bi-text-highlight; + } + &.bi-border { + border-color: @color-bi-border-highlight; + } + } + &.active { + color: @color-bi-text; + & .bi-input { + color: @color-bi-text; + } + & .bi-textarea { + color: @color-bi-text; + } + &.bi-border { + border-color: @color-bi-border-highlight; + } + background-color: @color-bi-background-highlight; + } + &.disabled { + &, &:hover, &:active { + background-color: transparent !important; + color: @color-bi-text-disabled !important; + & .bi-input { + color: @color-bi-text-disabled !important; + } + & .bi-textarea { + color: @color-bi-text-disabled !important; + } + & .bi-high-light { + color: @color-bi-text-disabled !important; + } + } + } +} + +.bi-theme-dark { + .bi-list-item-select2 { + &:hover, &.hover { + color: @color-bi-text; + & .bi-input { + color: @color-bi-text; + } + & .bi-textarea { + color: @color-bi-text; + } + background-color: @color-bi-background-default-theme-dark; + } + &.active, &:active { + color: @color-bi-text-highlight; + & .bi-input { + color: @color-bi-text-highlight; + } + & .bi-textarea { + color: @color-bi-text-highlight; + } + background-color: @color-bi-background-default-theme-dark; + } + &.disabled { + &, &:hover, &:active { + background-color: transparent !important; + color: @color-bi-text-disabled-theme-dark !important; + & .bi-input { + color: @color-bi-text-disabled-theme-dark !important; + } + & .bi-textarea { + color: @color-bi-text-disabled-theme-dark !important; + } + & .bi-high-light { + color: @color-bi-text-disabled-theme-dark !important; + } + } + } + } +} + +//与bi-list-item-select的区别是背景是灰的 +.bi-list-item-select3 { &:hover, &.hover { background-color: @color-bi-background-normal; } &:active, &.active { - color: @color-bi-text; + color: @color-bi-text-highlight; & .bi-input { color: @color-bi-text-highlight; } @@ -894,9 +890,6 @@ textarea { color: @color-bi-text-highlight; } background-color: @color-bi-background-normal; - & .bi-high-light { - color: @color-bi-text; - } } &.disabled { &:hover, &.hover, &:active, &.active { diff --git a/src/widget/numbereditor/number.editor.js b/src/widget/numbereditor/number.editor.js index 58a8a0527..dad914b59 100644 --- a/src/widget/numbereditor/number.editor.js +++ b/src/widget/numbereditor/number.editor.js @@ -42,7 +42,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, { type: "bi.icon_button", forceNotSelected: true, trigger: "lclick,", - cls: "add-up-font top-button bi-border-left bi-list-item-active3 icon-size-12" + cls: "add-up-font top-button bi-border-left bi-list-item-active2 icon-size-12" }); this.topBtn.on(BI.IconButton.EVENT_CHANGE, function () { self._finetuning(o.step); @@ -53,7 +53,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, { type: "bi.icon_button", trigger: "lclick,", forceNotSelected: true, - cls: "minus-down-font bottom-button bi-border-left bi-list-item-active3 icon-size-12" + cls: "minus-down-font bottom-button bi-border-left bi-list-item-active2 icon-size-12" }); this.bottomBtn.on(BI.IconButton.EVENT_CHANGE, function () { self._finetuning(-o.step); diff --git a/src/widget/singleslider/button/iconbutton.slider.js b/src/widget/singleslider/button/iconbutton.slider.js index 011cefdfc..177e5f200 100644 --- a/src/widget/singleslider/button/iconbutton.slider.js +++ b/src/widget/singleslider/button/iconbutton.slider.js @@ -25,7 +25,7 @@ BI.SliderIconButton = BI.inherit(BI.Widget, { el: { type: "bi.text_button", forceNotSelected: true, - cls: "slider-button bi-list-item-select2", + cls: "slider-button bi-list-item-select3", ref: function () { self.slider = this; } diff --git a/src/widget/year/combo.year.js b/src/widget/year/combo.year.js index a4c9e20e0..20cdcb78b 100644 --- a/src/widget/year/combo.year.js +++ b/src/widget/year/combo.year.js @@ -1,7 +1,7 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, { props: { - baseCls: "bi-year-combo bi-border", + baseCls: "bi-year-combo bi-border bi-focus-shadow", behaviors: {}, min: "1900-01-01", // 最小日期 max: "2099-12-31", // 最大日期 diff --git a/src/widget/yearmonth/combo.yearmonth.js b/src/widget/yearmonth/combo.yearmonth.js index dd2ffd046..5ac31b0f6 100644 --- a/src/widget/yearmonth/combo.yearmonth.js +++ b/src/widget/yearmonth/combo.yearmonth.js @@ -1,7 +1,7 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, { props: { - baseCls: "bi-year-month-combo bi-border", + baseCls: "bi-year-month-combo bi-border bi-focus-shadow", behaviors: {}, min: "1900-01-01", // 最小日期 max: "2099-12-31", // 最大日期 diff --git a/src/widget/yearquarter/combo.yearquarter.js b/src/widget/yearquarter/combo.yearquarter.js index bbc13c989..0e29e29dd 100644 --- a/src/widget/yearquarter/combo.yearquarter.js +++ b/src/widget/yearquarter/combo.yearquarter.js @@ -1,7 +1,7 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, { props: { - baseCls: "bi-year-quarter-combo bi-border", + baseCls: "bi-year-quarter-combo bi-border bi-focus-shadow", behaviors: {}, min: "1900-01-01", // 最小日期 max: "2099-12-31", // 最大日期