From 26feea671d878b1d542e8643012000baf987e9f3 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Thu, 21 Jun 2018 20:12:00 +0800 Subject: [PATCH] BI-25122 && BI-25134 --- dist/bundle.css | 18 +++++++++--------- dist/bundle.js | 7 +++---- dist/case.js | 4 ++-- dist/core.css | 6 +++--- dist/core_without_normalize.css | 6 +++--- dist/fineui.css | 18 +++++++++--------- dist/fineui.js | 7 +++---- dist/resource.css | 12 ++++++------ dist/widget.js | 3 +-- public/css/font.css | 12 ++++++------ src/case/button/item.multiselect.js | 2 +- src/case/toolbar/toolbar.multiselect.js | 2 +- src/css/core/utils/common.css | 6 +++--- src/css/resource/font.css | 12 ++++++------ src/less/core/utils/common.less | 6 +++--- src/less/lib/colors.less | 2 ++ src/less/lib/constant.less | 1 + src/less/resource/font.less | 6 +++--- src/widget/singleselect/singleselect.item.js | 3 +-- ui/css/font.css | 12 ++++++------ 20 files changed, 72 insertions(+), 73 deletions(-) diff --git a/dist/bundle.css b/dist/bundle.css index d356fed55..0040ccf1a 100644 --- a/dist/bundle.css +++ b/dist/bundle.css @@ -472,14 +472,14 @@ textarea { border-color: #3685f2; } .bi-water-mark { - color: #cccccc; + color: #c4c9d1; cursor: text; } .bi-water-mark .bi-input { - color: #cccccc; + color: #c4c9d1; } .bi-water-mark .bi-textarea { - color: #cccccc; + color: #c4c9d1; } .bi-theme-dark .bi-water-mark { color: #666666; @@ -5049,18 +5049,18 @@ textarea::-webkit-scrollbar-thumb:hover { } .pull-down-font .b-font:before { content: "\e70b"; - color: inherit; + color: #647185; } .pull-down-font.disabled .b-font:before { content: "\e70b"; - color: inherit; + color: #647185; } .pull-down-h-font .b-font { *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-down-h-font .b-font:before { content: "\e70b"; - color: inherit; + color: #647185; } .pull-down-h-font:hover .b-font:before, .pull-down-h-font.hover .b-font:before { @@ -5069,14 +5069,14 @@ textarea::-webkit-scrollbar-thumb:hover { } .pull-down-h-font.disabled .b-font:before { content: "\e70b"; - color: inherit; + color: #647185; } .pull-down-ha-font .b-font { *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-down-ha-font .b-font:before { content: "\e70b"; - color: inherit; + color: #647185; } .pull-down-ha-font:hover .b-font:before, .pull-down-ha-font.hover .b-font:before { @@ -5090,7 +5090,7 @@ textarea::-webkit-scrollbar-thumb:hover { } .pull-down-ha-font.disabled .b-font:before { content: "\e70b"; - color: inherit; + color: #647185; } .check-font .b-font { *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); diff --git a/dist/bundle.js b/dist/bundle.js index b105d7a7c..f0dbf6e2d 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -72678,7 +72678,7 @@ BI.MultiSelectItem = BI.inherit(BI.BasicButton, { items: BI.LogicFactory.createLogicItemsByDirection("left", { type: "bi.center_adapt", items: [this.checkbox], - width: 36 + width: 26 }, this.text) })))); }, @@ -86035,7 +86035,7 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, { type: "bi.htape", element: this, items: [{ - width: 36, + width: 26, el: { type: "bi.center_adapt", items: [this.checkbox, this.half] @@ -107260,7 +107260,6 @@ BI.SingleSelectComboItem = BI.inherit(BI.BasicButton, { logic: { dynamic: false }, - hgap: 10, height: 24 }); }, @@ -107290,7 +107289,7 @@ BI.SingleSelectComboItem = BI.inherit(BI.BasicButton, { items: BI.LogicFactory.createLogicItemsByDirection("left", { type: "bi.center_adapt", items: [this.radio], - width: 36 + width: 26 }, this.text) })))); }, diff --git a/dist/case.js b/dist/case.js index 5e6489943..0ed3e1a39 100644 --- a/dist/case.js +++ b/dist/case.js @@ -199,7 +199,7 @@ BI.MultiSelectItem = BI.inherit(BI.BasicButton, { items: BI.LogicFactory.createLogicItemsByDirection("left", { type: "bi.center_adapt", items: [this.checkbox], - width: 36 + width: 26 }, this.text) })))); }, @@ -13556,7 +13556,7 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, { type: "bi.htape", element: this, items: [{ - width: 36, + width: 26, el: { type: "bi.center_adapt", items: [this.checkbox, this.half] diff --git a/dist/core.css b/dist/core.css index 05ebca71b..0ffc1ad4d 100644 --- a/dist/core.css +++ b/dist/core.css @@ -472,14 +472,14 @@ textarea { border-color: #3685f2; } .bi-water-mark { - color: #cccccc; + color: #c4c9d1; cursor: text; } .bi-water-mark .bi-input { - color: #cccccc; + color: #c4c9d1; } .bi-water-mark .bi-textarea { - color: #cccccc; + color: #c4c9d1; } .bi-theme-dark .bi-water-mark { color: #666666; diff --git a/dist/core_without_normalize.css b/dist/core_without_normalize.css index 4ed8b5c56..30156f6df 100644 --- a/dist/core_without_normalize.css +++ b/dist/core_without_normalize.css @@ -194,14 +194,14 @@ textarea { border-color: #3685f2; } .bi-water-mark { - color: #cccccc; + color: #c4c9d1; cursor: text; } .bi-water-mark .bi-input { - color: #cccccc; + color: #c4c9d1; } .bi-water-mark .bi-textarea { - color: #cccccc; + color: #c4c9d1; } .bi-theme-dark .bi-water-mark { color: #666666; diff --git a/dist/fineui.css b/dist/fineui.css index 18fd1aa23..aa0a33add 100644 --- a/dist/fineui.css +++ b/dist/fineui.css @@ -472,14 +472,14 @@ textarea { border-color: #3685f2; } .bi-water-mark { - color: #cccccc; + color: #c4c9d1; cursor: text; } .bi-water-mark .bi-input { - color: #cccccc; + color: #c4c9d1; } .bi-water-mark .bi-textarea { - color: #cccccc; + color: #c4c9d1; } .bi-theme-dark .bi-water-mark { color: #666666; @@ -5049,18 +5049,18 @@ textarea::-webkit-scrollbar-thumb:hover { } .pull-down-font .b-font:before { content: "\e70b"; - color: inherit; + color: #647185; } .pull-down-font.disabled .b-font:before { content: "\e70b"; - color: inherit; + color: #647185; } .pull-down-h-font .b-font { *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-down-h-font .b-font:before { content: "\e70b"; - color: inherit; + color: #647185; } .pull-down-h-font:hover .b-font:before, .pull-down-h-font.hover .b-font:before { @@ -5069,14 +5069,14 @@ textarea::-webkit-scrollbar-thumb:hover { } .pull-down-h-font.disabled .b-font:before { content: "\e70b"; - color: inherit; + color: #647185; } .pull-down-ha-font .b-font { *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-down-ha-font .b-font:before { content: "\e70b"; - color: inherit; + color: #647185; } .pull-down-ha-font:hover .b-font:before, .pull-down-ha-font.hover .b-font:before { @@ -5090,7 +5090,7 @@ textarea::-webkit-scrollbar-thumb:hover { } .pull-down-ha-font.disabled .b-font:before { content: "\e70b"; - color: inherit; + color: #647185; } .check-font .b-font { *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); diff --git a/dist/fineui.js b/dist/fineui.js index 25f60b94b..a65bb4309 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -72921,7 +72921,7 @@ BI.MultiSelectItem = BI.inherit(BI.BasicButton, { items: BI.LogicFactory.createLogicItemsByDirection("left", { type: "bi.center_adapt", items: [this.checkbox], - width: 36 + width: 26 }, this.text) })))); }, @@ -86278,7 +86278,7 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, { type: "bi.htape", element: this, items: [{ - width: 36, + width: 26, el: { type: "bi.center_adapt", items: [this.checkbox, this.half] @@ -107503,7 +107503,6 @@ BI.SingleSelectComboItem = BI.inherit(BI.BasicButton, { logic: { dynamic: false }, - hgap: 10, height: 24 }); }, @@ -107533,7 +107532,7 @@ BI.SingleSelectComboItem = BI.inherit(BI.BasicButton, { items: BI.LogicFactory.createLogicItemsByDirection("left", { type: "bi.center_adapt", items: [this.radio], - width: 36 + width: 26 }, this.text) })))); }, diff --git a/dist/resource.css b/dist/resource.css index 4b8178e29..a1d07f757 100644 --- a/dist/resource.css +++ b/dist/resource.css @@ -926,18 +926,18 @@ textarea::-webkit-scrollbar-thumb:hover { } .pull-down-font .b-font:before { content: "\e70b"; - color: inherit; + color: #647185; } .pull-down-font.disabled .b-font:before { content: "\e70b"; - color: inherit; + color: #647185; } .pull-down-h-font .b-font { *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-down-h-font .b-font:before { content: "\e70b"; - color: inherit; + color: #647185; } .pull-down-h-font:hover .b-font:before, .pull-down-h-font.hover .b-font:before { @@ -946,14 +946,14 @@ textarea::-webkit-scrollbar-thumb:hover { } .pull-down-h-font.disabled .b-font:before { content: "\e70b"; - color: inherit; + color: #647185; } .pull-down-ha-font .b-font { *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-down-ha-font .b-font:before { content: "\e70b"; - color: inherit; + color: #647185; } .pull-down-ha-font:hover .b-font:before, .pull-down-ha-font.hover .b-font:before { @@ -967,7 +967,7 @@ textarea::-webkit-scrollbar-thumb:hover { } .pull-down-ha-font.disabled .b-font:before { content: "\e70b"; - color: inherit; + color: #647185; } .check-font .b-font { *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); diff --git a/dist/widget.js b/dist/widget.js index 759f98cc6..c53e1d2d4 100644 --- a/dist/widget.js +++ b/dist/widget.js @@ -19636,7 +19636,6 @@ BI.SingleSelectComboItem = BI.inherit(BI.BasicButton, { logic: { dynamic: false }, - hgap: 10, height: 24 }); }, @@ -19666,7 +19665,7 @@ BI.SingleSelectComboItem = BI.inherit(BI.BasicButton, { items: BI.LogicFactory.createLogicItemsByDirection("left", { type: "bi.center_adapt", items: [this.radio], - width: 36 + width: 26 }, this.text) })))); }, diff --git a/public/css/font.css b/public/css/font.css index c63067c30..77298493c 100644 --- a/public/css/font.css +++ b/public/css/font.css @@ -600,18 +600,18 @@ } .pull-down-font .b-font:before { content: "\e70b"; - color: inherit; + color: #647185; } .pull-down-font.disabled .b-font:before { content: "\e70b"; - color: inherit; + color: #647185; } .pull-down-h-font .b-font { *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-down-h-font .b-font:before { content: "\e70b"; - color: inherit; + color: #647185; } .pull-down-h-font:hover .b-font:before, .pull-down-h-font.hover .b-font:before { @@ -620,14 +620,14 @@ } .pull-down-h-font.disabled .b-font:before { content: "\e70b"; - color: inherit; + color: #647185; } .pull-down-ha-font .b-font { *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-down-ha-font .b-font:before { content: "\e70b"; - color: inherit; + color: #647185; } .pull-down-ha-font:hover .b-font:before, .pull-down-ha-font.hover .b-font:before { @@ -641,7 +641,7 @@ } .pull-down-ha-font.disabled .b-font:before { content: "\e70b"; - color: inherit; + color: #647185; } .check-font .b-font { *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); diff --git a/src/case/button/item.multiselect.js b/src/case/button/item.multiselect.js index 2d7e30142..efe247d8d 100644 --- a/src/case/button/item.multiselect.js +++ b/src/case/button/item.multiselect.js @@ -45,7 +45,7 @@ BI.MultiSelectItem = BI.inherit(BI.BasicButton, { items: BI.LogicFactory.createLogicItemsByDirection("left", { type: "bi.center_adapt", items: [this.checkbox], - width: 36 + width: 26 }, this.text) })))); }, diff --git a/src/case/toolbar/toolbar.multiselect.js b/src/case/toolbar/toolbar.multiselect.js index 8bd5b9170..1318ad3f9 100644 --- a/src/case/toolbar/toolbar.multiselect.js +++ b/src/case/toolbar/toolbar.multiselect.js @@ -70,7 +70,7 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, { type: "bi.htape", element: this, items: [{ - width: 36, + width: 26, el: { type: "bi.center_adapt", items: [this.checkbox, this.half] diff --git a/src/css/core/utils/common.css b/src/css/core/utils/common.css index 867dbbec6..6c5fd39e7 100644 --- a/src/css/core/utils/common.css +++ b/src/css/core/utils/common.css @@ -194,14 +194,14 @@ textarea { border-color: #3685f2; } .bi-water-mark { - color: #cccccc; + color: #c4c9d1; cursor: text; } .bi-water-mark .bi-input { - color: #cccccc; + color: #c4c9d1; } .bi-water-mark .bi-textarea { - color: #cccccc; + color: #c4c9d1; } .bi-theme-dark .bi-water-mark { color: #666666; diff --git a/src/css/resource/font.css b/src/css/resource/font.css index a215db24d..6f3ac21d7 100644 --- a/src/css/resource/font.css +++ b/src/css/resource/font.css @@ -600,18 +600,18 @@ } .pull-down-font .b-font:before { content: "\e70b"; - color: inherit; + color: #647185; } .pull-down-font.disabled .b-font:before { content: "\e70b"; - color: inherit; + color: #647185; } .pull-down-h-font .b-font { *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-down-h-font .b-font:before { content: "\e70b"; - color: inherit; + color: #647185; } .pull-down-h-font:hover .b-font:before, .pull-down-h-font.hover .b-font:before { @@ -620,14 +620,14 @@ } .pull-down-h-font.disabled .b-font:before { content: "\e70b"; - color: inherit; + color: #647185; } .pull-down-ha-font .b-font { *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-down-ha-font .b-font:before { content: "\e70b"; - color: inherit; + color: #647185; } .pull-down-ha-font:hover .b-font:before, .pull-down-ha-font.hover .b-font:before { @@ -641,7 +641,7 @@ } .pull-down-ha-font.disabled .b-font:before { content: "\e70b"; - color: inherit; + color: #647185; } .check-font .b-font { *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); diff --git a/src/less/core/utils/common.less b/src/less/core/utils/common.less index 4b73876c3..a078d9776 100644 --- a/src/less/core/utils/common.less +++ b/src/less/core/utils/common.less @@ -244,13 +244,13 @@ textarea { //水印 .bi-water-mark { - color: @water-mark-color; + color: @font-color-tips; cursor: text; & .bi-input { - color: @water-mark-color; + color: @font-color-tips; } & .bi-textarea { - color: @water-mark-color; + color: @font-color-tips; } } diff --git a/src/less/lib/colors.less b/src/less/lib/colors.less index c34a34a1e..cb8e5b133 100644 --- a/src/less/lib/colors.less +++ b/src/less/lib/colors.less @@ -12,6 +12,8 @@ @color-bi-text-dark: @font-color-dark; //灰色字体颜色 @color-bi-text-gray: @font-color-gray; +//浅灰色字体 +@color-bi-text-light-gray: @font-color-light-gray; //白色字体颜色 @color-bi-text: @font-color-white; //灰化字体颜色 diff --git a/src/less/lib/constant.less b/src/less/lib/constant.less index b5eb2651c..239b7b0bb 100644 --- a/src/less/lib/constant.less +++ b/src/less/lib/constant.less @@ -22,6 +22,7 @@ @font-color-disabled-theme-dark: #666666;// @font-color-tips: #c4c9d1;// @font-color-dark: #d4dadd; +@font-color-light-gray: #647185; @font-color-gray: #999999; @font-color-white: #ffffff;// @font-color-highlight: #3685f2; diff --git a/src/less/resource/font.less b/src/less/resource/font.less index a50c6127d..9bc74d81e 100644 --- a/src/less/resource/font.less +++ b/src/less/resource/font.less @@ -80,9 +80,9 @@ //单选下拉框 //向下展开子菜单 .font(pull-up-font, @font-up-triangle); -.font(pull-down-font, @font-down-triangle); -.font-hover(pull-down-h-font, @font-down-triangle); -.font-hover-active(pull-down-ha-font, @font-down-triangle); +.font(pull-down-font, @font-down-triangle, @color-bi-text-light-gray); +.font-hover(pull-down-h-font, @font-down-triangle, @color-bi-text-light-gray); +.font-hover-active(pull-down-ha-font, @font-down-triangle, @color-bi-text-light-gray); .font(check-font, @font-check-mark, @color-bi-text-highlight); diff --git a/src/widget/singleselect/singleselect.item.js b/src/widget/singleselect/singleselect.item.js index 44e93fb0f..01d3b9a2a 100644 --- a/src/widget/singleselect/singleselect.item.js +++ b/src/widget/singleselect/singleselect.item.js @@ -10,7 +10,6 @@ BI.SingleSelectComboItem = BI.inherit(BI.BasicButton, { logic: { dynamic: false }, - hgap: 10, height: 24 }); }, @@ -40,7 +39,7 @@ BI.SingleSelectComboItem = BI.inherit(BI.BasicButton, { items: BI.LogicFactory.createLogicItemsByDirection("left", { type: "bi.center_adapt", items: [this.radio], - width: 36 + width: 26 }, this.text) })))); }, diff --git a/ui/css/font.css b/ui/css/font.css index 05aa79032..fabefec22 100644 --- a/ui/css/font.css +++ b/ui/css/font.css @@ -600,18 +600,18 @@ } .pull-down-font .b-font:before { content: "\e70b"; - color: inherit; + color: #647185; } .pull-down-font.disabled .b-font:before { content: "\e70b"; - color: inherit; + color: #647185; } .pull-down-h-font .b-font { *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-down-h-font .b-font:before { content: "\e70b"; - color: inherit; + color: #647185; } .pull-down-h-font:hover .b-font:before, .pull-down-h-font.hover .b-font:before { @@ -620,14 +620,14 @@ } .pull-down-h-font.disabled .b-font:before { content: "\e70b"; - color: inherit; + color: #647185; } .pull-down-ha-font .b-font { *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = ''); } .pull-down-ha-font .b-font:before { content: "\e70b"; - color: inherit; + color: #647185; } .pull-down-ha-font:hover .b-font:before, .pull-down-ha-font.hover .b-font:before { @@ -641,7 +641,7 @@ } .pull-down-ha-font.disabled .b-font:before { content: "\e70b"; - color: inherit; + color: #647185; } .check-font .b-font { *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');