From 8ded533739e62e9103c8450ddf707780e77e5345 Mon Sep 17 00:00:00 2001 From: Young Date: Wed, 20 Dec 2017 10:45:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=95=E5=BC=80=E6=94=B6=E8=B5=B7=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E6=9B=BF=E6=8D=A2&bi-background=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bi/case.js | 4 ++-- bi/core.css | 2 +- bi/widget.css | 4 ++-- demo/css/main.css | 2 +- dist/bundle.css | 6 +++--- dist/bundle.js | 4 ++-- dist/case.js | 4 ++-- dist/core.css | 2 +- dist/core_without_normalize.css | 2 +- dist/demo.css | 2 +- dist/resource.css | 8 ++++---- dist/widget.css | 4 ++-- src/case/checkbox/check.arrowtreegroupnode.js | 4 ++-- src/css/core/utils/common.css | 2 +- src/css/resource/font.css | 8 ++++---- .../filemanager/nav/button/button.nav.filemanager.css | 2 +- src/css/widget/previewtable/previewtable.css | 2 +- src/less/lib/constant.less | 2 +- src/less/lib/font.less | 2 +- 19 files changed, 33 insertions(+), 33 deletions(-) diff --git a/bi/case.js b/bi/case.js index b9f3ed7b58..12bf21a210 100644 --- a/bi/case.js +++ b/bi/case.js @@ -2058,9 +2058,9 @@ BI.ArrowTreeGroupNodeCheckbox=BI.inherit(BI.IconButton,{ setSelected: function(v){ BI.ArrowTreeGroupNodeCheckbox.superclass.setSelected.apply(this, arguments); if(v) { - this.element.removeClass("column-next-page-h-font").addClass("column-pre-page-h-font"); + this.element.removeClass("pull-down-font").addClass("pull-right-font"); } else { - this.element.removeClass("column-pre-page-h-font").addClass("column-next-page-h-font"); + this.element.removeClass("pull-right-font").addClass("pull-down-font"); } } }); diff --git a/bi/core.css b/bi/core.css index f7464a8af0..0849394ff8 100644 --- a/bi/core.css +++ b/bi/core.css @@ -322,7 +322,7 @@ i { clear: both; } .bi-background { - background-color: #eff1f4; + background-color: #fafbfc; color: #3d4d66; } .bi-background .bi-input { diff --git a/bi/widget.css b/bi/widget.css index 00fa145656..e05e84fee8 100644 --- a/bi/widget.css +++ b/bi/widget.css @@ -61,7 +61,7 @@ max-width: 200px; } .bi-file-manager-nav-button .file-manager-nav-button-text.active { - background-color: #eff1f4; + background-color: #fafbfc; color: #999999; } .bi-file-manager-nav-button .file-manager-nav-button-triangle { @@ -221,7 +221,7 @@ } .bi-preview-table > div > table > thead > tr.odd, .bi-preview-table > div > div > div > table > thead > tr.odd { - background-color: #eff1f4; + background-color: #fafbfc; } .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/demo/css/main.css b/demo/css/main.css index c1f0151378..09095033e9 100644 --- a/demo/css/main.css +++ b/demo/css/main.css @@ -40,7 +40,7 @@ background-color: #178cdf; } body { - background-color: #eff1f4; + background-color: #fafbfc; } .bi-theme-dark body { background-color: #191B2B; diff --git a/dist/bundle.css b/dist/bundle.css index d5bda6db75..49fa579379 100644 --- a/dist/bundle.css +++ b/dist/bundle.css @@ -322,7 +322,7 @@ i { clear: both; } .bi-background { - background-color: #eff1f4; + background-color: #fafbfc; color: #3d4d66; } .bi-background .bi-input { @@ -3251,7 +3251,7 @@ ul.ztree.zTreeDragUL { max-width: 200px; } .bi-file-manager-nav-button .file-manager-nav-button-text.active { - background-color: #eff1f4; + background-color: #fafbfc; color: #999999; } .bi-file-manager-nav-button .file-manager-nav-button-triangle { @@ -3411,7 +3411,7 @@ ul.ztree.zTreeDragUL { } .bi-preview-table > div > table > thead > tr.odd, .bi-preview-table > div > div > div > table > thead > tr.odd { - background-color: #eff1f4; + background-color: #fafbfc; } .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/dist/bundle.js b/dist/bundle.js index 8a4f3fb64d..e05c2acfed 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -64190,9 +64190,9 @@ BI.ArrowTreeGroupNodeCheckbox=BI.inherit(BI.IconButton,{ setSelected: function(v){ BI.ArrowTreeGroupNodeCheckbox.superclass.setSelected.apply(this, arguments); if(v) { - this.element.removeClass("column-next-page-h-font").addClass("column-pre-page-h-font"); + this.element.removeClass("pull-down-font").addClass("pull-right-font"); } else { - this.element.removeClass("column-pre-page-h-font").addClass("column-next-page-h-font"); + this.element.removeClass("pull-right-font").addClass("pull-down-font"); } } }); diff --git a/dist/case.js b/dist/case.js index b9f3ed7b58..12bf21a210 100644 --- a/dist/case.js +++ b/dist/case.js @@ -2058,9 +2058,9 @@ BI.ArrowTreeGroupNodeCheckbox=BI.inherit(BI.IconButton,{ setSelected: function(v){ BI.ArrowTreeGroupNodeCheckbox.superclass.setSelected.apply(this, arguments); if(v) { - this.element.removeClass("column-next-page-h-font").addClass("column-pre-page-h-font"); + this.element.removeClass("pull-down-font").addClass("pull-right-font"); } else { - this.element.removeClass("column-pre-page-h-font").addClass("column-next-page-h-font"); + this.element.removeClass("pull-right-font").addClass("pull-down-font"); } } }); diff --git a/dist/core.css b/dist/core.css index f7464a8af0..0849394ff8 100644 --- a/dist/core.css +++ b/dist/core.css @@ -322,7 +322,7 @@ i { clear: both; } .bi-background { - background-color: #eff1f4; + background-color: #fafbfc; color: #3d4d66; } .bi-background .bi-input { diff --git a/dist/core_without_normalize.css b/dist/core_without_normalize.css index abe2f0a54b..e9962a5b39 100644 --- a/dist/core_without_normalize.css +++ b/dist/core_without_normalize.css @@ -39,7 +39,7 @@ clear: both; } .bi-background { - background-color: #eff1f4; + background-color: #fafbfc; color: #3d4d66; } .bi-background .bi-input { diff --git a/dist/demo.css b/dist/demo.css index 9c9a8ff7a3..42d2ecbb6a 100644 --- a/dist/demo.css +++ b/dist/demo.css @@ -43,7 +43,7 @@ background-color: #178cdf; } body { - background-color: #eff1f4; + background-color: #fafbfc; } .bi-theme-dark body { background-color: #191B2B; diff --git a/dist/resource.css b/dist/resource.css index 6b9315a1c6..7448f134ab 100644 --- a/dist/resource.css +++ b/dist/resource.css @@ -951,19 +951,19 @@ textarea::-webkit-scrollbar-thumb:hover { color: #ffffff; } .primary-key-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ';'); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .primary-key-font .b-font:before { - content: "\e67d;"; + content: "\e67d"; color: inherit; } .primary-key-font:hover .b-font:before, .primary-key-font.hover .b-font:before { - content: "\e67d;"; + content: "\e67d"; color: inherit; } .primary-key-font.disabled .b-font:before { - content: "\e67d;"; + content: "\e67d"; color: inherit; } .drag-tag-font .b-font { diff --git a/dist/widget.css b/dist/widget.css index 00fa145656..e05e84fee8 100644 --- a/dist/widget.css +++ b/dist/widget.css @@ -61,7 +61,7 @@ max-width: 200px; } .bi-file-manager-nav-button .file-manager-nav-button-text.active { - background-color: #eff1f4; + background-color: #fafbfc; color: #999999; } .bi-file-manager-nav-button .file-manager-nav-button-triangle { @@ -221,7 +221,7 @@ } .bi-preview-table > div > table > thead > tr.odd, .bi-preview-table > div > div > div > table > thead > tr.odd { - background-color: #eff1f4; + background-color: #fafbfc; } .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/case/checkbox/check.arrowtreegroupnode.js b/src/case/checkbox/check.arrowtreegroupnode.js index c48b4f4f1d..4ab2a2a269 100644 --- a/src/case/checkbox/check.arrowtreegroupnode.js +++ b/src/case/checkbox/check.arrowtreegroupnode.js @@ -16,9 +16,9 @@ BI.ArrowTreeGroupNodeCheckbox=BI.inherit(BI.IconButton,{ setSelected: function(v){ BI.ArrowTreeGroupNodeCheckbox.superclass.setSelected.apply(this, arguments); if(v) { - this.element.removeClass("column-next-page-h-font").addClass("column-pre-page-h-font"); + this.element.removeClass("pull-down-font").addClass("pull-right-font"); } else { - this.element.removeClass("column-pre-page-h-font").addClass("column-next-page-h-font"); + this.element.removeClass("pull-right-font").addClass("pull-down-font"); } } }); diff --git a/src/css/core/utils/common.css b/src/css/core/utils/common.css index 8914a430b9..f8b234403d 100644 --- a/src/css/core/utils/common.css +++ b/src/css/core/utils/common.css @@ -39,7 +39,7 @@ clear: both; } .bi-background { - background-color: #eff1f4; + background-color: #fafbfc; color: #3d4d66; } .bi-background .bi-input { diff --git a/src/css/resource/font.css b/src/css/resource/font.css index bd7815cc68..713d3db927 100644 --- a/src/css/resource/font.css +++ b/src/css/resource/font.css @@ -622,19 +622,19 @@ color: #ffffff; } .primary-key-font .b-font { - *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ';'); + *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .primary-key-font .b-font:before { - content: "\e67d;"; + content: "\e67d"; color: inherit; } .primary-key-font:hover .b-font:before, .primary-key-font.hover .b-font:before { - content: "\e67d;"; + content: "\e67d"; color: inherit; } .primary-key-font.disabled .b-font:before { - content: "\e67d;"; + content: "\e67d"; color: inherit; } .drag-tag-font .b-font { 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 973b3c1c16..95eb8e2df2 100644 --- a/src/css/widget/filemanager/nav/button/button.nav.filemanager.css +++ b/src/css/widget/filemanager/nav/button/button.nav.filemanager.css @@ -2,7 +2,7 @@ max-width: 200px; } .bi-file-manager-nav-button .file-manager-nav-button-text.active { - background-color: #eff1f4; + background-color: #fafbfc; 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 2fc0f57bea..679dff637f 100644 --- a/src/css/widget/previewtable/previewtable.css +++ b/src/css/widget/previewtable/previewtable.css @@ -8,7 +8,7 @@ } .bi-preview-table > div > table > thead > tr.odd, .bi-preview-table > div > div > div > table > thead > tr.odd { - background-color: #eff1f4; + background-color: #fafbfc; } .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 7a05a01fc7..7d7353b170 100644 --- a/src/less/lib/constant.less +++ b/src/less/lib/constant.less @@ -34,7 +34,7 @@ @background-color-black: #1a1a1a;// @background-color-default: #ffffff;// @background-color-default-theme-dark: #242640;// -@background-color-normal: #eff1f4;// +@background-color-normal: #fafbfc;// @background-color-normal-theme-dark: #191B2B;// @background-color-highlight: #3f8ce8; @background-color-dark: #d4dadd; diff --git a/src/less/lib/font.less b/src/less/lib/font.less index 0aaf28f159..1765e535bf 100644 --- a/src/less/lib/font.less +++ b/src/less/lib/font.less @@ -116,7 +116,7 @@ @font-excel-table: "e682"; @font-etl-table: "e680"; @font-sql-table: "e681"; -@font-key: "e67d;"; +@font-key: "e67d"; @font-refresh: "e683"; @font-tile-view: "e685";