From 7125baece8076c6b9364aa733b3a551cb9775a7e Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Sat, 6 Jul 2019 16:45:51 +0800
Subject: [PATCH 1/2] :bug: Fix Tabs disabled tab style

close #17468
---
 components/tabs/style/card-style.less |  4 ++++
 components/tabs/style/index.less      | 10 +++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/components/tabs/style/card-style.less b/components/tabs/style/card-style.less
index 3cea4d72a7f6..ea100406e550 100644
--- a/components/tabs/style/card-style.less
+++ b/components/tabs/style/card-style.less
@@ -29,6 +29,10 @@
     border-color: @border-color-split;
     border-bottom: @border-width-base solid @component-background;
   }
+  &&-card &-card-bar &-tab-disabled {
+    color: @tabs-card-active-color;
+    color: @disabled-color;
+  }
   &&-card &-card-bar &-tab-inactive {
     padding: 0;
   }
diff --git a/components/tabs/style/index.less b/components/tabs/style/index.less
index 66782d4a6233..c233aedefa84 100644
--- a/components/tabs/style/index.less
+++ b/components/tabs/style/index.less
@@ -197,6 +197,11 @@
         margin-right: 8px;
       }
 
+      &-active {
+        color: @tabs-highlight-color;
+        font-weight: 500;
+      }
+
       &-disabled {
         &,
         &:hover {
@@ -204,11 +209,6 @@
           cursor: not-allowed;
         }
       }
-
-      &-active {
-        color: @tabs-highlight-color;
-        font-weight: 500;
-      }
     }
   }
 

From b4102c93d0c6f58000b2c8d7ab694cccfd6f7cc6 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Sat, 6 Jul 2019 16:48:46 +0800
Subject: [PATCH 2/2] :bug: Fix Tabs next icon right 2px bug

close #17477
---
 components/tabs/style/index.less | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/components/tabs/style/index.less b/components/tabs/style/index.less
index c233aedefa84..bd2f5f203f31 100644
--- a/components/tabs/style/index.less
+++ b/components/tabs/style/index.less
@@ -259,14 +259,9 @@
   .@{tab-prefix-cls}-right-bar {
     height: 100%;
     border-bottom: 0;
-    &-tab-prev,
-    &-tab-next {
-      width: @tabs-scrolling-size;
-      height: 0;
-      transition: height 0.3s @ease-in-out, opacity 0.3s @ease-in-out, color 0.3s @ease-in-out;
-    }
-    &-tab-prev.@{tab-prefix-cls}-tab-arrow-show,
-    &-tab-next.@{tab-prefix-cls}-tab-arrow-show {
+
+    .@{tab-prefix-cls}-tab-arrow-show,
+    .@{tab-prefix-cls}-tab-arrow-show {
       width: 100%;
       height: @tabs-scrolling-size;
     }
@@ -320,6 +315,7 @@
     }
 
     .@{tab-prefix-cls}-tab-next {
+      right: 0;
       bottom: 0;
       width: 100%;
       height: @tabs-scrolling-size;