From 281a5a187dba2843211733fc337ecf2240ea47bc Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Fri, 29 Jun 2018 14:02:30 +0800 Subject: [PATCH] update --- dist/bundle.css | 17 +++++++++++++++++ dist/bundle.js | 3 ++- dist/core.css | 17 +++++++++++++++++ dist/core_without_normalize.css | 17 +++++++++++++++++ dist/fineui.css | 17 +++++++++++++++++ dist/fineui.js | 3 ++- dist/widget.js | 3 ++- src/css/core/utils/common.css | 17 +++++++++++++++++ src/less/core/utils/common.less | 17 +++++++++++++++++ .../singleslider/button/iconbutton.slider.js | 3 ++- 10 files changed, 110 insertions(+), 4 deletions(-) diff --git a/dist/bundle.css b/dist/bundle.css index 6268c58aa..48a34fc00 100644 --- a/dist/bundle.css +++ b/dist/bundle.css @@ -1107,6 +1107,23 @@ textarea { .bi-list-item-select.disabled:active.bi-high-light-border { border-color: #cccccc; } +.bi-list-item-select2:hover, +.bi-list-item-select2.hover { + background-color: #f7f8fa; +} +.bi-list-item-select2:active, +.bi-list-item-select2.active { + color: #3685f2; + background-color: #f7f8fa; +} +.bi-list-item-select2:active .bi-input, +.bi-list-item-select2.active .bi-input { + color: #3685f2; +} +.bi-list-item-select2:active .bi-textarea, +.bi-list-item-select2.active .bi-textarea { + color: #3685f2; +} .bi-theme-dark .bi-list-item-select:hover, .bi-theme-dark .bi-list-item-select.hover { color: #ffffff; diff --git a/dist/bundle.js b/dist/bundle.js index a64e98f45..d0ebac28b 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -108545,7 +108545,8 @@ BI.SliderIconButton = BI.inherit(BI.Widget, { items: [{ el: { type: "bi.text_button", - cls: "slider-button", + forceNotSelected: true, + cls: "slider-button bi-list-item-select2", ref: function () { self.slider = this; } diff --git a/dist/core.css b/dist/core.css index 0e2a6eac4..7092c860d 100644 --- a/dist/core.css +++ b/dist/core.css @@ -1107,6 +1107,23 @@ textarea { .bi-list-item-select.disabled:active.bi-high-light-border { border-color: #cccccc; } +.bi-list-item-select2:hover, +.bi-list-item-select2.hover { + background-color: #f7f8fa; +} +.bi-list-item-select2:active, +.bi-list-item-select2.active { + color: #3685f2; + background-color: #f7f8fa; +} +.bi-list-item-select2:active .bi-input, +.bi-list-item-select2.active .bi-input { + color: #3685f2; +} +.bi-list-item-select2:active .bi-textarea, +.bi-list-item-select2.active .bi-textarea { + color: #3685f2; +} .bi-theme-dark .bi-list-item-select:hover, .bi-theme-dark .bi-list-item-select.hover { color: #ffffff; diff --git a/dist/core_without_normalize.css b/dist/core_without_normalize.css index 7eba3dcb5..8f308adb2 100644 --- a/dist/core_without_normalize.css +++ b/dist/core_without_normalize.css @@ -829,6 +829,23 @@ textarea { .bi-list-item-select.disabled:active.bi-high-light-border { border-color: #cccccc; } +.bi-list-item-select2:hover, +.bi-list-item-select2.hover { + background-color: #f7f8fa; +} +.bi-list-item-select2:active, +.bi-list-item-select2.active { + color: #3685f2; + background-color: #f7f8fa; +} +.bi-list-item-select2:active .bi-input, +.bi-list-item-select2.active .bi-input { + color: #3685f2; +} +.bi-list-item-select2:active .bi-textarea, +.bi-list-item-select2.active .bi-textarea { + color: #3685f2; +} .bi-theme-dark .bi-list-item-select:hover, .bi-theme-dark .bi-list-item-select.hover { color: #ffffff; diff --git a/dist/fineui.css b/dist/fineui.css index 5577b31e4..024b45eea 100644 --- a/dist/fineui.css +++ b/dist/fineui.css @@ -1107,6 +1107,23 @@ textarea { .bi-list-item-select.disabled:active.bi-high-light-border { border-color: #cccccc; } +.bi-list-item-select2:hover, +.bi-list-item-select2.hover { + background-color: #f7f8fa; +} +.bi-list-item-select2:active, +.bi-list-item-select2.active { + color: #3685f2; + background-color: #f7f8fa; +} +.bi-list-item-select2:active .bi-input, +.bi-list-item-select2.active .bi-input { + color: #3685f2; +} +.bi-list-item-select2:active .bi-textarea, +.bi-list-item-select2.active .bi-textarea { + color: #3685f2; +} .bi-theme-dark .bi-list-item-select:hover, .bi-theme-dark .bi-list-item-select.hover { color: #ffffff; diff --git a/dist/fineui.js b/dist/fineui.js index 4bc1ef8c8..230263fd7 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -108794,7 +108794,8 @@ BI.SliderIconButton = BI.inherit(BI.Widget, { items: [{ el: { type: "bi.text_button", - cls: "slider-button", + forceNotSelected: true, + cls: "slider-button bi-list-item-select2", ref: function () { self.slider = this; } diff --git a/dist/widget.js b/dist/widget.js index 1ec6a33df..69364768c 100644 --- a/dist/widget.js +++ b/dist/widget.js @@ -20891,7 +20891,8 @@ BI.SliderIconButton = BI.inherit(BI.Widget, { items: [{ el: { type: "bi.text_button", - cls: "slider-button", + forceNotSelected: true, + cls: "slider-button bi-list-item-select2", ref: function () { self.slider = this; } diff --git a/src/css/core/utils/common.css b/src/css/core/utils/common.css index b1f5d8878..7c454cebe 100644 --- a/src/css/core/utils/common.css +++ b/src/css/core/utils/common.css @@ -829,6 +829,23 @@ textarea { .bi-list-item-select.disabled:active.bi-high-light-border { border-color: #cccccc; } +.bi-list-item-select2:hover, +.bi-list-item-select2.hover { + background-color: #f7f8fa; +} +.bi-list-item-select2:active, +.bi-list-item-select2.active { + color: #3685f2; + background-color: #f7f8fa; +} +.bi-list-item-select2:active .bi-input, +.bi-list-item-select2.active .bi-input { + color: #3685f2; +} +.bi-list-item-select2:active .bi-textarea, +.bi-list-item-select2.active .bi-textarea { + color: #3685f2; +} .bi-theme-dark .bi-list-item-select:hover, .bi-theme-dark .bi-list-item-select.hover { color: #ffffff; diff --git a/src/less/core/utils/common.less b/src/less/core/utils/common.less index 93caf1147..aa6c961fb 100644 --- a/src/less/core/utils/common.less +++ b/src/less/core/utils/common.less @@ -812,6 +812,23 @@ textarea { } } +//与bi-list-item-select的区别是背景是灰的 +.bi-list-item-select2 { + &:hover, &.hover { + background-color: @color-bi-background-normal; + } + &: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-normal; + } +} + .bi-theme-dark { .bi-list-item-select { &:hover, &.hover { diff --git a/src/widget/singleslider/button/iconbutton.slider.js b/src/widget/singleslider/button/iconbutton.slider.js index b6589e333..011cefdfc 100644 --- a/src/widget/singleslider/button/iconbutton.slider.js +++ b/src/widget/singleslider/button/iconbutton.slider.js @@ -24,7 +24,8 @@ BI.SliderIconButton = BI.inherit(BI.Widget, { items: [{ el: { type: "bi.text_button", - cls: "slider-button", + forceNotSelected: true, + cls: "slider-button bi-list-item-select2", ref: function () { self.slider = this; }