From dd12e06c56a077a7796852db99dbb0a30c1872df Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Wed, 26 Jun 2019 14:10:47 +0800 Subject: [PATCH] =?UTF-8?q?BI-44244=20&&=20REPORT-18382=20feat:=20?= =?UTF-8?q?=E8=89=B2=E5=80=BC=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demo/css/main.css | 2 +- public/css/app.css | 12 +-- public/css/font.css | 2 +- src/css/base/combo/combo.css | 14 ++-- src/css/base/segment/segment.css | 10 +-- src/css/base/single/button/button.css | 8 +- src/css/base/single/button/switch.css | 8 +- src/css/base/single/input/checkbox.css | 4 +- src/css/base/single/input/input.css | 2 +- src/css/base/single/input/radio.css | 4 +- src/css/base/single/tip/tip.css | 8 +- src/css/base/view/popupview.css | 2 +- src/css/core/utils/common.css | 80 +++++++++---------- src/css/resource/app.css | 12 +-- src/css/resource/font.css | 2 +- .../widget/numberinterval/numberinterval.css | 2 +- .../searchmultiselect/searchmultiselect.css | 2 +- src/css/widget/singleslider/slider/widget.css | 6 +- src/css/widget/timeinterval/dateinterval.css | 4 +- src/css/widget/timeinterval/timeinterval.css | 4 +- src/css/widget/year/popup.css | 2 +- .../yearmonthinterval/yearmonthinterval.css | 4 +- src/less/lib/constant.less | 58 +++++++------- src/widget/time/time.trigger.js | 1 + ui/css/app.css | 12 +-- ui/css/font.css | 2 +- 26 files changed, 134 insertions(+), 133 deletions(-) diff --git a/demo/css/main.css b/demo/css/main.css index 3e8202ca03..04520ffb7c 100644 --- a/demo/css/main.css +++ b/demo/css/main.css @@ -50,7 +50,7 @@ body { bottom: 0; } .bi-theme-dark body { - background-color: #191B2B; + background-color: #191b2b; } .demo-editor { border: 1px solid #cccccc; diff --git a/public/css/app.css b/public/css/app.css index 946805b5da..5f2aefb369 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -30,8 +30,8 @@ body { div::-webkit-scrollbar, textarea::-webkit-scrollbar { -webkit-appearance: none; - background-color: rgba(61, 77, 102, 0.05); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d3d4d66,endColorstr=#0d3d4d66); + background-color: rgba(32, 38, 59, 0.05); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d20263b,endColorstr=#0d20263b); width: 6px; height: 6px; } @@ -40,13 +40,13 @@ textarea::-webkit-scrollbar-thumb { -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; - background-color: rgba(61, 77, 102, 0.3); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d3d4d66,endColorstr=#4d3d4d66); + background-color: rgba(32, 38, 59, 0.3); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d20263b,endColorstr=#4d20263b); } div::-webkit-scrollbar-thumb:hover, textarea::-webkit-scrollbar-thumb:hover { - background-color: rgba(61, 77, 102, 0.7); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b33d4d66,endColorstr=#b33d4d66); + background-color: rgba(32, 38, 59, 0.7); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b320263b,endColorstr=#b320263b); } .bi-theme-dark div::-webkit-scrollbar, .bi-theme-dark textarea::-webkit-scrollbar { diff --git a/public/css/font.css b/public/css/font.css index e08a54a924..e5415e95dd 100644 --- a/public/css/font.css +++ b/public/css/font.css @@ -79,7 +79,7 @@ .search-close-h-font:hover .b-font:before, .search-close-h-font.hover .b-font:before { content: "\e6d0"; - color: #ff4949; + color: #e65251; } .search-close-h-font.disabled .b-font:before { content: "\e6d0"; diff --git a/src/css/base/combo/combo.css b/src/css/base/combo/combo.css index fc38a7daf4..cc4592c403 100644 --- a/src/css/base/combo/combo.css +++ b/src/css/base/combo/combo.css @@ -81,9 +81,9 @@ .bi-theme-dark .bi-bubble-combo .bubble-combo-triangle-right:before, .bi-theme-dark .bi-bubble-combo .bubble-combo-triangle-top:before, .bi-theme-dark .bi-bubble-combo .bubble-combo-triangle-bottom:before { - background-color: #242640; - border-bottom: 1px solid #2F3149; - border-right: 1px solid #2F3149; + background-color: #20263b; + border-bottom: 1px solid #292f45; + border-right: 1px solid #292f45; } .bi-combo > .bi-trigger .bi-trigger-icon-button .x-icon { @@ -119,7 +119,7 @@ } .bi-theme-dark .bi-combo.disabled.bi-combo-hover > .bi-border, .bi-theme-dark .bi-combo.disabled:hover > .bi-border { - border-color: #3a3c53; + border-color: #363e55; } .bi-search-text-value-combo .trigger-icon-button { @@ -131,7 +131,7 @@ border-radius: 2px; } .bi-search-text-value-combo.combo-error .bi-search-text-value-trigger .bi-text-button { - color: #ff4949; + color: #e65251; } .bi-search-text-value-combo .bi-combo.bi-combo-popup + .bi-trigger-icon-button .x-icon { -webkit-transform: rotate(180deg); @@ -153,11 +153,11 @@ } .bi-icon-text-value-combo.combo-error .bi-text-trigger .select-text-label { - color: #ff4949; + color: #e65251; } .bi-text-value-combo.combo-error .bi-select-text-trigger .select-text-label { - color: #ff4949; + color: #e65251; } .bi-text-value-check-combo.bi-combo-popup > .bi-border, diff --git a/src/css/base/segment/segment.css b/src/css/base/segment/segment.css index 2694734ea8..48a5bc1bc4 100644 --- a/src/css/base/segment/segment.css +++ b/src/css/base/segment/segment.css @@ -26,11 +26,11 @@ overflow: hidden; overflow-x: hidden; overflow-y: hidden; - background: #242640; - border-right: 1px solid #3a3c53; - border-top: 1px solid #3a3c53; - border-bottom: 1px solid #3a3c53; + background: #20263b; + border-right: 1px solid #363e55; + border-top: 1px solid #363e55; + border-bottom: 1px solid #363e55; } .bi-theme-dark .bi-segment > .first-element { - border-left: 1px solid #242640; + border-left: 1px solid #20263b; } diff --git a/src/css/base/single/button/button.css b/src/css/base/single/button/button.css index b36897c6f4..96bf495a1e 100644 --- a/src/css/base/single/button/button.css +++ b/src/css/base/single/button/button.css @@ -145,8 +145,8 @@ body .bi-button.button-warning.clear .b-font:before, } body .bi-button.button-error, #body .bi-button.button-error { - background-color: #ff4949; - border-color: #FF4949; + background-color: #e65251; + border-color: #e65251; } body .bi-button.button-error, #body .bi-button.button-error, @@ -163,7 +163,7 @@ body .bi-button.button-error.clear, #body .bi-button.button-error.clear, body .bi-button.button-error.clear .b-font:before, #body .bi-button.button-error.clear .b-font:before { - color: #ff4949; + color: #e65251; } body .bi-button.button-common.disabled, #body .bi-button.button-common.disabled, @@ -181,7 +181,7 @@ body .bi-button.button-error.disabled.base-disabled, #body .bi-button.button-error.disabled.base-disabled, body .bi-button.button-warning.disabled.base-disabled, #body .bi-button.button-warning.disabled.base-disabled { - background: #F2F4F7 !important; + background: #f2f4f7 !important; border-color: #d0d4da !important; } body .bi-button.button-common.disabled, diff --git a/src/css/base/single/button/switch.css b/src/css/base/single/button/switch.css index 2ddc57e931..bab1bb0965 100644 --- a/src/css/base/single/button/switch.css +++ b/src/css/base/single/button/switch.css @@ -14,10 +14,10 @@ border-radius: 9px 9px 9px 9px; } .bi-switch.disabled { - background-color: #F2F4F7; + background-color: #f2f4f7; } .bi-switch.disabled:active { - background-color: #F2F4F7; + background-color: #f2f4f7; } .bi-theme-dark .bi-switch { background-color: #606479; @@ -27,8 +27,8 @@ background-color: #3685f2; } .bi-theme-dark .bi-switch.disabled { - background-color: #2F3149; + background-color: #292f45; } .bi-theme-dark .bi-switch.disabled:active { - background-color: #2F3149; + background-color: #292f45; } diff --git a/src/css/base/single/input/checkbox.css b/src/css/base/single/input/checkbox.css index 52cea77b5a..723af0ddc6 100644 --- a/src/css/base/single/input/checkbox.css +++ b/src/css/base/single/input/checkbox.css @@ -35,7 +35,7 @@ opacity: 1; } .bi-checkbox.disabled .checkbox-content { - background-color: #F2F4F7; + background-color: #f2f4f7; border-color: #d0d4da; } .bi-checkbox.disabled .checkbox-content:after { @@ -59,7 +59,7 @@ border-color: #3685f2; } .bi-theme-dark .bi-checkbox.disabled .checkbox-content { - background-color: #2F3149; + background-color: #292f45; } .bi-theme-dark .bi-checkbox.disabled.active .checkbox-content { background-color: #606479; diff --git a/src/css/base/single/input/input.css b/src/css/base/single/input/input.css index 8af7a0b417..77baebab01 100644 --- a/src/css/base/single/input/input.css +++ b/src/css/base/single/input/input.css @@ -15,5 +15,5 @@ .bi-input.bi-input-error, .bi-textarea.bi-input-error { border: none; - color: #ff4949 !important; + color: #e65251 !important; } diff --git a/src/css/base/single/input/radio.css b/src/css/base/single/input/radio.css index e664f56341..2cf9d5776e 100644 --- a/src/css/base/single/input/radio.css +++ b/src/css/base/single/input/radio.css @@ -34,7 +34,7 @@ transform: translate(-50%, -50%); } .bi-radio.disabled .radio-content { - background-color: #F2F4F7; + background-color: #f2f4f7; border-color: #d0d4da; } .bi-radio.disabled .radio-content:after { @@ -58,7 +58,7 @@ border-color: #3685f2; } .bi-theme-dark .bi-radio.disabled .radio-content { - background-color: #2F3149; + background-color: #292f45; } .bi-theme-dark .bi-radio.disabled .radio-content.hover, .bi-theme-dark .bi-radio.disabled .radio-content:hover { diff --git a/src/css/base/single/tip/tip.css b/src/css/base/single/tip/tip.css index 2e3c61c81b..20ee964b18 100644 --- a/src/css/base/single/tip/tip.css +++ b/src/css/base/single/tip/tip.css @@ -5,7 +5,7 @@ } .bi-bubble .bubble-error { background: #ffecec; - color: #ff4949; + color: #e65251; } .bi-theme-dark .bi-bubble .bubble-error { background: #3A2940; @@ -42,7 +42,7 @@ background: #faaa39; } .bi-toast.toast-error { - background: #ff4949; + background: #e65251; } .bi-toast.toast-normal { background: #3685f2; @@ -64,6 +64,6 @@ border: 1px solid #647185; } .bi-tooltip.tooltip-warning { - background: #ff4949; - border: 1px solid #FF4949; + background: #e65251; + border: 1px solid #e65251; } diff --git a/src/css/base/view/popupview.css b/src/css/base/view/popupview.css index 3bde9b41a3..138e4d4455 100644 --- a/src/css/base/view/popupview.css +++ b/src/css/base/view/popupview.css @@ -30,7 +30,7 @@ border-left: none; } .bi-theme-dark .bi-popup-view .list-view-toolbar > .center-element { - border-left: 1px solid #3a3c53; + border-left: 1px solid #363e55; } .bi-theme-dark .bi-popup-view .list-view-toolbar > .first-element { border-left: none; diff --git a/src/css/core/utils/common.css b/src/css/core/utils/common.css index 3661b1b2ab..07a26e4b12 100644 --- a/src/css/core/utils/common.css +++ b/src/css/core/utils/common.css @@ -4,7 +4,7 @@ textarea { } .bi-theme-dark input, .bi-theme-dark textarea { - border: 1px solid #3a3c53; + border: 1px solid #363e55; } .base-disabled { cursor: not-allowed !important; @@ -40,7 +40,7 @@ textarea { border-color: #e8eaed; } .bi-theme-dark .bi-focus-shadow.disabled:hover { - border-color: #3a3c53; + border-color: #363e55; } .base-invalid { cursor: default !important; @@ -68,7 +68,7 @@ textarea { color: #3d4d66; } .bi-theme-dark .bi-background { - background-color: #191B2B; + background-color: #191b2b; color: #d6e0dc; } .bi-theme-dark .bi-background .bi-input { @@ -78,7 +78,7 @@ textarea { color: #d6e0dc; } .bi-header-background { - background-color: #F2F4F7; + background-color: #f2f4f7; color: #647185; } .bi-header-background .bi-input { @@ -88,7 +88,7 @@ textarea { color: #647185; } .bi-theme-dark .bi-header-background { - background-color: #2F3149; + background-color: #292f45; color: #afb7c6; } .bi-theme-dark .bi-header-background .bi-input { @@ -108,7 +108,7 @@ textarea { color: #3d4d66; } .bi-theme-dark .bi-card { - background-color: #242640; + background-color: #20263b; color: #d6e0dc; } .bi-theme-dark .bi-card .bi-input { @@ -175,19 +175,19 @@ textarea { border-color: #d0d4da !important; } .bi-theme-dark .bi-border { - border: 1px solid #3a3c53; + border: 1px solid #363e55; } .bi-theme-dark .bi-border-top { - border-top: 1px solid #3a3c53; + border-top: 1px solid #363e55; } .bi-theme-dark .bi-border-right { - border-right: 1px solid #3a3c53; + border-right: 1px solid #363e55; } .bi-theme-dark .bi-border-bottom { - border-bottom: 1px solid #3a3c53; + border-bottom: 1px solid #363e55; } .bi-theme-dark .bi-border-left { - border-left: 1px solid #3a3c53; + border-left: 1px solid #363e55; } .bi-split { border: 1px solid #f2f4f7; @@ -205,19 +205,19 @@ textarea { border-left: 1px solid #f2f4f7; } .bi-theme-dark .bi-split { - border: 1px solid #2F3149; + border: 1px solid #292f45; } .bi-theme-dark .bi-split-top { - border-top: 1px solid #2F3149; + border-top: 1px solid #292f45; } .bi-theme-dark .bi-split-right { - border-right: 1px solid #2F3149; + border-right: 1px solid #292f45; } .bi-theme-dark .bi-split-bottom { - border-bottom: 1px solid #2F3149; + border-bottom: 1px solid #292f45; } .bi-theme-dark .bi-split-left { - border-left: 1px solid #2F3149; + border-left: 1px solid #292f45; } .bi-font-helvetica-neue { font-family: "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif; @@ -264,13 +264,13 @@ textarea { color: #3685f2; } .bi-error { - color: #ff4949; + color: #e65251; } .bi-error .bi-input { - color: #ff4949; + color: #e65251; } .bi-error .bi-textarea { - color: #ff4949; + color: #e65251; } .bi-high-light-background { background-color: #3685f2; @@ -283,7 +283,7 @@ textarea { color: #ffffff; } .bi-error-background { - background-color: #ff4949; + background-color: #e65251; color: #ffffff; } .bi-error-background .bi-input { @@ -362,15 +362,15 @@ textarea { color: #ffffff; } .bi-theme-dark .bi-mask { - color: #242640; + color: #20263b; background-color: rgba(255, 255, 255, 0.2); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#33ffffff,endColorstr=#33ffffff); } .bi-theme-dark .bi-mask .bi-input { - color: #242640; + color: #20263b; } .bi-theme-dark .bi-mask .bi-textarea { - color: #242640; + color: #20263b; } .bi-z-index-mask { background-color: rgba(35, 46, 64, 0.5); @@ -815,45 +815,45 @@ textarea { border-color: #13cd66; } .bi-list-item-select.button-warning { - color: #ff4949; + color: #e65251; } .bi-list-item-select.button-warning .bi-input { - color: #ff4949; + color: #e65251; } .bi-list-item-select.button-warning .bi-textarea { - color: #ff4949; + color: #e65251; } .bi-list-item-select.button-warning .bi-high-light { - color: #ff4949; + color: #e65251; } .bi-list-item-select.button-warning.bi-high-light-border { - border-color: #FF4949; + border-color: #e65251; } .bi-list-item-select.button-warning:hover, .bi-list-item-select.button-warning.hover { - color: #ff4949; + color: #e65251; background-color: #ffecec; } .bi-list-item-select.button-warning:hover .bi-input, .bi-list-item-select.button-warning.hover .bi-input { - color: #ff4949; + color: #e65251; } .bi-list-item-select.button-warning:hover .bi-textarea, .bi-list-item-select.button-warning.hover .bi-textarea { - color: #ff4949; + color: #e65251; } .bi-list-item-select.button-warning:hover .bi-high-light, .bi-list-item-select.button-warning.hover .bi-high-light { - color: #ff4949; + color: #e65251; } .bi-list-item-select.button-warning:hover.bi-high-light-border, .bi-list-item-select.button-warning.hover.bi-high-light-border { - border-color: #FF4949; + border-color: #e65251; } .bi-list-item-select.button-warning:active, .bi-list-item-select.button-warning.active { color: #ffffff; - background-color: #ff4949; + background-color: #e65251; } .bi-list-item-select.button-warning:active .bi-input, .bi-list-item-select.button-warning.active .bi-input { @@ -869,7 +869,7 @@ textarea { } .bi-list-item-select.button-warning:active.bi-high-light-border, .bi-list-item-select.button-warning.active.bi-high-light-border { - border-color: #FF4949; + border-color: #e65251; } .bi-list-item-select.disabled { color: #9ea6b2 !important; @@ -973,7 +973,7 @@ textarea { .bi-theme-dark .bi-list-item-select2:hover, .bi-theme-dark .bi-list-item-select2.hover { color: #ffffff; - background-color: #242640; + background-color: #20263b; } .bi-theme-dark .bi-list-item-select2:hover .bi-input, .bi-theme-dark .bi-list-item-select2.hover .bi-input { @@ -986,7 +986,7 @@ textarea { .bi-theme-dark .bi-list-item-select2.active, .bi-theme-dark .bi-list-item-select2:active { color: #3685f2; - background-color: #242640; + background-color: #20263b; } .bi-theme-dark .bi-list-item-select2.active .bi-input, .bi-theme-dark .bi-list-item-select2:active .bi-input { @@ -1042,12 +1042,12 @@ textarea { } .bi-theme-dark .bi-list-item-select3:hover, .bi-theme-dark .bi-list-item-select3.hover { - background-color: #191B2B; + background-color: #191b2b; } .bi-theme-dark .bi-list-item-select3:active, .bi-theme-dark .bi-list-item-select3.active { color: #3685f2; - background-color: #191B2B; + background-color: #191b2b; } .bi-theme-dark .bi-list-item-select3:active .bi-input, .bi-theme-dark .bi-list-item-select3.active .bi-input { @@ -1061,7 +1061,7 @@ textarea { .bi-theme-dark .bi-list-item-select3.disabled.hover, .bi-theme-dark .bi-list-item-select3.disabled:active, .bi-theme-dark .bi-list-item-select3.disabled.active { - background-color: #242640 !important; + background-color: #20263b !important; } .bi-theme-dark .bi-list-item-select:hover, .bi-theme-dark .bi-list-item-select.hover { diff --git a/src/css/resource/app.css b/src/css/resource/app.css index 946805b5da..5f2aefb369 100644 --- a/src/css/resource/app.css +++ b/src/css/resource/app.css @@ -30,8 +30,8 @@ body { div::-webkit-scrollbar, textarea::-webkit-scrollbar { -webkit-appearance: none; - background-color: rgba(61, 77, 102, 0.05); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d3d4d66,endColorstr=#0d3d4d66); + background-color: rgba(32, 38, 59, 0.05); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d20263b,endColorstr=#0d20263b); width: 6px; height: 6px; } @@ -40,13 +40,13 @@ textarea::-webkit-scrollbar-thumb { -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; - background-color: rgba(61, 77, 102, 0.3); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d3d4d66,endColorstr=#4d3d4d66); + background-color: rgba(32, 38, 59, 0.3); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d20263b,endColorstr=#4d20263b); } div::-webkit-scrollbar-thumb:hover, textarea::-webkit-scrollbar-thumb:hover { - background-color: rgba(61, 77, 102, 0.7); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b33d4d66,endColorstr=#b33d4d66); + background-color: rgba(32, 38, 59, 0.7); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b320263b,endColorstr=#b320263b); } .bi-theme-dark div::-webkit-scrollbar, .bi-theme-dark textarea::-webkit-scrollbar { diff --git a/src/css/resource/font.css b/src/css/resource/font.css index 1fdd479906..c9ccd63207 100644 --- a/src/css/resource/font.css +++ b/src/css/resource/font.css @@ -79,7 +79,7 @@ .search-close-h-font:hover .b-font:before, .search-close-h-font.hover .b-font:before { content: "\e6d0"; - color: #ff4949; + color: #e65251; } .search-close-h-font.disabled .b-font:before { content: "\e6d0"; diff --git a/src/css/widget/numberinterval/numberinterval.css b/src/css/widget/numberinterval/numberinterval.css index 8e1dc722ff..206f185973 100644 --- a/src/css/widget/numberinterval/numberinterval.css +++ b/src/css/widget/numberinterval/numberinterval.css @@ -37,5 +37,5 @@ font-size: 14px; } .bi-number-interval.number-error .bi-input { - color: #ff4949 !important; + color: #e65251 !important; } diff --git a/src/css/widget/searchmultiselect/searchmultiselect.css b/src/css/widget/searchmultiselect/searchmultiselect.css index a0ef94d1f0..d4676a5375 100644 --- a/src/css/widget/searchmultiselect/searchmultiselect.css +++ b/src/css/widget/searchmultiselect/searchmultiselect.css @@ -2,5 +2,5 @@ font-size: 16px; } .bi-search-multi-text-value-combo.combo-error .bi-multi-select-searcher .tip-text-style { - color: #ff4949; + color: #e65251; } diff --git a/src/css/widget/singleslider/slider/widget.css b/src/css/widget/singleslider/slider/widget.css index d8d8a816f9..a11e22c073 100644 --- a/src/css/widget/singleslider/slider/widget.css +++ b/src/css/widget/singleslider/slider/widget.css @@ -34,13 +34,13 @@ left: -8px; } .bi-theme-dark .bi-single-slider-button .slider-button { - background-color: #242640; + background-color: #20263b; } .bi-theme-dark .bi-single-slider-button .slider-button:hover, .bi-theme-dark .bi-single-slider-button .slider-button.hover { - background-color: #191B2B; + background-color: #191b2b; } .bi-theme-dark .bi-single-slider-button .slider-button.disabled:hover, .bi-theme-dark .bi-single-slider-button .slider-button.disabled.hover { - background-color: #191B2B; + background-color: #191b2b; } diff --git a/src/css/widget/timeinterval/dateinterval.css b/src/css/widget/timeinterval/dateinterval.css index d4bb0050a6..4184696ecd 100644 --- a/src/css/widget/timeinterval/dateinterval.css +++ b/src/css/widget/timeinterval/dateinterval.css @@ -1,6 +1,6 @@ .bi-date-interval.time-error .bi-input { - color: #ff4949; + color: #e65251; } .bi-date-interval.time-error .sign-editor-text { - color: #ff4949; + color: #e65251; } diff --git a/src/css/widget/timeinterval/timeinterval.css b/src/css/widget/timeinterval/timeinterval.css index b1d92bd965..e208629b1f 100644 --- a/src/css/widget/timeinterval/timeinterval.css +++ b/src/css/widget/timeinterval/timeinterval.css @@ -4,8 +4,8 @@ border-radius: 2px; } .bi-time-interval.time-error .bi-date-time-trigger .bi-input { - color: #ff4949; + color: #e65251; } .bi-time-interval.time-error .bi-date-time-trigger .sign-editor-text { - color: #ff4949; + color: #e65251; } diff --git a/src/css/widget/year/popup.css b/src/css/widget/year/popup.css index 5820b9a808..c3443d0dbe 100644 --- a/src/css/widget/year/popup.css +++ b/src/css/widget/year/popup.css @@ -8,7 +8,7 @@ border-left: none; } .bi-theme-dark .bi-year-popup .year-popup-navigation > .center-element { - border-left: 1px solid #3a3c53; + border-left: 1px solid #363e55; } .bi-theme-dark .bi-year-popup .year-popup-navigation > .first-element { border-left: none; diff --git a/src/css/widget/yearmonthinterval/yearmonthinterval.css b/src/css/widget/yearmonthinterval/yearmonthinterval.css index 741ccfeaa8..0241166ca3 100644 --- a/src/css/widget/yearmonthinterval/yearmonthinterval.css +++ b/src/css/widget/yearmonthinterval/yearmonthinterval.css @@ -1,6 +1,6 @@ .bi-year-month-interval.time-error .bi-input { - color: #ff4949; + color: #e65251; } .bi-year-month-interval.time-error .sign-editor-text { - color: #ff4949; + color: #e65251; } diff --git a/src/less/lib/constant.less b/src/less/lib/constant.less index 671ec05399..221d8522a0 100644 --- a/src/less/lib/constant.less +++ b/src/less/lib/constant.less @@ -22,53 +22,53 @@ @opacity-20: 0.2; //font color -@font-color-black: #232e40;// -@font-color-normal: #3d4d66;// -@font-color-normal-theme-dark: #d6e0dc;// +@font-color-black: #232e40; +@font-color-normal: #3d4d66; +@font-color-normal-theme-dark: #d6e0dc; @font-color-light-gray: #647185; @font-color-light-gray-theme-dark: #afb7c6; -@font-color-disabled: #9ea6b2;// -@font-color-disabled-theme-dark: #878d9f;// -@font-color-tips: #9ea6b2;// -@font-color-tips-theme-dark: #6b7084;// -@font-color-light-disabled: #d0d4da;// +@font-color-disabled: #9ea6b2; +@font-color-disabled-theme-dark: #878d9f; +@font-color-tips: #9ea6b2; +@font-color-tips-theme-dark: #6b7084; +@font-color-light-disabled: #d0d4da; @font-color-light-disabled-theme-dark: #606479; @font-color-gray: #999999; -@font-color-white: #ffffff;// -@font-color-white-theme-dark: #242640;// +@font-color-white: #ffffff; +@font-color-white-theme-dark: #20263b; @font-color-light-highlight: #eaf2fd; @font-color-medium-highlight: #d7e7fc; @font-color-highlight: #3685f2; @font-color-blue: #23beef; @font-color-light-blue: #e9f8fd; @font-color-success: #13cd66; -@font-color-warning: #faaa39;// -@font-color-negative: #ff4949;// -@font-color-yellow: #ffc101;// +@font-color-warning: #faaa39; +@font-color-negative: #e65251; +@font-color-yellow: #ffc101; //background color -@background-color-black: #232E40;// +@background-color-black: #232E40; @background-color-light-black: #3d4d66; -@background-color-light-black-theme-dark: #d6e0dc;// -@background-color-default: #ffffff;// -@background-color-default-theme-dark: #242640;// -@background-color-normal: #f7f8fa;// -@background-color-normal-theme-dark: #191B2B;// +@background-color-light-black-theme-dark: #d6e0dc; +@background-color-default: #ffffff; +@background-color-default-theme-dark: #20263b; +@background-color-normal: #f7f8fa; +@background-color-normal-theme-dark: #191b2b; @background-color-light-highlight: #eaf2fd; @background-color-medium-highlight: #d7e7fc; @background-color-highlight: #3685f2; @background-color-blue: #23beef; @background-color-light-blue: #e9f8fd; @background-color-dark: #d4dadd; -@background-color-light-gray: #F2F4F7; -@background-color-light-gray-theme-dark: #2F3149; +@background-color-light-gray: #f2f4f7; +@background-color-light-gray-theme-dark: #292f45; @background-color-dark-gray: #d0d4da; @background-color-dark-gray-theme-dark: #606479; -@background-color-disabled: #F2F4F7; -@background-color-disabled-theme-dark: #2F3149; -@background-color-yellow: #ffc101;// +@background-color-disabled: #f2f4f7; +@background-color-disabled-theme-dark: #292f45; +@background-color-yellow: #ffc101; -@background-color-negative: #ff4949; +@background-color-negative: #e65251; @background-color-light-negative: #ffecec; @background-color-dark-negative: #3A2940; @background-color-light-warning: #feeed7; @@ -82,15 +82,15 @@ @border-color-default: #ffffff; @border-color-black: #232e40; @border-color-line: #e8eaed; -@border-color-line-theme-dark: #3a3c53; +@border-color-line-theme-dark: #363e55; @border-color-light-line: #f2f4f7; -@border-color-light-line-theme-dark: #2F3149; +@border-color-light-line-theme-dark: #292f45; @border-color-dark-line: #9EA6B2; @border-color-dark-line-theme-dark: #878D9F; @border-color-highlight: #3685f2; @border-color-warning: #fbb03b; -@border-color-negative: #FF4949; +@border-color-negative: #e65251; @border-color-success: #13cd66; @border-color-light-negative: #f4cbcb; @border-color-normal-success: #eddea2; @@ -100,7 +100,7 @@ @border-color-disabled-theme-dark: #606479; //scroll color -@scroll-color: #3d4d66; +@scroll-color: #20263b; @scroll-color-theme-dark: #ffffff; @water-mark-color-theme-dark: #878d9f; diff --git a/src/widget/time/time.trigger.js b/src/widget/time/time.trigger.js index ce3decb982..702b087611 100644 --- a/src/widget/time/time.trigger.js +++ b/src/widget/time/time.trigger.js @@ -12,6 +12,7 @@ "%l:%M:%S %p", // h:mm:ss a "%l:%M:%S %P", // h:mm:ss a "%H:%M:%S %p", // HH:mm:ss a + "%H:%M:%S %P", // HH:mm:ss a "%l:%M", // h:mm "%k:%M", // H:mm "%I:%M", // hh:mm diff --git a/ui/css/app.css b/ui/css/app.css index 946805b5da..5f2aefb369 100644 --- a/ui/css/app.css +++ b/ui/css/app.css @@ -30,8 +30,8 @@ body { div::-webkit-scrollbar, textarea::-webkit-scrollbar { -webkit-appearance: none; - background-color: rgba(61, 77, 102, 0.05); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d3d4d66,endColorstr=#0d3d4d66); + background-color: rgba(32, 38, 59, 0.05); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d20263b,endColorstr=#0d20263b); width: 6px; height: 6px; } @@ -40,13 +40,13 @@ textarea::-webkit-scrollbar-thumb { -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; - background-color: rgba(61, 77, 102, 0.3); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d3d4d66,endColorstr=#4d3d4d66); + background-color: rgba(32, 38, 59, 0.3); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d20263b,endColorstr=#4d20263b); } div::-webkit-scrollbar-thumb:hover, textarea::-webkit-scrollbar-thumb:hover { - background-color: rgba(61, 77, 102, 0.7); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b33d4d66,endColorstr=#b33d4d66); + background-color: rgba(32, 38, 59, 0.7); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b320263b,endColorstr=#b320263b); } .bi-theme-dark div::-webkit-scrollbar, .bi-theme-dark textarea::-webkit-scrollbar { diff --git a/ui/css/font.css b/ui/css/font.css index 110d580545..b225b1937c 100644 --- a/ui/css/font.css +++ b/ui/css/font.css @@ -79,7 +79,7 @@ .search-close-h-font:hover .b-font:before, .search-close-h-font.hover .b-font:before { content: "\e6d0"; - color: #ff4949; + color: #e65251; } .search-close-h-font.disabled .b-font:before { content: "\e6d0";