From 2ee10f02f045198b67273464b829e2fd66dd0e49 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Wed, 20 Jun 2018 09:00:06 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=AD=E5=A4=B4=E6=9B=BF=E6=8D=A2=EF=BC=8Cbi?= =?UTF-8?q?-background=E8=83=8C=E6=99=AF=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demo/css/main.css | 2 +- demo/js/core/layout/demo.htape.js | 2 +- dist/base.js | 1 - dist/bundle.css | 28 +++++++++++++++++-- dist/bundle.js | 5 ++-- dist/case.js | 4 +-- dist/core.css | 2 +- dist/core_without_normalize.css | 2 +- dist/demo.css | 2 +- dist/demo.js | 2 +- dist/fineui.css | 28 +++++++++++++++++-- dist/fineui.js | 5 ++-- dist/resource.css | 22 +++++++++++++++ dist/widget.css | 4 +-- public/css/font.css | 22 +++++++++++++++ src/base/single/editor/editor.js | 1 - src/case/checkbox/check.arrownode.js | 4 +-- src/css/core/utils/common.css | 2 +- src/css/resource/font.css | 22 +++++++++++++++ .../widget/filemanager/nav/button/button.css | 2 +- src/css/widget/previewtable/previewtable.css | 2 +- src/less/lib/constant.less | 2 +- src/less/resource/font.less | 3 ++ ui/css/font.css | 22 +++++++++++++++ 24 files changed, 161 insertions(+), 30 deletions(-) diff --git a/demo/css/main.css b/demo/css/main.css index 092a291f1..3e8202ca0 100644 --- a/demo/css/main.css +++ b/demo/css/main.css @@ -40,7 +40,7 @@ background-color: #178cdf; } body { - background-color: #fafbfc; + background-color: #f7f8fa; } #wrapper { position: absolute; diff --git a/demo/js/core/layout/demo.htape.js b/demo/js/core/layout/demo.htape.js index b749787bc..d2f0d6009 100644 --- a/demo/js/core/layout/demo.htape.js +++ b/demo/js/core/layout/demo.htape.js @@ -14,7 +14,7 @@ Demo.HtapeLayout = BI.inherit(BI.Widget, { el: { type: "bi.label", text: "1", - cls: "layout-bg1" + cls: "bi-background" } }, { width: 200, diff --git a/dist/base.js b/dist/base.js index 0b1026be4..6f7bc05db 100644 --- a/dist/base.js +++ b/dist/base.js @@ -18393,7 +18393,6 @@ BI.Editor = BI.inherit(BI.Single, { element: this, items: items }); - this.element[0].tabIndex = -1; this.editor.on(BI.Controller.EVENT_CHANGE, function () { self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); }); diff --git a/dist/bundle.css b/dist/bundle.css index 1a56f03c7..ddb33275b 100644 --- a/dist/bundle.css +++ b/dist/bundle.css @@ -325,7 +325,7 @@ textarea { clear: both; } .bi-background { - background-color: #fafbfc; + background-color: #f7f8fa; color: #3d4d66; } .bi-background .bi-input { @@ -3673,7 +3673,7 @@ ul.ztree.zTreeDragUL { max-width: 200px; } .bi-file-manager-nav-button .file-manager-nav-button-text.active { - background-color: #fafbfc; + background-color: #f7f8fa; color: #999999; } .bi-file-manager-nav-button .file-manager-nav-button-triangle { @@ -3928,7 +3928,7 @@ ul.ztree.zTreeDragUL { } .bi-preview-table > div > table > thead > tr.odd, .bi-preview-table > div > div > div > table > thead > tr.odd { - background-color: #fafbfc; + background-color: #f7f8fa; } .bi-theme-dark .bi-preview-table > div > table > thead > tr.odd, .bi-theme-dark .bi-preview-table > div > div > div > table > thead > tr.odd { @@ -4957,6 +4957,28 @@ textarea::-webkit-scrollbar-thumb:hover { content: "\e6d7"; color: inherit; } +.expander-right-font .b-font { + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); +} +.expander-right-font .b-font:before { + content: "\e6d8"; + color: inherit; +} +.expander-right-font.disabled .b-font:before { + content: "\e6d8"; + color: inherit; +} +.expander-down-font .b-font { + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); +} +.expander-down-font .b-font:before { + content: "\e6d7"; + color: inherit; +} +.expander-down-font.disabled .b-font:before { + content: "\e6d7"; + color: inherit; +} .solid-triangle-top-font .b-font { *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } diff --git a/dist/bundle.js b/dist/bundle.js index 2d4eab5bb..a9c496a12 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -54163,7 +54163,6 @@ BI.Editor = BI.inherit(BI.Single, { element: this, items: items }); - this.element[0].tabIndex = -1; this.editor.on(BI.Controller.EVENT_CHANGE, function () { self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); }); @@ -74519,9 +74518,9 @@ BI.ArrowTreeGroupNodeCheckbox = BI.inherit(BI.IconButton, { setSelected: function (v) { BI.ArrowTreeGroupNodeCheckbox.superclass.setSelected.apply(this, arguments); if(v) { - this.element.removeClass("pull-right-font").addClass("pull-down-font"); + this.element.removeClass("expander-right-font").addClass("expander-down-font"); } else { - this.element.removeClass("pull-down-font").addClass("pull-right-font"); + this.element.removeClass("expander-down-font").addClass("expander-right-font"); } } }); diff --git a/dist/case.js b/dist/case.js index a73d2eb8a..e1d08b18f 100644 --- a/dist/case.js +++ b/dist/case.js @@ -2049,9 +2049,9 @@ BI.ArrowTreeGroupNodeCheckbox = BI.inherit(BI.IconButton, { setSelected: function (v) { BI.ArrowTreeGroupNodeCheckbox.superclass.setSelected.apply(this, arguments); if(v) { - this.element.removeClass("pull-right-font").addClass("pull-down-font"); + this.element.removeClass("expander-right-font").addClass("expander-down-font"); } else { - this.element.removeClass("pull-down-font").addClass("pull-right-font"); + this.element.removeClass("expander-down-font").addClass("expander-right-font"); } } }); diff --git a/dist/core.css b/dist/core.css index fccaa957d..05ebca71b 100644 --- a/dist/core.css +++ b/dist/core.css @@ -325,7 +325,7 @@ textarea { clear: both; } .bi-background { - background-color: #fafbfc; + background-color: #f7f8fa; color: #3d4d66; } .bi-background .bi-input { diff --git a/dist/core_without_normalize.css b/dist/core_without_normalize.css index f4ee6c298..4ed8b5c56 100644 --- a/dist/core_without_normalize.css +++ b/dist/core_without_normalize.css @@ -47,7 +47,7 @@ textarea { clear: both; } .bi-background { - background-color: #fafbfc; + background-color: #f7f8fa; color: #3d4d66; } .bi-background .bi-input { diff --git a/dist/demo.css b/dist/demo.css index 0f5eb014a..30588c5f0 100644 --- a/dist/demo.css +++ b/dist/demo.css @@ -43,7 +43,7 @@ background-color: #178cdf; } body { - background-color: #fafbfc; + background-color: #f7f8fa; } #wrapper { position: absolute; diff --git a/dist/demo.js b/dist/demo.js index 8ab864216..d02484283 100644 --- a/dist/demo.js +++ b/dist/demo.js @@ -8200,7 +8200,7 @@ Demo.HtapeLayout = BI.inherit(BI.Widget, { el: { type: "bi.label", text: "1", - cls: "layout-bg1" + cls: "bi-background" } }, { width: 200, diff --git a/dist/fineui.css b/dist/fineui.css index 916877b70..54c7c1caa 100644 --- a/dist/fineui.css +++ b/dist/fineui.css @@ -325,7 +325,7 @@ textarea { clear: both; } .bi-background { - background-color: #fafbfc; + background-color: #f7f8fa; color: #3d4d66; } .bi-background .bi-input { @@ -3673,7 +3673,7 @@ ul.ztree.zTreeDragUL { max-width: 200px; } .bi-file-manager-nav-button .file-manager-nav-button-text.active { - background-color: #fafbfc; + background-color: #f7f8fa; color: #999999; } .bi-file-manager-nav-button .file-manager-nav-button-triangle { @@ -3928,7 +3928,7 @@ ul.ztree.zTreeDragUL { } .bi-preview-table > div > table > thead > tr.odd, .bi-preview-table > div > div > div > table > thead > tr.odd { - background-color: #fafbfc; + background-color: #f7f8fa; } .bi-theme-dark .bi-preview-table > div > table > thead > tr.odd, .bi-theme-dark .bi-preview-table > div > div > div > table > thead > tr.odd { @@ -4957,6 +4957,28 @@ textarea::-webkit-scrollbar-thumb:hover { content: "\e6d7"; color: inherit; } +.expander-right-font .b-font { + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); +} +.expander-right-font .b-font:before { + content: "\e6d8"; + color: inherit; +} +.expander-right-font.disabled .b-font:before { + content: "\e6d8"; + color: inherit; +} +.expander-down-font .b-font { + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); +} +.expander-down-font .b-font:before { + content: "\e6d7"; + color: inherit; +} +.expander-down-font.disabled .b-font:before { + content: "\e6d7"; + color: inherit; +} .solid-triangle-top-font .b-font { *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } diff --git a/dist/fineui.js b/dist/fineui.js index a9b6bb1fa..41674ef83 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -54406,7 +54406,6 @@ BI.Editor = BI.inherit(BI.Single, { element: this, items: items }); - this.element[0].tabIndex = -1; this.editor.on(BI.Controller.EVENT_CHANGE, function () { self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); }); @@ -74762,9 +74761,9 @@ BI.ArrowTreeGroupNodeCheckbox = BI.inherit(BI.IconButton, { setSelected: function (v) { BI.ArrowTreeGroupNodeCheckbox.superclass.setSelected.apply(this, arguments); if(v) { - this.element.removeClass("pull-right-font").addClass("pull-down-font"); + this.element.removeClass("expander-right-font").addClass("expander-down-font"); } else { - this.element.removeClass("pull-down-font").addClass("pull-right-font"); + this.element.removeClass("expander-down-font").addClass("expander-right-font"); } } }); diff --git a/dist/resource.css b/dist/resource.css index b8db4586c..4b8178e29 100644 --- a/dist/resource.css +++ b/dist/resource.css @@ -835,6 +835,28 @@ textarea::-webkit-scrollbar-thumb:hover { content: "\e6d7"; color: inherit; } +.expander-right-font .b-font { + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); +} +.expander-right-font .b-font:before { + content: "\e6d8"; + color: inherit; +} +.expander-right-font.disabled .b-font:before { + content: "\e6d8"; + color: inherit; +} +.expander-down-font .b-font { + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); +} +.expander-down-font .b-font:before { + content: "\e6d7"; + color: inherit; +} +.expander-down-font.disabled .b-font:before { + content: "\e6d7"; + color: inherit; +} .solid-triangle-top-font .b-font { *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } diff --git a/dist/widget.css b/dist/widget.css index c8032df2b..2019d9768 100644 --- a/dist/widget.css +++ b/dist/widget.css @@ -28,7 +28,7 @@ max-width: 200px; } .bi-file-manager-nav-button .file-manager-nav-button-text.active { - background-color: #fafbfc; + background-color: #f7f8fa; color: #999999; } .bi-file-manager-nav-button .file-manager-nav-button-triangle { @@ -283,7 +283,7 @@ } .bi-preview-table > div > table > thead > tr.odd, .bi-preview-table > div > div > div > table > thead > tr.odd { - background-color: #fafbfc; + background-color: #f7f8fa; } .bi-theme-dark .bi-preview-table > div > table > thead > tr.odd, .bi-theme-dark .bi-preview-table > div > div > div > table > thead > tr.odd { diff --git a/public/css/font.css b/public/css/font.css index bc0d59675..c63067c30 100644 --- a/public/css/font.css +++ b/public/css/font.css @@ -509,6 +509,28 @@ content: "\e6d7"; color: inherit; } +.expander-right-font .b-font { + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); +} +.expander-right-font .b-font:before { + content: "\e6d8"; + color: inherit; +} +.expander-right-font.disabled .b-font:before { + content: "\e6d8"; + color: inherit; +} +.expander-down-font .b-font { + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); +} +.expander-down-font .b-font:before { + content: "\e6d7"; + color: inherit; +} +.expander-down-font.disabled .b-font:before { + content: "\e6d7"; + color: inherit; +} .solid-triangle-top-font .b-font { *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } diff --git a/src/base/single/editor/editor.js b/src/base/single/editor/editor.js index 5e102aa0e..a2ac09fd1 100644 --- a/src/base/single/editor/editor.js +++ b/src/base/single/editor/editor.js @@ -98,7 +98,6 @@ BI.Editor = BI.inherit(BI.Single, { element: this, items: items }); - this.element[0].tabIndex = -1; this.editor.on(BI.Controller.EVENT_CHANGE, function () { self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); }); diff --git a/src/case/checkbox/check.arrownode.js b/src/case/checkbox/check.arrownode.js index 99f0feabd..84b6fd578 100644 --- a/src/case/checkbox/check.arrownode.js +++ b/src/case/checkbox/check.arrownode.js @@ -14,9 +14,9 @@ BI.ArrowTreeGroupNodeCheckbox = BI.inherit(BI.IconButton, { setSelected: function (v) { BI.ArrowTreeGroupNodeCheckbox.superclass.setSelected.apply(this, arguments); if(v) { - this.element.removeClass("pull-right-font").addClass("pull-down-font"); + this.element.removeClass("expander-right-font").addClass("expander-down-font"); } else { - this.element.removeClass("pull-down-font").addClass("pull-right-font"); + this.element.removeClass("expander-down-font").addClass("expander-right-font"); } } }); diff --git a/src/css/core/utils/common.css b/src/css/core/utils/common.css index 5f3a2303e..867dbbec6 100644 --- a/src/css/core/utils/common.css +++ b/src/css/core/utils/common.css @@ -47,7 +47,7 @@ textarea { clear: both; } .bi-background { - background-color: #fafbfc; + background-color: #f7f8fa; color: #3d4d66; } .bi-background .bi-input { diff --git a/src/css/resource/font.css b/src/css/resource/font.css index 11d8f4568..a215db24d 100644 --- a/src/css/resource/font.css +++ b/src/css/resource/font.css @@ -509,6 +509,28 @@ content: "\e6d7"; color: inherit; } +.expander-right-font .b-font { + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); +} +.expander-right-font .b-font:before { + content: "\e6d8"; + color: inherit; +} +.expander-right-font.disabled .b-font:before { + content: "\e6d8"; + color: inherit; +} +.expander-down-font .b-font { + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); +} +.expander-down-font .b-font:before { + content: "\e6d7"; + color: inherit; +} +.expander-down-font.disabled .b-font:before { + content: "\e6d7"; + color: inherit; +} .solid-triangle-top-font .b-font { *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } diff --git a/src/css/widget/filemanager/nav/button/button.css b/src/css/widget/filemanager/nav/button/button.css index cbb1b329a..095993d68 100644 --- a/src/css/widget/filemanager/nav/button/button.css +++ b/src/css/widget/filemanager/nav/button/button.css @@ -2,7 +2,7 @@ max-width: 200px; } .bi-file-manager-nav-button .file-manager-nav-button-text.active { - background-color: #fafbfc; + background-color: #f7f8fa; color: #999999; } .bi-file-manager-nav-button .file-manager-nav-button-triangle { diff --git a/src/css/widget/previewtable/previewtable.css b/src/css/widget/previewtable/previewtable.css index 043b8d6cf..7647fdecb 100644 --- a/src/css/widget/previewtable/previewtable.css +++ b/src/css/widget/previewtable/previewtable.css @@ -19,7 +19,7 @@ } .bi-preview-table > div > table > thead > tr.odd, .bi-preview-table > div > div > div > table > thead > tr.odd { - background-color: #fafbfc; + background-color: #f7f8fa; } .bi-theme-dark .bi-preview-table > div > table > thead > tr.odd, .bi-theme-dark .bi-preview-table > div > div > div > table > thead > tr.odd { diff --git a/src/less/lib/constant.less b/src/less/lib/constant.less index feea9bde2..b5eb2651c 100644 --- a/src/less/lib/constant.less +++ b/src/less/lib/constant.less @@ -33,7 +33,7 @@ @background-color-black: #1a1a1a;// @background-color-default: #ffffff;// @background-color-default-theme-dark: #242640;// -@background-color-normal: #fafbfc;// +@background-color-normal: #f7f8fa;// @background-color-normal-theme-dark: #191B2B;// @background-color-light-highlight: #eaf2fd; @background-color-highlight: #3685f2; diff --git a/src/less/resource/font.less b/src/less/resource/font.less index bc4416039..a50c6127d 100644 --- a/src/less/resource/font.less +++ b/src/less/resource/font.less @@ -67,6 +67,9 @@ .font-hover(column-pre-page-h-font, @font-solid-top); .font-hover(column-next-page-h-font, @font-solid-bottom); +.font(expander-right-font, @font-solid-right); +.font(expander-down-font, @font-solid-bottom); + // 实心下拉三角 .font-hover(solid-triangle-top-font, @font-solid-top); .font-hover(solid-triangle-bottom-font, @font-solid-bottom); diff --git a/ui/css/font.css b/ui/css/font.css index 7aae4ddc0..05aa79032 100644 --- a/ui/css/font.css +++ b/ui/css/font.css @@ -509,6 +509,28 @@ content: "\e6d7"; color: inherit; } +.expander-right-font .b-font { + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); +} +.expander-right-font .b-font:before { + content: "\e6d8"; + color: inherit; +} +.expander-right-font.disabled .b-font:before { + content: "\e6d8"; + color: inherit; +} +.expander-down-font .b-font { + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); +} +.expander-down-font .b-font:before { + content: "\e6d7"; + color: inherit; +} +.expander-down-font.disabled .b-font:before { + content: "\e6d7"; + color: inherit; +} .solid-triangle-top-font .b-font { *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); }