Browse Source

Merge pull request #972 in VISUAL/fineui from ~WINDY/fineui:master to master

* commit 'dd12e06c56a077a7796852db99dbb0a30c1872df':
  BI-44244 && REPORT-18382 feat: 色值修改
master
guy 6 years ago
parent
commit
0b72daf245
  1. 2
      demo/css/main.css
  2. 12
      public/css/app.css
  3. 2
      public/css/font.css
  4. 14
      src/css/base/combo/combo.css
  5. 10
      src/css/base/segment/segment.css
  6. 8
      src/css/base/single/button/button.css
  7. 8
      src/css/base/single/button/switch.css
  8. 4
      src/css/base/single/input/checkbox.css
  9. 2
      src/css/base/single/input/input.css
  10. 4
      src/css/base/single/input/radio.css
  11. 8
      src/css/base/single/tip/tip.css
  12. 2
      src/css/base/view/popupview.css
  13. 80
      src/css/core/utils/common.css
  14. 12
      src/css/resource/app.css
  15. 2
      src/css/resource/font.css
  16. 2
      src/css/widget/numberinterval/numberinterval.css
  17. 2
      src/css/widget/searchmultiselect/searchmultiselect.css
  18. 6
      src/css/widget/singleslider/slider/widget.css
  19. 4
      src/css/widget/timeinterval/dateinterval.css
  20. 4
      src/css/widget/timeinterval/timeinterval.css
  21. 2
      src/css/widget/year/popup.css
  22. 4
      src/css/widget/yearmonthinterval/yearmonthinterval.css
  23. 58
      src/less/lib/constant.less
  24. 1
      src/widget/time/time.trigger.js
  25. 12
      ui/css/app.css
  26. 2
      ui/css/font.css

2
demo/css/main.css

@ -50,7 +50,7 @@ body {
bottom: 0; bottom: 0;
} }
.bi-theme-dark body { .bi-theme-dark body {
background-color: #191B2B; background-color: #191b2b;
} }
.demo-editor { .demo-editor {
border: 1px solid #cccccc; border: 1px solid #cccccc;

12
public/css/app.css

@ -30,8 +30,8 @@ body {
div::-webkit-scrollbar, div::-webkit-scrollbar,
textarea::-webkit-scrollbar { textarea::-webkit-scrollbar {
-webkit-appearance: none; -webkit-appearance: none;
background-color: rgba(61, 77, 102, 0.05); background-color: rgba(32, 38, 59, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d3d4d66,endColorstr=#0d3d4d66); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d20263b,endColorstr=#0d20263b);
width: 6px; width: 6px;
height: 6px; height: 6px;
} }
@ -40,13 +40,13 @@ textarea::-webkit-scrollbar-thumb {
-webkit-border-radius: 0; -webkit-border-radius: 0;
-moz-border-radius: 0; -moz-border-radius: 0;
border-radius: 0; border-radius: 0;
background-color: rgba(61, 77, 102, 0.3); background-color: rgba(32, 38, 59, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d3d4d66,endColorstr=#4d3d4d66); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d20263b,endColorstr=#4d20263b);
} }
div::-webkit-scrollbar-thumb:hover, div::-webkit-scrollbar-thumb:hover,
textarea::-webkit-scrollbar-thumb:hover { textarea::-webkit-scrollbar-thumb:hover {
background-color: rgba(61, 77, 102, 0.7); background-color: rgba(32, 38, 59, 0.7);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b33d4d66,endColorstr=#b33d4d66); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b320263b,endColorstr=#b320263b);
} }
.bi-theme-dark div::-webkit-scrollbar, .bi-theme-dark div::-webkit-scrollbar,
.bi-theme-dark textarea::-webkit-scrollbar { .bi-theme-dark textarea::-webkit-scrollbar {

2
public/css/font.css

@ -79,7 +79,7 @@
.search-close-h-font:hover .b-font:before, .search-close-h-font:hover .b-font:before,
.search-close-h-font.hover .b-font:before { .search-close-h-font.hover .b-font:before {
content: "\e6d0"; content: "\e6d0";
color: #ff4949; color: #e65251;
} }
.search-close-h-font.disabled .b-font:before { .search-close-h-font.disabled .b-font:before {
content: "\e6d0"; content: "\e6d0";

14
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-right:before,
.bi-theme-dark .bi-bubble-combo .bubble-combo-triangle-top:before, .bi-theme-dark .bi-bubble-combo .bubble-combo-triangle-top:before,
.bi-theme-dark .bi-bubble-combo .bubble-combo-triangle-bottom:before { .bi-theme-dark .bi-bubble-combo .bubble-combo-triangle-bottom:before {
background-color: #242640; background-color: #20263b;
border-bottom: 1px solid #2F3149; border-bottom: 1px solid #292f45;
border-right: 1px solid #2F3149; border-right: 1px solid #292f45;
} }
.bi-combo > .bi-trigger .bi-trigger-icon-button .x-icon { .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.bi-combo-hover > .bi-border,
.bi-theme-dark .bi-combo.disabled: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 { .bi-search-text-value-combo .trigger-icon-button {
@ -131,7 +131,7 @@
border-radius: 2px; border-radius: 2px;
} }
.bi-search-text-value-combo.combo-error .bi-search-text-value-trigger .bi-text-button { .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 { .bi-search-text-value-combo .bi-combo.bi-combo-popup + .bi-trigger-icon-button .x-icon {
-webkit-transform: rotate(180deg); -webkit-transform: rotate(180deg);
@ -153,11 +153,11 @@
} }
.bi-icon-text-value-combo.combo-error .bi-text-trigger .select-text-label { .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 { .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, .bi-text-value-check-combo.bi-combo-popup > .bi-border,

10
src/css/base/segment/segment.css

@ -26,11 +26,11 @@
overflow: hidden; overflow: hidden;
overflow-x: hidden; overflow-x: hidden;
overflow-y: hidden; overflow-y: hidden;
background: #242640; background: #20263b;
border-right: 1px solid #3a3c53; border-right: 1px solid #363e55;
border-top: 1px solid #3a3c53; border-top: 1px solid #363e55;
border-bottom: 1px solid #3a3c53; border-bottom: 1px solid #363e55;
} }
.bi-theme-dark .bi-segment > .first-element { .bi-theme-dark .bi-segment > .first-element {
border-left: 1px solid #242640; border-left: 1px solid #20263b;
} }

8
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,
#body .bi-button.button-error { #body .bi-button.button-error {
background-color: #ff4949; background-color: #e65251;
border-color: #FF4949; border-color: #e65251;
} }
body .bi-button.button-error, body .bi-button.button-error,
#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,
body .bi-button.button-error.clear .b-font:before, body .bi-button.button-error.clear .b-font:before,
#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,
#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-error.disabled.base-disabled,
body .bi-button.button-warning.disabled.base-disabled, body .bi-button.button-warning.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; border-color: #d0d4da !important;
} }
body .bi-button.button-common.disabled, body .bi-button.button-common.disabled,

8
src/css/base/single/button/switch.css

@ -14,10 +14,10 @@
border-radius: 9px 9px 9px 9px; border-radius: 9px 9px 9px 9px;
} }
.bi-switch.disabled { .bi-switch.disabled {
background-color: #F2F4F7; background-color: #f2f4f7;
} }
.bi-switch.disabled:active { .bi-switch.disabled:active {
background-color: #F2F4F7; background-color: #f2f4f7;
} }
.bi-theme-dark .bi-switch { .bi-theme-dark .bi-switch {
background-color: #606479; background-color: #606479;
@ -27,8 +27,8 @@
background-color: #3685f2; background-color: #3685f2;
} }
.bi-theme-dark .bi-switch.disabled { .bi-theme-dark .bi-switch.disabled {
background-color: #2F3149; background-color: #292f45;
} }
.bi-theme-dark .bi-switch.disabled:active { .bi-theme-dark .bi-switch.disabled:active {
background-color: #2F3149; background-color: #292f45;
} }

4
src/css/base/single/input/checkbox.css

@ -35,7 +35,7 @@
opacity: 1; opacity: 1;
} }
.bi-checkbox.disabled .checkbox-content { .bi-checkbox.disabled .checkbox-content {
background-color: #F2F4F7; background-color: #f2f4f7;
border-color: #d0d4da; border-color: #d0d4da;
} }
.bi-checkbox.disabled .checkbox-content:after { .bi-checkbox.disabled .checkbox-content:after {
@ -59,7 +59,7 @@
border-color: #3685f2; border-color: #3685f2;
} }
.bi-theme-dark .bi-checkbox.disabled .checkbox-content { .bi-theme-dark .bi-checkbox.disabled .checkbox-content {
background-color: #2F3149; background-color: #292f45;
} }
.bi-theme-dark .bi-checkbox.disabled.active .checkbox-content { .bi-theme-dark .bi-checkbox.disabled.active .checkbox-content {
background-color: #606479; background-color: #606479;

2
src/css/base/single/input/input.css

@ -15,5 +15,5 @@
.bi-input.bi-input-error, .bi-input.bi-input-error,
.bi-textarea.bi-input-error { .bi-textarea.bi-input-error {
border: none; border: none;
color: #ff4949 !important; color: #e65251 !important;
} }

4
src/css/base/single/input/radio.css

@ -34,7 +34,7 @@
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
} }
.bi-radio.disabled .radio-content { .bi-radio.disabled .radio-content {
background-color: #F2F4F7; background-color: #f2f4f7;
border-color: #d0d4da; border-color: #d0d4da;
} }
.bi-radio.disabled .radio-content:after { .bi-radio.disabled .radio-content:after {
@ -58,7 +58,7 @@
border-color: #3685f2; border-color: #3685f2;
} }
.bi-theme-dark .bi-radio.disabled .radio-content { .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,
.bi-theme-dark .bi-radio.disabled .radio-content:hover { .bi-theme-dark .bi-radio.disabled .radio-content:hover {

8
src/css/base/single/tip/tip.css

@ -5,7 +5,7 @@
} }
.bi-bubble .bubble-error { .bi-bubble .bubble-error {
background: #ffecec; background: #ffecec;
color: #ff4949; color: #e65251;
} }
.bi-theme-dark .bi-bubble .bubble-error { .bi-theme-dark .bi-bubble .bubble-error {
background: #3A2940; background: #3A2940;
@ -42,7 +42,7 @@
background: #faaa39; background: #faaa39;
} }
.bi-toast.toast-error { .bi-toast.toast-error {
background: #ff4949; background: #e65251;
} }
.bi-toast.toast-normal { .bi-toast.toast-normal {
background: #3685f2; background: #3685f2;
@ -64,6 +64,6 @@
border: 1px solid #647185; border: 1px solid #647185;
} }
.bi-tooltip.tooltip-warning { .bi-tooltip.tooltip-warning {
background: #ff4949; background: #e65251;
border: 1px solid #FF4949; border: 1px solid #e65251;
} }

2
src/css/base/view/popupview.css

@ -30,7 +30,7 @@
border-left: none; border-left: none;
} }
.bi-theme-dark .bi-popup-view .list-view-toolbar > .center-element { .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 { .bi-theme-dark .bi-popup-view .list-view-toolbar > .first-element {
border-left: none; border-left: none;

80
src/css/core/utils/common.css

@ -4,7 +4,7 @@ textarea {
} }
.bi-theme-dark input, .bi-theme-dark input,
.bi-theme-dark textarea { .bi-theme-dark textarea {
border: 1px solid #3a3c53; border: 1px solid #363e55;
} }
.base-disabled { .base-disabled {
cursor: not-allowed !important; cursor: not-allowed !important;
@ -40,7 +40,7 @@ textarea {
border-color: #e8eaed; border-color: #e8eaed;
} }
.bi-theme-dark .bi-focus-shadow.disabled:hover { .bi-theme-dark .bi-focus-shadow.disabled:hover {
border-color: #3a3c53; border-color: #363e55;
} }
.base-invalid { .base-invalid {
cursor: default !important; cursor: default !important;
@ -68,7 +68,7 @@ textarea {
color: #3d4d66; color: #3d4d66;
} }
.bi-theme-dark .bi-background { .bi-theme-dark .bi-background {
background-color: #191B2B; background-color: #191b2b;
color: #d6e0dc; color: #d6e0dc;
} }
.bi-theme-dark .bi-background .bi-input { .bi-theme-dark .bi-background .bi-input {
@ -78,7 +78,7 @@ textarea {
color: #d6e0dc; color: #d6e0dc;
} }
.bi-header-background { .bi-header-background {
background-color: #F2F4F7; background-color: #f2f4f7;
color: #647185; color: #647185;
} }
.bi-header-background .bi-input { .bi-header-background .bi-input {
@ -88,7 +88,7 @@ textarea {
color: #647185; color: #647185;
} }
.bi-theme-dark .bi-header-background { .bi-theme-dark .bi-header-background {
background-color: #2F3149; background-color: #292f45;
color: #afb7c6; color: #afb7c6;
} }
.bi-theme-dark .bi-header-background .bi-input { .bi-theme-dark .bi-header-background .bi-input {
@ -108,7 +108,7 @@ textarea {
color: #3d4d66; color: #3d4d66;
} }
.bi-theme-dark .bi-card { .bi-theme-dark .bi-card {
background-color: #242640; background-color: #20263b;
color: #d6e0dc; color: #d6e0dc;
} }
.bi-theme-dark .bi-card .bi-input { .bi-theme-dark .bi-card .bi-input {
@ -175,19 +175,19 @@ textarea {
border-color: #d0d4da !important; border-color: #d0d4da !important;
} }
.bi-theme-dark .bi-border { .bi-theme-dark .bi-border {
border: 1px solid #3a3c53; border: 1px solid #363e55;
} }
.bi-theme-dark .bi-border-top { .bi-theme-dark .bi-border-top {
border-top: 1px solid #3a3c53; border-top: 1px solid #363e55;
} }
.bi-theme-dark .bi-border-right { .bi-theme-dark .bi-border-right {
border-right: 1px solid #3a3c53; border-right: 1px solid #363e55;
} }
.bi-theme-dark .bi-border-bottom { .bi-theme-dark .bi-border-bottom {
border-bottom: 1px solid #3a3c53; border-bottom: 1px solid #363e55;
} }
.bi-theme-dark .bi-border-left { .bi-theme-dark .bi-border-left {
border-left: 1px solid #3a3c53; border-left: 1px solid #363e55;
} }
.bi-split { .bi-split {
border: 1px solid #f2f4f7; border: 1px solid #f2f4f7;
@ -205,19 +205,19 @@ textarea {
border-left: 1px solid #f2f4f7; border-left: 1px solid #f2f4f7;
} }
.bi-theme-dark .bi-split { .bi-theme-dark .bi-split {
border: 1px solid #2F3149; border: 1px solid #292f45;
} }
.bi-theme-dark .bi-split-top { .bi-theme-dark .bi-split-top {
border-top: 1px solid #2F3149; border-top: 1px solid #292f45;
} }
.bi-theme-dark .bi-split-right { .bi-theme-dark .bi-split-right {
border-right: 1px solid #2F3149; border-right: 1px solid #292f45;
} }
.bi-theme-dark .bi-split-bottom { .bi-theme-dark .bi-split-bottom {
border-bottom: 1px solid #2F3149; border-bottom: 1px solid #292f45;
} }
.bi-theme-dark .bi-split-left { .bi-theme-dark .bi-split-left {
border-left: 1px solid #2F3149; border-left: 1px solid #292f45;
} }
.bi-font-helvetica-neue { .bi-font-helvetica-neue {
font-family: "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif; font-family: "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif;
@ -264,13 +264,13 @@ textarea {
color: #3685f2; color: #3685f2;
} }
.bi-error { .bi-error {
color: #ff4949; color: #e65251;
} }
.bi-error .bi-input { .bi-error .bi-input {
color: #ff4949; color: #e65251;
} }
.bi-error .bi-textarea { .bi-error .bi-textarea {
color: #ff4949; color: #e65251;
} }
.bi-high-light-background { .bi-high-light-background {
background-color: #3685f2; background-color: #3685f2;
@ -283,7 +283,7 @@ textarea {
color: #ffffff; color: #ffffff;
} }
.bi-error-background { .bi-error-background {
background-color: #ff4949; background-color: #e65251;
color: #ffffff; color: #ffffff;
} }
.bi-error-background .bi-input { .bi-error-background .bi-input {
@ -362,15 +362,15 @@ textarea {
color: #ffffff; color: #ffffff;
} }
.bi-theme-dark .bi-mask { .bi-theme-dark .bi-mask {
color: #242640; color: #20263b;
background-color: rgba(255, 255, 255, 0.2); background-color: rgba(255, 255, 255, 0.2);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#33ffffff,endColorstr=#33ffffff); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#33ffffff,endColorstr=#33ffffff);
} }
.bi-theme-dark .bi-mask .bi-input { .bi-theme-dark .bi-mask .bi-input {
color: #242640; color: #20263b;
} }
.bi-theme-dark .bi-mask .bi-textarea { .bi-theme-dark .bi-mask .bi-textarea {
color: #242640; color: #20263b;
} }
.bi-z-index-mask { .bi-z-index-mask {
background-color: rgba(35, 46, 64, 0.5); background-color: rgba(35, 46, 64, 0.5);
@ -815,45 +815,45 @@ textarea {
border-color: #13cd66; border-color: #13cd66;
} }
.bi-list-item-select.button-warning { .bi-list-item-select.button-warning {
color: #ff4949; color: #e65251;
} }
.bi-list-item-select.button-warning .bi-input { .bi-list-item-select.button-warning .bi-input {
color: #ff4949; color: #e65251;
} }
.bi-list-item-select.button-warning .bi-textarea { .bi-list-item-select.button-warning .bi-textarea {
color: #ff4949; color: #e65251;
} }
.bi-list-item-select.button-warning .bi-high-light { .bi-list-item-select.button-warning .bi-high-light {
color: #ff4949; color: #e65251;
} }
.bi-list-item-select.button-warning.bi-high-light-border { .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,
.bi-list-item-select.button-warning.hover { .bi-list-item-select.button-warning.hover {
color: #ff4949; color: #e65251;
background-color: #ffecec; background-color: #ffecec;
} }
.bi-list-item-select.button-warning:hover .bi-input, .bi-list-item-select.button-warning:hover .bi-input,
.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,
.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,
.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,
.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,
.bi-list-item-select.button-warning.active { .bi-list-item-select.button-warning.active {
color: #ffffff; 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,
.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,
.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 { .bi-list-item-select.disabled {
color: #9ea6b2 !important; color: #9ea6b2 !important;
@ -973,7 +973,7 @@ textarea {
.bi-theme-dark .bi-list-item-select2:hover, .bi-theme-dark .bi-list-item-select2:hover,
.bi-theme-dark .bi-list-item-select2.hover { .bi-theme-dark .bi-list-item-select2.hover {
color: #ffffff; 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,
.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,
.bi-theme-dark .bi-list-item-select2:active { .bi-theme-dark .bi-list-item-select2:active {
color: #3685f2; 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,
.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,
.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,
.bi-theme-dark .bi-list-item-select3.active { .bi-theme-dark .bi-list-item-select3.active {
color: #3685f2; 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,
.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.hover,
.bi-theme-dark .bi-list-item-select3.disabled:active, .bi-theme-dark .bi-list-item-select3.disabled:active,
.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,
.bi-theme-dark .bi-list-item-select.hover { .bi-theme-dark .bi-list-item-select.hover {

12
src/css/resource/app.css

@ -30,8 +30,8 @@ body {
div::-webkit-scrollbar, div::-webkit-scrollbar,
textarea::-webkit-scrollbar { textarea::-webkit-scrollbar {
-webkit-appearance: none; -webkit-appearance: none;
background-color: rgba(61, 77, 102, 0.05); background-color: rgba(32, 38, 59, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d3d4d66,endColorstr=#0d3d4d66); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d20263b,endColorstr=#0d20263b);
width: 6px; width: 6px;
height: 6px; height: 6px;
} }
@ -40,13 +40,13 @@ textarea::-webkit-scrollbar-thumb {
-webkit-border-radius: 0; -webkit-border-radius: 0;
-moz-border-radius: 0; -moz-border-radius: 0;
border-radius: 0; border-radius: 0;
background-color: rgba(61, 77, 102, 0.3); background-color: rgba(32, 38, 59, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d3d4d66,endColorstr=#4d3d4d66); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d20263b,endColorstr=#4d20263b);
} }
div::-webkit-scrollbar-thumb:hover, div::-webkit-scrollbar-thumb:hover,
textarea::-webkit-scrollbar-thumb:hover { textarea::-webkit-scrollbar-thumb:hover {
background-color: rgba(61, 77, 102, 0.7); background-color: rgba(32, 38, 59, 0.7);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b33d4d66,endColorstr=#b33d4d66); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b320263b,endColorstr=#b320263b);
} }
.bi-theme-dark div::-webkit-scrollbar, .bi-theme-dark div::-webkit-scrollbar,
.bi-theme-dark textarea::-webkit-scrollbar { .bi-theme-dark textarea::-webkit-scrollbar {

2
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,
.search-close-h-font.hover .b-font:before { .search-close-h-font.hover .b-font:before {
content: "\e6d0"; content: "\e6d0";
color: #ff4949; color: #e65251;
} }
.search-close-h-font.disabled .b-font:before { .search-close-h-font.disabled .b-font:before {
content: "\e6d0"; content: "\e6d0";

2
src/css/widget/numberinterval/numberinterval.css

@ -37,5 +37,5 @@
font-size: 14px; font-size: 14px;
} }
.bi-number-interval.number-error .bi-input { .bi-number-interval.number-error .bi-input {
color: #ff4949 !important; color: #e65251 !important;
} }

2
src/css/widget/searchmultiselect/searchmultiselect.css

@ -2,5 +2,5 @@
font-size: 16px; font-size: 16px;
} }
.bi-search-multi-text-value-combo.combo-error .bi-multi-select-searcher .tip-text-style { .bi-search-multi-text-value-combo.combo-error .bi-multi-select-searcher .tip-text-style {
color: #ff4949; color: #e65251;
} }

6
src/css/widget/singleslider/slider/widget.css

@ -34,13 +34,13 @@
left: -8px; left: -8px;
} }
.bi-theme-dark .bi-single-slider-button .slider-button { .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,
.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,
.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;
} }

4
src/css/widget/timeinterval/dateinterval.css

@ -1,6 +1,6 @@
.bi-date-interval.time-error .bi-input { .bi-date-interval.time-error .bi-input {
color: #ff4949; color: #e65251;
} }
.bi-date-interval.time-error .sign-editor-text { .bi-date-interval.time-error .sign-editor-text {
color: #ff4949; color: #e65251;
} }

4
src/css/widget/timeinterval/timeinterval.css

@ -4,8 +4,8 @@
border-radius: 2px; border-radius: 2px;
} }
.bi-time-interval.time-error .bi-date-time-trigger .bi-input { .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 { .bi-time-interval.time-error .bi-date-time-trigger .sign-editor-text {
color: #ff4949; color: #e65251;
} }

2
src/css/widget/year/popup.css

@ -8,7 +8,7 @@
border-left: none; border-left: none;
} }
.bi-theme-dark .bi-year-popup .year-popup-navigation > .center-element { .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 { .bi-theme-dark .bi-year-popup .year-popup-navigation > .first-element {
border-left: none; border-left: none;

4
src/css/widget/yearmonthinterval/yearmonthinterval.css

@ -1,6 +1,6 @@
.bi-year-month-interval.time-error .bi-input { .bi-year-month-interval.time-error .bi-input {
color: #ff4949; color: #e65251;
} }
.bi-year-month-interval.time-error .sign-editor-text { .bi-year-month-interval.time-error .sign-editor-text {
color: #ff4949; color: #e65251;
} }

58
src/less/lib/constant.less

@ -22,53 +22,53 @@
@opacity-20: 0.2; @opacity-20: 0.2;
//font color //font color
@font-color-black: #232e40;// @font-color-black: #232e40;
@font-color-normal: #3d4d66;// @font-color-normal: #3d4d66;
@font-color-normal-theme-dark: #d6e0dc;// @font-color-normal-theme-dark: #d6e0dc;
@font-color-light-gray: #647185; @font-color-light-gray: #647185;
@font-color-light-gray-theme-dark: #afb7c6; @font-color-light-gray-theme-dark: #afb7c6;
@font-color-disabled: #9ea6b2;// @font-color-disabled: #9ea6b2;
@font-color-disabled-theme-dark: #878d9f;// @font-color-disabled-theme-dark: #878d9f;
@font-color-tips: #9ea6b2;// @font-color-tips: #9ea6b2;
@font-color-tips-theme-dark: #6b7084;// @font-color-tips-theme-dark: #6b7084;
@font-color-light-disabled: #d0d4da;// @font-color-light-disabled: #d0d4da;
@font-color-light-disabled-theme-dark: #606479; @font-color-light-disabled-theme-dark: #606479;
@font-color-gray: #999999; @font-color-gray: #999999;
@font-color-white: #ffffff;// @font-color-white: #ffffff;
@font-color-white-theme-dark: #242640;// @font-color-white-theme-dark: #20263b;
@font-color-light-highlight: #eaf2fd; @font-color-light-highlight: #eaf2fd;
@font-color-medium-highlight: #d7e7fc; @font-color-medium-highlight: #d7e7fc;
@font-color-highlight: #3685f2; @font-color-highlight: #3685f2;
@font-color-blue: #23beef; @font-color-blue: #23beef;
@font-color-light-blue: #e9f8fd; @font-color-light-blue: #e9f8fd;
@font-color-success: #13cd66; @font-color-success: #13cd66;
@font-color-warning: #faaa39;// @font-color-warning: #faaa39;
@font-color-negative: #ff4949;// @font-color-negative: #e65251;
@font-color-yellow: #ffc101;// @font-color-yellow: #ffc101;
//background color //background color
@background-color-black: #232E40;// @background-color-black: #232E40;
@background-color-light-black: #3d4d66; @background-color-light-black: #3d4d66;
@background-color-light-black-theme-dark: #d6e0dc;// @background-color-light-black-theme-dark: #d6e0dc;
@background-color-default: #ffffff;// @background-color-default: #ffffff;
@background-color-default-theme-dark: #242640;// @background-color-default-theme-dark: #20263b;
@background-color-normal: #f7f8fa;// @background-color-normal: #f7f8fa;
@background-color-normal-theme-dark: #191B2B;// @background-color-normal-theme-dark: #191b2b;
@background-color-light-highlight: #eaf2fd; @background-color-light-highlight: #eaf2fd;
@background-color-medium-highlight: #d7e7fc; @background-color-medium-highlight: #d7e7fc;
@background-color-highlight: #3685f2; @background-color-highlight: #3685f2;
@background-color-blue: #23beef; @background-color-blue: #23beef;
@background-color-light-blue: #e9f8fd; @background-color-light-blue: #e9f8fd;
@background-color-dark: #d4dadd; @background-color-dark: #d4dadd;
@background-color-light-gray: #F2F4F7; @background-color-light-gray: #f2f4f7;
@background-color-light-gray-theme-dark: #2F3149; @background-color-light-gray-theme-dark: #292f45;
@background-color-dark-gray: #d0d4da; @background-color-dark-gray: #d0d4da;
@background-color-dark-gray-theme-dark: #606479; @background-color-dark-gray-theme-dark: #606479;
@background-color-disabled: #F2F4F7; @background-color-disabled: #f2f4f7;
@background-color-disabled-theme-dark: #2F3149; @background-color-disabled-theme-dark: #292f45;
@background-color-yellow: #ffc101;// @background-color-yellow: #ffc101;
@background-color-negative: #ff4949; @background-color-negative: #e65251;
@background-color-light-negative: #ffecec; @background-color-light-negative: #ffecec;
@background-color-dark-negative: #3A2940; @background-color-dark-negative: #3A2940;
@background-color-light-warning: #feeed7; @background-color-light-warning: #feeed7;
@ -82,15 +82,15 @@
@border-color-default: #ffffff; @border-color-default: #ffffff;
@border-color-black: #232e40; @border-color-black: #232e40;
@border-color-line: #e8eaed; @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: #f2f4f7;
@border-color-light-line-theme-dark: #2F3149; @border-color-light-line-theme-dark: #292f45;
@border-color-dark-line: #9EA6B2; @border-color-dark-line: #9EA6B2;
@border-color-dark-line-theme-dark: #878D9F; @border-color-dark-line-theme-dark: #878D9F;
@border-color-highlight: #3685f2; @border-color-highlight: #3685f2;
@border-color-warning: #fbb03b; @border-color-warning: #fbb03b;
@border-color-negative: #FF4949; @border-color-negative: #e65251;
@border-color-success: #13cd66; @border-color-success: #13cd66;
@border-color-light-negative: #f4cbcb; @border-color-light-negative: #f4cbcb;
@border-color-normal-success: #eddea2; @border-color-normal-success: #eddea2;
@ -100,7 +100,7 @@
@border-color-disabled-theme-dark: #606479; @border-color-disabled-theme-dark: #606479;
//scroll color //scroll color
@scroll-color: #3d4d66; @scroll-color: #20263b;
@scroll-color-theme-dark: #ffffff; @scroll-color-theme-dark: #ffffff;
@water-mark-color-theme-dark: #878d9f; @water-mark-color-theme-dark: #878d9f;

1
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
"%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
"%H:%M:%S %P", // HH:mm:ss a
"%l:%M", // h:mm "%l:%M", // h:mm
"%k:%M", // H:mm "%k:%M", // H:mm
"%I:%M", // hh:mm "%I:%M", // hh:mm

12
ui/css/app.css

@ -30,8 +30,8 @@ body {
div::-webkit-scrollbar, div::-webkit-scrollbar,
textarea::-webkit-scrollbar { textarea::-webkit-scrollbar {
-webkit-appearance: none; -webkit-appearance: none;
background-color: rgba(61, 77, 102, 0.05); background-color: rgba(32, 38, 59, 0.05);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d3d4d66,endColorstr=#0d3d4d66); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0d20263b,endColorstr=#0d20263b);
width: 6px; width: 6px;
height: 6px; height: 6px;
} }
@ -40,13 +40,13 @@ textarea::-webkit-scrollbar-thumb {
-webkit-border-radius: 0; -webkit-border-radius: 0;
-moz-border-radius: 0; -moz-border-radius: 0;
border-radius: 0; border-radius: 0;
background-color: rgba(61, 77, 102, 0.3); background-color: rgba(32, 38, 59, 0.3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d3d4d66,endColorstr=#4d3d4d66); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d20263b,endColorstr=#4d20263b);
} }
div::-webkit-scrollbar-thumb:hover, div::-webkit-scrollbar-thumb:hover,
textarea::-webkit-scrollbar-thumb:hover { textarea::-webkit-scrollbar-thumb:hover {
background-color: rgba(61, 77, 102, 0.7); background-color: rgba(32, 38, 59, 0.7);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b33d4d66,endColorstr=#b33d4d66); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b320263b,endColorstr=#b320263b);
} }
.bi-theme-dark div::-webkit-scrollbar, .bi-theme-dark div::-webkit-scrollbar,
.bi-theme-dark textarea::-webkit-scrollbar { .bi-theme-dark textarea::-webkit-scrollbar {

2
ui/css/font.css

@ -79,7 +79,7 @@
.search-close-h-font:hover .b-font:before, .search-close-h-font:hover .b-font:before,
.search-close-h-font.hover .b-font:before { .search-close-h-font.hover .b-font:before {
content: "\e6d0"; content: "\e6d0";
color: #ff4949; color: #e65251;
} }
.search-close-h-font.disabled .b-font:before { .search-close-h-font.disabled .b-font:before {
content: "\e6d0"; content: "\e6d0";

Loading…
Cancel
Save