diff --git a/bi/widget.css b/bi/widget.css index df905928d..93cd3ac5e 100644 --- a/bi/widget.css +++ b/bi/widget.css @@ -44,9 +44,6 @@ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-arrangement-droppable { - background: #d8f3fe; - opacity: 0.8; - filter: alpha(opacity=80); z-index: 100000; } /****添加计算宽度的--运算符直接需要space****/ @@ -118,9 +115,6 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-date-picker { - background: #f4f4f4; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ @@ -170,7 +164,6 @@ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-file-manager-nav-button .file-manager-nav-button-text { max-width: 200px; - background: #ffffff; } .bi-file-manager-nav-button .file-manager-nav-button-text.active { background-color: #eff1f4; @@ -179,9 +172,6 @@ .bi-file-manager-nav-button .file-manager-nav-button-triangle { z-index: 1; } -.bi-theme-dark .bi-file-manager-nav-button .file-manager-nav-button-text { - background: #242640; -} .bi-theme-dark .bi-file-manager-nav-button .file-manager-nav-button-text.active { background-color: #191b2b; color: #999999; diff --git a/bi/widget.js b/bi/widget.js index bfce10a76..1a44714db 100644 --- a/bi/widget.js +++ b/bi/widget.js @@ -4526,7 +4526,7 @@ BI.DatePicker = BI.inherit(BI.Widget, { _defaultConfig: function () { var conf = BI.DatePicker.superclass._defaultConfig.apply(this, arguments); return BI.extend(conf, { - baseCls: "bi-date-picker", + baseCls: "bi-date-picker bi-background", height: 25, min: '1900-01-01', //最小日期 max: '2099-12-31' //最大日期 @@ -7121,70 +7121,6 @@ BI.FineTuningNumberEditor = BI.inherit(BI.Widget, { }); BI.FineTuningNumberEditor.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.shortcut("bi.fine_tuning_number_editor", BI.FineTuningNumberEditor);/** - * Created by GameJian on 2016/1/28. - */ -BI.ImageButtonHref = BI.inherit(BI.Single, { - - _defaultConfig: function () { - return BI.extend(BI.ImageButtonHref.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-image-button-href", - title: BI.i18nText("BI-Add_Href") - }) - }, - - _init: function () { - BI.ImageButtonHref.superclass._init.apply(this, arguments); - var self = this, o = this.options; - this.trigger = BI.createWidget({ - type: "bi.icon_button", - cls: "img-href-font", - title: o.title, - height: 24, - width: 24 - }); - - this.input = BI.createWidget({ - type: "bi.clear_editor", - watermark: BI.i18nText("BI-Input_Href"), - width: 255, - height: 30 - }); - this.input.on(BI.ClearEditor.EVENT_CONFIRM, function () { - self.combo.hideView(); - }); - - this.combo = BI.createWidget({ - type: "bi.combo", - element: this, - direction: "bottom,left", - adjustYOffset: 3, - el: this.trigger, - popup: { - el: this.input, - stopPropagation: false, - minWidth: 255 - } - }); - - this.combo.on(BI.Combo.EVENT_AFTER_POPUPVIEW, function () { - self.input.focus() - }); - - this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () { - self.fireEvent(BI.ImageButtonHref.EVENT_CHANGE, arguments) - }) - }, - - getValue: function () { - return this.input.getValue(); - }, - - setValue: function (url) { - this.input.setValue(url) - } -}); -BI.ImageButtonHref.EVENT_CHANGE = "BI.ImageButtonHref.EVENT_CHANGE"; -BI.shortcut("bi.image_button_href", BI.ImageButtonHref);/** * 交互行为布局 * * diff --git a/docs/widget.css b/docs/widget.css index df905928d..93cd3ac5e 100644 --- a/docs/widget.css +++ b/docs/widget.css @@ -44,9 +44,6 @@ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-arrangement-droppable { - background: #d8f3fe; - opacity: 0.8; - filter: alpha(opacity=80); z-index: 100000; } /****添加计算宽度的--运算符直接需要space****/ @@ -118,9 +115,6 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-date-picker { - background: #f4f4f4; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ @@ -170,7 +164,6 @@ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-file-manager-nav-button .file-manager-nav-button-text { max-width: 200px; - background: #ffffff; } .bi-file-manager-nav-button .file-manager-nav-button-text.active { background-color: #eff1f4; @@ -179,9 +172,6 @@ .bi-file-manager-nav-button .file-manager-nav-button-triangle { z-index: 1; } -.bi-theme-dark .bi-file-manager-nav-button .file-manager-nav-button-text { - background: #242640; -} .bi-theme-dark .bi-file-manager-nav-button .file-manager-nav-button-text.active { background-color: #191b2b; color: #999999; diff --git a/docs/widget.js b/docs/widget.js index bfce10a76..1a44714db 100644 --- a/docs/widget.js +++ b/docs/widget.js @@ -4526,7 +4526,7 @@ BI.DatePicker = BI.inherit(BI.Widget, { _defaultConfig: function () { var conf = BI.DatePicker.superclass._defaultConfig.apply(this, arguments); return BI.extend(conf, { - baseCls: "bi-date-picker", + baseCls: "bi-date-picker bi-background", height: 25, min: '1900-01-01', //最小日期 max: '2099-12-31' //最大日期 @@ -7121,70 +7121,6 @@ BI.FineTuningNumberEditor = BI.inherit(BI.Widget, { }); BI.FineTuningNumberEditor.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.shortcut("bi.fine_tuning_number_editor", BI.FineTuningNumberEditor);/** - * Created by GameJian on 2016/1/28. - */ -BI.ImageButtonHref = BI.inherit(BI.Single, { - - _defaultConfig: function () { - return BI.extend(BI.ImageButtonHref.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-image-button-href", - title: BI.i18nText("BI-Add_Href") - }) - }, - - _init: function () { - BI.ImageButtonHref.superclass._init.apply(this, arguments); - var self = this, o = this.options; - this.trigger = BI.createWidget({ - type: "bi.icon_button", - cls: "img-href-font", - title: o.title, - height: 24, - width: 24 - }); - - this.input = BI.createWidget({ - type: "bi.clear_editor", - watermark: BI.i18nText("BI-Input_Href"), - width: 255, - height: 30 - }); - this.input.on(BI.ClearEditor.EVENT_CONFIRM, function () { - self.combo.hideView(); - }); - - this.combo = BI.createWidget({ - type: "bi.combo", - element: this, - direction: "bottom,left", - adjustYOffset: 3, - el: this.trigger, - popup: { - el: this.input, - stopPropagation: false, - minWidth: 255 - } - }); - - this.combo.on(BI.Combo.EVENT_AFTER_POPUPVIEW, function () { - self.input.focus() - }); - - this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () { - self.fireEvent(BI.ImageButtonHref.EVENT_CHANGE, arguments) - }) - }, - - getValue: function () { - return this.input.getValue(); - }, - - setValue: function (url) { - this.input.setValue(url) - } -}); -BI.ImageButtonHref.EVENT_CHANGE = "BI.ImageButtonHref.EVENT_CHANGE"; -BI.shortcut("bi.image_button_href", BI.ImageButtonHref);/** * 交互行为布局 * * diff --git a/src/css/widget/arrangement/arrangement.droppable.css b/src/css/widget/arrangement/arrangement.droppable.css index 2ae94e0f7..bc396ebf5 100644 --- a/src/css/widget/arrangement/arrangement.droppable.css +++ b/src/css/widget/arrangement/arrangement.droppable.css @@ -2,8 +2,5 @@ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-arrangement-droppable { - background: #d8f3fe; - opacity: 0.8; - filter: alpha(opacity=80); z-index: 100000; } diff --git a/src/css/widget/date/calendar/picker.date.css b/src/css/widget/date/calendar/picker.date.css index 6a76b7b14..2f6491e13 100644 --- a/src/css/widget/date/calendar/picker.date.css +++ b/src/css/widget/date/calendar/picker.date.css @@ -1,6 +1,3 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-date-picker { - background: #f4f4f4; -} diff --git a/src/css/widget/filemanager/nav/button/button.nav.filemanager.css b/src/css/widget/filemanager/nav/button/button.nav.filemanager.css index 364095f9d..ac90ed309 100644 --- a/src/css/widget/filemanager/nav/button/button.nav.filemanager.css +++ b/src/css/widget/filemanager/nav/button/button.nav.filemanager.css @@ -3,7 +3,6 @@ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-file-manager-nav-button .file-manager-nav-button-text { max-width: 200px; - background: #ffffff; } .bi-file-manager-nav-button .file-manager-nav-button-text.active { background-color: #eff1f4; @@ -12,9 +11,6 @@ .bi-file-manager-nav-button .file-manager-nav-button-triangle { z-index: 1; } -.bi-theme-dark .bi-file-manager-nav-button .file-manager-nav-button-text { - background: #242640; -} .bi-theme-dark .bi-file-manager-nav-button .file-manager-nav-button-text.active { background-color: #191b2b; color: #999999; diff --git a/src/less/widget/arrangement/arrangement.droppable.less b/src/less/widget/arrangement/arrangement.droppable.less index a286327a0..d11f2512a 100644 --- a/src/less/widget/arrangement/arrangement.droppable.less +++ b/src/less/widget/arrangement/arrangement.droppable.less @@ -1,7 +1,5 @@ @import "../../bibase"; .bi-arrangement-droppable{ - background:@color-bi-background-virtual-blue; - .opacity(0.8); z-index: @zIndex-layer; } \ No newline at end of file diff --git a/src/less/widget/date/calendar/picker.date.less b/src/less/widget/date/calendar/picker.date.less index bcdf79a2d..926a62134 100644 --- a/src/less/widget/date/calendar/picker.date.less +++ b/src/less/widget/date/calendar/picker.date.less @@ -1,5 +1,4 @@ @import "../../../bibase"; -.bi-date-picker{ - background: @color-bi-background-gray; +.bi-date-picker { } \ No newline at end of file diff --git a/src/less/widget/filemanager/nav/button/button.nav.filemanager.less b/src/less/widget/filemanager/nav/button/button.nav.filemanager.less index 64361afd7..cd78da890 100644 --- a/src/less/widget/filemanager/nav/button/button.nav.filemanager.less +++ b/src/less/widget/filemanager/nav/button/button.nav.filemanager.less @@ -3,7 +3,6 @@ .bi-file-manager-nav-button { & .file-manager-nav-button-text { max-width: 200px; - background: @color-bi-background-default; &.active { background-color: @color-bi-background-normal; color: @color-bi-text-gray; @@ -17,12 +16,10 @@ .bi-theme-dark { .bi-file-manager-nav-button { & .file-manager-nav-button-text { - background: @color-bi-background-default-theme-dark; &.active { background-color: @color-bi-background-normal-theme-dark; color: @color-bi-text-gray; } } } - } \ No newline at end of file diff --git a/src/less/widget/image/button/href/image.button.href.less b/src/less/widget/image/button/href/image.button.href.less deleted file mode 100644 index c21685e57..000000000 --- a/src/less/widget/image/button/href/image.button.href.less +++ /dev/null @@ -1,7 +0,0 @@ -@import "../../../../bibase"; -.bi-image-button-href { - & .image-button-href-icon-button{ - z-index: 1; - font-size: @font-size-16 - } -} \ No newline at end of file diff --git a/src/less/widget/image/button/size/image.button.size.less b/src/less/widget/image/button/size/image.button.size.less deleted file mode 100644 index b81543839..000000000 --- a/src/less/widget/image/button/size/image.button.size.less +++ /dev/null @@ -1,6 +0,0 @@ -@import "../../../../bibase"; -.bi-image-button-size{ - & .image-button-size-button-group{ - font-size: @font-size-12; - } -} \ No newline at end of file diff --git a/src/less/widget/image/uploadimage.less b/src/less/widget/image/uploadimage.less deleted file mode 100644 index e94358612..000000000 --- a/src/less/widget/image/uploadimage.less +++ /dev/null @@ -1,16 +0,0 @@ -@import "../../bibase"; -.bi-upload-image{ - & .upload-image-text-button-label{ - font-size: @font-size-14; - color: @font-color-tips - } - - & .upload-image-icon-button{ - z-index: 1; - font-size: @font-size-16; - } - - & .upload-image-delete-label{ - font-size: @font-size-14; - } -} \ No newline at end of file diff --git a/src/widget/date/calendar/picker.date.js b/src/widget/date/calendar/picker.date.js index cf395224d..ffec7bebf 100644 --- a/src/widget/date/calendar/picker.date.js +++ b/src/widget/date/calendar/picker.date.js @@ -7,7 +7,7 @@ BI.DatePicker = BI.inherit(BI.Widget, { _defaultConfig: function () { var conf = BI.DatePicker.superclass._defaultConfig.apply(this, arguments); return BI.extend(conf, { - baseCls: "bi-date-picker", + baseCls: "bi-date-picker bi-background", height: 25, min: '1900-01-01', //最小日期 max: '2099-12-31' //最大日期 diff --git a/src/widget/image/button/href/image.button.href.js b/src/widget/image/button/href/image.button.href.js deleted file mode 100644 index 41d44369d..000000000 --- a/src/widget/image/button/href/image.button.href.js +++ /dev/null @@ -1,65 +0,0 @@ -/** - * Created by GameJian on 2016/1/28. - */ -BI.ImageButtonHref = BI.inherit(BI.Single, { - - _defaultConfig: function () { - return BI.extend(BI.ImageButtonHref.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-image-button-href", - title: BI.i18nText("BI-Add_Href") - }) - }, - - _init: function () { - BI.ImageButtonHref.superclass._init.apply(this, arguments); - var self = this, o = this.options; - this.trigger = BI.createWidget({ - type: "bi.icon_button", - cls: "img-href-font", - title: o.title, - height: 24, - width: 24 - }); - - this.input = BI.createWidget({ - type: "bi.clear_editor", - watermark: BI.i18nText("BI-Input_Href"), - width: 255, - height: 30 - }); - this.input.on(BI.ClearEditor.EVENT_CONFIRM, function () { - self.combo.hideView(); - }); - - this.combo = BI.createWidget({ - type: "bi.combo", - element: this, - direction: "bottom,left", - adjustYOffset: 3, - el: this.trigger, - popup: { - el: this.input, - stopPropagation: false, - minWidth: 255 - } - }); - - this.combo.on(BI.Combo.EVENT_AFTER_POPUPVIEW, function () { - self.input.focus() - }); - - this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () { - self.fireEvent(BI.ImageButtonHref.EVENT_CHANGE, arguments) - }) - }, - - getValue: function () { - return this.input.getValue(); - }, - - setValue: function (url) { - this.input.setValue(url) - } -}); -BI.ImageButtonHref.EVENT_CHANGE = "BI.ImageButtonHref.EVENT_CHANGE"; -BI.shortcut("bi.image_button_href", BI.ImageButtonHref); \ No newline at end of file