From 6b941b83c950f6d1a90ba354eed98c4a6e607637 Mon Sep 17 00:00:00 2001
From: guy <guy@finereport.com>
Date: Wed, 25 Nov 2020 21:56:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=80=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/less/base/segment/segment.less |   4 +-
 src/less/core/utils/common.less    | 132 +++++++++++++++--------------
 2 files changed, 72 insertions(+), 64 deletions(-)

diff --git a/src/less/base/segment/segment.less b/src/less/base/segment/segment.less
index d72dcf8a0..7796d85af 100644
--- a/src/less/base/segment/segment.less
+++ b/src/less/base/segment/segment.less
@@ -30,7 +30,7 @@
       border-bottom: 1px solid @color-bi-border-line-theme-dark;
     }
     & > .first-element{
-      border-left: 1px solid @color-bi-background-default-theme-dark;
+      border-left: 1px solid @color-bi-border-line-theme-dark;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/less/core/utils/common.less b/src/less/core/utils/common.less
index 58e24bf76..35a3e9dda 100644
--- a/src/less/core/utils/common.less
+++ b/src/less/core/utils/common.less
@@ -927,35 +927,83 @@ textarea {
     }
   }
   &.disabled {
-    color: @color-bi-text-disabled !important;
-    & .bi-input {
-      color: @color-bi-text-disabled !important;
-    }
-    & .bi-textarea {
-      color: @color-bi-text-disabled !important;
-    }
-    background-color: transparent !important;
-    & .bi-high-light {
+    &, &:hover, &:active {
       color: @color-bi-text-disabled !important;
-    }
-    &.bi-high-light-border {
-      border-color: @color-bi-border-disabled;
-    }
-    &.hover, &.active {
-      color: @color-bi-text !important;
       & .bi-input {
-        color: @color-bi-text !important;
+        color: @color-bi-text-disabled !important;
       }
       & .bi-textarea {
-        color: @color-bi-text !important;
+        color: @color-bi-text-disabled !important;
       }
-      background-color: @color-bi-background-dark-gray !important;
+      background-color: transparent !important;
       & .bi-high-light {
         color: @color-bi-text-disabled !important;
       }
       &.bi-high-light-border {
         border-color: @color-bi-border-disabled;
       }
+      &.hover, &.active {
+        color: @color-bi-text !important;
+        & .bi-input {
+          color: @color-bi-text !important;
+        }
+        & .bi-textarea {
+          color: @color-bi-text !important;
+        }
+        background-color: @color-bi-background-dark-gray !important;
+        & .bi-high-light {
+          color: @color-bi-text-disabled !important;
+        }
+        &.bi-high-light-border {
+          border-color: @color-bi-border-disabled;
+        }
+      }
+    }
+  }
+}
+
+.bi-theme-dark {
+  .bi-list-item-select {
+    &:hover, &.hover {
+      color: @color-bi-text;
+      & .bi-input {
+        color: @color-bi-text;
+      }
+      & .bi-textarea {
+        color: @color-bi-text;
+      }
+      .background-color(@color-bi-background-default, 5%);
+    }
+    &:active, &.active {
+      color: @color-bi-text;
+      & .bi-input {
+        color: @color-bi-text;
+      }
+      & .bi-textarea {
+        color: @color-bi-text;
+      }
+      background-color: @color-bi-background-highlight;
+      & .bi-high-light {
+        color: @color-bi-text;
+      }
+    }
+    &.disabled {
+      &, &:hover, &:active {
+        background-color: transparent !important;
+        color: @color-bi-text-disabled-theme-dark !important;
+        & .bi-input {
+          color: @color-bi-text-disabled-theme-dark !important;
+        }
+        & .bi-textarea {
+          color: @color-bi-text-disabled-theme-dark !important;
+        }
+        & .bi-high-light {
+          color: @color-bi-text-disabled-theme-dark !important;
+        }
+      }
+      &.hover, &.active {
+        background-color: @background-color-black-theme-dark !important;
+      }
     }
   }
 }
@@ -1031,7 +1079,7 @@ textarea {
     &.active {
       background-color: @color-bi-background-default-theme-dark;
     }
-    
+
     &.disabled {
       &, &:hover, &:active {
         background-color: transparent !important;
@@ -1046,6 +1094,9 @@ textarea {
           color: @color-bi-text-disabled-theme-dark !important;
         }
       }
+      &.active {
+        background-color: @background-color-black-theme-dark !important;
+      }
     }
   }
 }
@@ -1095,49 +1146,6 @@ textarea {
   }
 }
 
-.bi-theme-dark {
-  .bi-list-item-select {
-    &:hover, &.hover {
-      color: @color-bi-text;
-      & .bi-input {
-        color: @color-bi-text;
-      }
-      & .bi-textarea {
-        color: @color-bi-text;
-      }
-      .background-color(@color-bi-background-default, 5%);
-    }
-    &:active, &.active {
-      color: @color-bi-text;
-      & .bi-input {
-        color: @color-bi-text;
-      }
-      & .bi-textarea {
-        color: @color-bi-text;
-      }
-      background-color: @color-bi-background-highlight;
-      & .bi-high-light {
-        color: @color-bi-text;
-      }
-    }
-    &.disabled {
-      &, &:hover, &:active {
-        background-color: transparent !important;
-        color: @color-bi-text-disabled-theme-dark !important;
-        & .bi-input {
-          color: @color-bi-text-disabled-theme-dark !important;
-        }
-        & .bi-textarea {
-          color: @color-bi-text-disabled-theme-dark !important;
-        }
-        & .bi-high-light {
-          color: @color-bi-text-disabled-theme-dark !important;
-        }
-      }
-    }
-  }
-}
-
 //去掉list-item效果
 .bi-list-item-none {
   &:hover, &.hover {