From e29a50a71d2d03ec65f6de8658cb80fb08d488de Mon Sep 17 00:00:00 2001 From: guy Date: Tue, 25 Apr 2017 16:35:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E5=B1=80=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bi/base.js | 8 ++++---- docs/base.js | 8 ++++---- src/base/pane.js | 8 ++++---- src/css/resource/font.css | 12 ++++++------ src/less/lib/colors.less | 12 +----------- src/less/lib/constant.less | 5 +---- src/less/resource/font.less | 8 ++++---- 7 files changed, 24 insertions(+), 37 deletions(-) diff --git a/bi/base.js b/bi/base.js index 82e71967ee..5728fef8de 100644 --- a/bi/base.js +++ b/bi/base.js @@ -243,7 +243,7 @@ BI.Pane = BI.inherit(BI.Widget, { loading: function () { var self = this, o = this.options; if (o.overlap === true) { - if (!BI.Maskers.has(this.getName())) { + if (!BI.Layers.has(this.getName())) { BI.createWidget({ type: 'bi.vtape', items: [{ @@ -253,10 +253,10 @@ BI.Pane = BI.inherit(BI.Widget, { }, height: 30 }], - element: BI.Maskers.make(this.getName(), this) + element: BI.Layers.make(this.getName(), this) }); } - BI.Maskers.show(self.getName()); + BI.Layers.show(self.getName()); } else if (BI.isNull(this._loading)) { this._loading = BI.createWidget({ type: "bi.layout", @@ -279,7 +279,7 @@ BI.Pane = BI.inherit(BI.Widget, { loaded: function () { var self = this, o = this.options; - BI.Maskers.remove(self.getName()); + BI.Layers.remove(self.getName()); this._loading && this._loading.destroy(); this._loading && (this._loading = null); o.onLoaded(); diff --git a/docs/base.js b/docs/base.js index 82e71967ee..5728fef8de 100644 --- a/docs/base.js +++ b/docs/base.js @@ -243,7 +243,7 @@ BI.Pane = BI.inherit(BI.Widget, { loading: function () { var self = this, o = this.options; if (o.overlap === true) { - if (!BI.Maskers.has(this.getName())) { + if (!BI.Layers.has(this.getName())) { BI.createWidget({ type: 'bi.vtape', items: [{ @@ -253,10 +253,10 @@ BI.Pane = BI.inherit(BI.Widget, { }, height: 30 }], - element: BI.Maskers.make(this.getName(), this) + element: BI.Layers.make(this.getName(), this) }); } - BI.Maskers.show(self.getName()); + BI.Layers.show(self.getName()); } else if (BI.isNull(this._loading)) { this._loading = BI.createWidget({ type: "bi.layout", @@ -279,7 +279,7 @@ BI.Pane = BI.inherit(BI.Widget, { loaded: function () { var self = this, o = this.options; - BI.Maskers.remove(self.getName()); + BI.Layers.remove(self.getName()); this._loading && this._loading.destroy(); this._loading && (this._loading = null); o.onLoaded(); diff --git a/src/base/pane.js b/src/base/pane.js index ca56775929..1ef5b7f294 100644 --- a/src/base/pane.js +++ b/src/base/pane.js @@ -42,7 +42,7 @@ BI.Pane = BI.inherit(BI.Widget, { loading: function () { var self = this, o = this.options; if (o.overlap === true) { - if (!BI.Maskers.has(this.getName())) { + if (!BI.Layers.has(this.getName())) { BI.createWidget({ type: 'bi.vtape', items: [{ @@ -52,10 +52,10 @@ BI.Pane = BI.inherit(BI.Widget, { }, height: 30 }], - element: BI.Maskers.make(this.getName(), this) + element: BI.Layers.make(this.getName(), this) }); } - BI.Maskers.show(self.getName()); + BI.Layers.show(self.getName()); } else if (BI.isNull(this._loading)) { this._loading = BI.createWidget({ type: "bi.layout", @@ -78,7 +78,7 @@ BI.Pane = BI.inherit(BI.Widget, { loaded: function () { var self = this, o = this.options; - BI.Maskers.remove(self.getName()); + BI.Layers.remove(self.getName()); this._loading && this._loading.destroy(); this._loading && (this._loading = null); o.onLoaded(); diff --git a/src/css/resource/font.css b/src/css/resource/font.css index b7944bb8d4..ac9eeba8c4 100644 --- a/src/css/resource/font.css +++ b/src/css/resource/font.css @@ -411,7 +411,7 @@ .dot-ha-font:focus .b-font:before, .dot-ha-font.hover .b-font:before { content: "\e606"; - color: #f4f4f4; + color: #999999; } .dot-ha-font:active .b-font:before, .dot-ha-font.active .b-font:before { @@ -431,7 +431,7 @@ .dot-e-font:focus .b-font:before, .dot-e-font.hover .b-font:before { content: "\e606"; - color: #f4f4f4; + color: #999999; } .dot-e-font.active .b-font:before { content: "\e606"; @@ -2242,12 +2242,12 @@ } .group-add-font .b-font:before { content: "\e649"; - color: #808080; + color: #999999; } .group-add-font.native .b-font:before, .group-add-font.disabled .b-font:before { content: "\e649"; - color: #808080; + color: #999999; } .sortable-font .b-font:before { content: "\e63b"; @@ -2642,7 +2642,7 @@ .data-link-check-font:focus .b-font:before, .data-link-check-font.hover .b-font:before { content: "\e611"; - color: #f4f4f4; + color: #999999; } .data-link-check-font:active .b-font:before, .data-link-check-font.active .b-font:before { @@ -2747,7 +2747,7 @@ .item-check-font:focus .b-font:before, .item-check-font.hover .b-font:before { content: "\e611"; - color: #f4f4f4; + color: #999999; } .item-check-font:active .b-font:before, .item-check-font.active .b-font:before { diff --git a/src/less/lib/colors.less b/src/less/lib/colors.less index f89590aec9..578f333d39 100644 --- a/src/less/lib/colors.less +++ b/src/less/lib/colors.less @@ -41,10 +41,6 @@ @color-bi-background-black: @background-color-black; //深灰色背景 @color-bi-background-dark: @background-color-dark; -//浅灰色背景 -@color-bi-background-gray: @background-color-active; -//浅色背景 -@color-bi-background-light: @background-color-light; //灰化背景 @color-bi-background-disabled: @background-color-disabled; //成功背景色 @@ -71,10 +67,8 @@ //灰化分割线 @color-bi-split-disabled: @split-color-disabled; -//基本边框色 +//黑色边框色 @color-bi-border-black: @border-color-black; -//基本边框色 -@color-bi-border-normal: @border-color-normal; //默认边框色 @color-bi-border-default: @border-color-default; //outline颜色 @@ -115,10 +109,6 @@ //失败边框 @color-bi-tooltip-warning-border: @border-color-error; -//dashboard -@color-dashboard-toolbar-border: @border-color-main; -@color-dashboard-toolbar-font: @font-color-light-gray; - //dimension @color-dimension-background: @background-color-light-blue; @color-target-background: @background-color-light-green; diff --git a/src/less/lib/constant.less b/src/less/lib/constant.less index 50ae11399c..9e9341b59f 100644 --- a/src/less/lib/constant.less +++ b/src/less/lib/constant.less @@ -32,17 +32,15 @@ @font-color-orange: #fcc550; //font-icon color -@icon-color-normal: #808080; +@icon-color-normal: #999999; @icon-color-active: #3f8ce8; //background color @background-color-black: #1a1a1a;// -@background-color-light: #eaeaea; @background-color-default: #ffffff;// @background-color-default-theme-dark: #242640;// @background-color-normal: #eff1f4;// @background-color-normal-theme-dark: #191B2B;// -@background-color-active: #f4f4f4; @background-color-highlight: #3f8ce8; @background-color-dark: #d4dadd; @background-color-disabled: #c4c6c6; @@ -71,7 +69,6 @@ @border-color-normal: #d4dadd; @border-color-line: #d4dadd; @border-color-line-theme-dark: #525466; -@border-color-main: #d3d9dc; @border-color-outline: #3f8ce8; @border-color-highlight: #178cdf; @border-color-resize: #e85050; diff --git a/src/less/resource/font.less b/src/less/resource/font.less index 7f4580ef33..ad9bf42153 100644 --- a/src/less/resource/font.less +++ b/src/less/resource/font.less @@ -39,8 +39,8 @@ //子菜单选中 .font(dot-font, @font-dot, @color-bi-text-black); .font-hover(dot-h-font, @font-dot, @color-bi-text-black); -.font-hover-active(dot-ha-font, @font-dot, @color-bi-text, @color-bi-background-gray, @color-bi-text-black); -.font-effect(dot-e-font, @font-dot, @color-bi-text, @color-bi-background-gray, @color-bi-text-highlight, @color-bi-text-black); +.font-hover-active(dot-ha-font, @font-dot, @color-bi-text, @color-bi-text-gray, @color-bi-text-black); +.font-effect(dot-e-font, @font-dot, @color-bi-text, @color-bi-text-gray, @color-bi-text-highlight, @color-bi-text-black); //向右展开子菜单 .font(pull-right-font, @font-right-triangle); @@ -251,7 +251,7 @@ .font(add-new-table-pull-down-font, @font-down, @color-bi-text); -.font-hover-active(data-link-check-font, @font-check-mark, @color-bi-text, @color-bi-background-gray, @color-bi-text-highlight); +.font-hover-active(data-link-check-font, @font-check-mark, @color-bi-text, @color-bi-text-gray, @color-bi-text-highlight); //点击编辑 .font-hover(edit-set-font, @font-detail-set); @@ -264,7 +264,7 @@ .font-hover-active(folder-list-view, @font-classify, inherit, inherit, @color-bi-text); .font-hover-active(folder-card-view, @font-tile-view, inherit, inherit, @color-bi-text); -.font-hover-active(item-check-font, @font-check-mark, @color-bi-text, @color-bi-background-gray, @color-bi-font-active); +.font-hover-active(item-check-font, @font-check-mark, @color-bi-text, @color-bi-text-gray, @color-bi-font-active); //表格上面的相关操作——升序、降序、不排序、过滤 .font-hover(table-no-sort-no-filter-font, @font-no-sort-no-filter);