Merge branch 'master' of github.com:ant-design/ant-design

package.json

@@ -59,7 +59,7 @@
     "rc-steps": "~1.4.1",
     "rc-switch": "~1.3.2",
     "rc-table": "~3.11.1",
-    "rc-tabs": "~5.7.0",
+    "rc-tabs": "~5.8.0",
     "rc-time-picker": "~1.1.0",
     "rc-tooltip": "~3.3.1",
     "rc-tree": "~1.1.0",

style/components/tabs.less

@@ -3,13 +3,16 @@
 @effect-duration: .3s;
 
 .@{tab-prefix-cls} {
-  outline: none;
   box-sizing: border-box;
   position: relative;
   overflow: hidden;
   .clearfix;
   color: @text-color;
 
+  &-bar {
+    outline: none;
+  }
+
   &-ink-bar {
     z-index: 1;
     position: absolute;
@@ -32,7 +35,7 @@
     }
   }
 
-  &-tabs-bar {
+  &-bar {
     border-bottom: 1px solid @border-color-base;
     margin-bottom: 16px;
   }
@@ -292,7 +295,7 @@
       width: auto;
     }
 
-    .@{tab-prefix-cls}-tabs-bar {
+    .@{tab-prefix-cls}-bar {
       border-bottom: 0;
     }
 
@@ -329,7 +332,7 @@
   }
 
   &-vertical&-left {
-    .@{tab-prefix-cls}-tabs-bar {
+    .@{tab-prefix-cls}-bar {
       float: left;
       border-right: 1px solid @border-color-split;
       margin-right: -1px;
@@ -356,7 +359,7 @@
   }
 
   &-vertical&-right {
-    .@{tab-prefix-cls}-tabs-bar {
+    .@{tab-prefix-cls}-bar {
       float: right;
       border-left: 1px solid @border-color-split;
       margin-left: -1px;
@@ -377,7 +380,7 @@
     }
   }
 
-  &-bottom &-tabs-bar {
+  &-bottom &-bar {
     margin-bottom: 0;
     margin-top: 16px;
   }