fix(button): disabled style override loading style (#1812)

Co-authored-by: maxin <maxin@growingio.com>
growingio · Jan 19, 2022 · f264dba · f264dba · vercel · Jan 19, 2022
1 parent 76c5961
commit f264dba
Showing 1 changed file with 24 additions and 21 deletions.
diff --git a/src/button/style/index.less b/src/button/style/index.less
@@ -31,70 +31,73 @@
     background-color: @blue-2;
     .elevation(1);
 
-    &:enabled:hover,
+    &:hover,
     &.@{button-prefix-cls}_active {
       background-color: @blue-3;
       .elevation(2);
     }
 
-    &:disabled:not(.@{button-prefix-cls}_loading) {
-      color: @gray-3;
-      background-color: @gray-1;
-      cursor: not-allowed;
-      .elevation(none);
-    }
-
     &.@{button-prefix-cls}_loading {
       background-color: @blue-3;
       cursor: not-allowed;
       .elevation(2);
     }
+
+    &.@{button-prefix-cls}_disabled {
+      color: @gray-3;
+      background-color: @gray-1;
+      cursor: not-allowed;
+      .elevation(none);
+    }
   }
 
   &_secondary {
     color: @gray-5;
     background-color: transparent;
     .border(2, @gray-2);
 
-    &:enabled:hover,
+    &:hover,
     &.@{button-prefix-cls}_active {
       color: @blue-3;
       background-color: @gray-1;
     }
 
-    &:disabled:not(.@{button-prefix-cls}_loading) {
-      color: @gray-3;
-      background-color: transparent;
-      cursor: not-allowed;
-    }
-
     &.@{button-prefix-cls}_loading {
       color: @blue-3;
       background-color: @gray-1;
       cursor: not-allowed;
     }
+
+    &.@{button-prefix-cls}_disabled {
+      color: @gray-3;
+      background-color: transparent;
+      cursor: not-allowed;
+    }
   }
 
   &_text {
     padding: 7px 8px;
     color: @gray-5;
     background-color: transparent;
     .border(2, transparent);
-    &:enabled:hover,
+
+    &:hover,
     &.@{button-prefix-cls}_active {
       color: @blue-3;
       background-color: @gray-1;
     }
-    &:disabled:not(.@{button-prefix-cls}_loading) {
-      color: @gray-3;
-      background-color: transparent;
-      cursor: not-allowed;
-    }
+
     &.@{button-prefix-cls}_loading {
       color: @blue-3;
       background-color: @gray-1;
       cursor: not-allowed;
     }
+
+    &.@{button-prefix-cls}_disabled {
+      color: @gray-3;
+      background-color: transparent;
+      cursor: not-allowed;
+    }
   }
 
   &_small {