From 1113867378ec6ab6adedaf8b66d46d1f13514c8a Mon Sep 17 00:00:00 2001
From: Yulia Maximova <juliam2007@mail.ru>
Date: Fri, 16 Oct 2020 17:25:36 +0300
Subject: [PATCH] fix: form customizing mixin (#26422)

* fix: add styling form input background-color

* fix: conflict resolution

Co-authored-by: Maksimova, Yuliya <Yuliya.Maksimova@nexign.com>
---
 components/form/style/mixin.less  | 16 ++++++++--------
 components/form/style/status.less | 21 +++++++++++++++++++++
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/components/form/style/mixin.less b/components/form/style/mixin.less
index 1ae64899f1..5e2d0c2c7f 100644
--- a/components/form/style/mixin.less
+++ b/components/form/style/mixin.less
@@ -9,6 +9,7 @@
   .@{ant-prefix}-input-affix-wrapper {
     &,
     &:hover {
+      background-color: @background-color;
       border-color: @border-color;
     }
 
@@ -18,16 +19,15 @@
     }
   }
 
-  .@{ant-prefix}-input {
-    &:not(&-disabled) {
-      background-color: @background-color;
-    }
+  .@{ant-prefix}-input-disabled {
+    background-color: @input-disabled-bg;
+    border-color: @input-border-color;
   }
 
-  .@{ant-prefix}-input-affix-wrapper {
-    &:not(&-disabled) {
-      background-color: @background-color;
-    }
+  .@{ant-prefix}-input-affix-wrapper-disabled {
+    background-color: @input-disabled-bg;
+    border-color: @input-border-color;
+
     input:focus {
       box-shadow: none !important;
     }
diff --git a/components/form/style/status.less b/components/form/style/status.less
index b2fd7da7f1..2887dc6864 100644
--- a/components/form/style/status.less
+++ b/components/form/style/status.less
@@ -137,6 +137,7 @@
     //select
     .@{ant-prefix}-select:not(.@{ant-prefix}-select-borderless) {
       .@{ant-prefix}-select-selector {
+        background-color: @form-warning-input-bg;
         border-color: @warning-color !important;
       }
       &.@{ant-prefix}-select-open .@{ant-prefix}-select-selector,
@@ -148,12 +149,14 @@
     //input-number, timepicker
     .@{ant-prefix}-input-number,
     .@{ant-prefix}-picker {
+      background-color: @form-warning-input-bg;
       border-color: @warning-color;
       &-focused,
       &:focus {
         .active(@warning-color);
       }
       &:not([disabled]):hover {
+        background-color: @form-warning-input-bg;
         border-color: @warning-color;
       }
     }
@@ -175,6 +178,7 @@
     //select
     .@{ant-prefix}-select:not(.@{ant-prefix}-select-borderless) {
       .@{ant-prefix}-select-selector {
+        background-color: @form-error-input-bg;
         border-color: @error-color !important;
       }
       &.@{ant-prefix}-select-open .@{ant-prefix}-select-selector,
@@ -200,17 +204,34 @@
     //input-number, timepicker
     .@{ant-prefix}-input-number,
     .@{ant-prefix}-picker {
+      background-color: @form-error-input-bg;
       border-color: @error-color;
       &-focused,
       &:focus {
         .active(@error-color);
       }
       &:not([disabled]):hover {
+        background-color: @form-error-input-bg;
         border-color: @error-color;
       }
     }
 
+    .@{ant-prefix}-mention-wrapper {
+      .@{ant-prefix}-mention-editor {
+        &,
+        &:not([disabled]):hover {
+          background-color: @form-error-input-bg;
+          border-color: @error-color;
+        }
+      }
+      &.@{ant-prefix}-mention-active:not([disabled]) .@{ant-prefix}-mention-editor,
+      .@{ant-prefix}-mention-editor:not([disabled]):focus {
+        .active(@error-color);
+      }
+    }
+
     .@{ant-prefix}-cascader-picker:focus .@{ant-prefix}-cascader-input {
+      background-color: @form-error-input-bg;
       .active(@error-color);
     }
 
-- 
GitLab