From c2933a8e529dfd48db97e8f11408eecf9b55b33d Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Thu, 6 Aug 2015 16:47:01 +0800
Subject: [PATCH] update tabs style

---
 components/tabs/demo/basic.md    | 10 +++++-----
 components/tabs/demo/disabled.md |  6 +++---
 components/tabs/demo/icon.md     | 14 ++++++--------
 components/tabs/demo/size.md     |  6 +++---
 components/tabs/demo/slide.md    | 18 +++++++++---------
 style/components/tabs.less       | 16 ++++++++++++----
 6 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/components/tabs/demo/basic.md b/components/tabs/demo/basic.md
index d979c79549..d6c1d4014f 100644
--- a/components/tabs/demo/basic.md
+++ b/components/tabs/demo/basic.md
@@ -2,7 +2,7 @@
 
 - order: 0
 
-默认选中第二项。
+默认选中第一项。
 
 ---
 
@@ -15,10 +15,10 @@ function callback(key) {
 }
 
 React.render(
-  <Tabs defaultActiveKey="2" onChange={callback}>
-    <TabPane tab="tab 1" key="1">选项卡一</TabPane>
-    <TabPane tab="tab 2" key="2">选项卡二</TabPane>
-    <TabPane tab="tab 3" key="3">选项卡三</TabPane>
+  <Tabs defaultActiveKey="1" onChange={callback}>
+    <TabPane tab="选项卡一" key="1">选项卡一内容</TabPane>
+    <TabPane tab="选项卡二" key="2">选项卡二内容</TabPane>
+    <TabPane tab="选项卡三" key="3">选项卡三内容</TabPane>
   </Tabs>
 , document.getElementById('components-tabs-demo-basic'));
 ````
diff --git a/components/tabs/demo/disabled.md b/components/tabs/demo/disabled.md
index 13c1a96219..7b8ad27555 100644
--- a/components/tabs/demo/disabled.md
+++ b/components/tabs/demo/disabled.md
@@ -14,9 +14,9 @@ function callback(key) {}
 
 React.render(
   <Tabs defaultActiveKey="1" onChange={callback}>
-    <TabPane tab="tab 1" key="1">选项卡一</TabPane>
-    <TabPane tab="tab 2" disabled={true} key="2">选项卡二</TabPane>
-    <TabPane tab="tab 3" key="3">选项卡三</TabPane>
+    <TabPane tab="选项卡一" key="1">选项卡一</TabPane>
+    <TabPane tab="选项卡二" disabled={true} key="2">选项卡二</TabPane>
+    <TabPane tab="选项卡三" key="3">选项卡三</TabPane>
   </Tabs>
 , document.getElementById('components-tabs-demo-disabled'));
 ````
diff --git a/components/tabs/demo/icon.md b/components/tabs/demo/icon.md
index 3084cc6337..782c7dc1fb 100644
--- a/components/tabs/demo/icon.md
+++ b/components/tabs/demo/icon.md
@@ -10,19 +10,17 @@
 var Tabs = antd.Tabs;
 var TabPane = Tabs.TabPane;
 
-function callback(key) {}
-
 var tabContent = [
-  <span><i className="anticon anticon-apple"></i>tab 1</span>,
-  <span><i className="anticon anticon-android"></i>tab 2</span>,
-  <span><i className="anticon anticon-lock"></i>tab 3</span>,
+  <span><i className="anticon anticon-apple"></i>选项卡一</span>,
+  <span><i className="anticon anticon-android"></i>选项卡二</span>,
+  <span><i className="anticon anticon-lock"></i>选项卡三</span>,
 ];
 
 React.render(
-  <Tabs defaultActiveKey="2" onChange={callback}>
+  <Tabs defaultActiveKey="2">
     <TabPane tab={tabContent[0]} key="1">选项卡一</TabPane>
-    <TabPane tab={tabContent[1]} key="2">选项卡一</TabPane>
-    <TabPane tab={tabContent[2]} key="3">选项卡一</TabPane>
+    <TabPane tab={tabContent[1]} key="2">选项卡二</TabPane>
+    <TabPane tab={tabContent[2]} key="3">选项卡三</TabPane>
   </Tabs>
 , document.getElementById('components-tabs-demo-icon'));
 ````
diff --git a/components/tabs/demo/size.md b/components/tabs/demo/size.md
index b1094419c7..e339251161 100644
--- a/components/tabs/demo/size.md
+++ b/components/tabs/demo/size.md
@@ -12,9 +12,9 @@ var TabPane = Tabs.TabPane;
 
 React.render(
   <Tabs defaultActiveKey="2" size="mini">
-    <TabPane tab="tab 1" key="1">选项卡一</TabPane>
-    <TabPane tab="tab 2" key="2">选项卡二</TabPane>
-    <TabPane tab="tab 3" key="3">选项卡三</TabPane>
+    <TabPane tab="选项卡一" key="1">选项卡一内容</TabPane>
+    <TabPane tab="选项卡二" key="2">选项卡二内容</TabPane>
+    <TabPane tab="选项卡三" key="3">选项卡三内容</TabPane>
   </Tabs>
 , document.getElementById('components-tabs-demo-size'));
 ````
diff --git a/components/tabs/demo/slide.md b/components/tabs/demo/slide.md
index 892572a9b2..ce1cc98657 100644
--- a/components/tabs/demo/slide.md
+++ b/components/tabs/demo/slide.md
@@ -14,15 +14,15 @@ function callback(key) {}
 
 React.render(
   <Tabs defaultActiveKey="1" onChange={callback}>
-    <TabPane tab="tab 1" key="1">选项卡一</TabPane>
-    <TabPane tab="tab 2" key="2">选项卡二</TabPane>
-    <TabPane tab="tab 3" key="3">选项卡三</TabPane>
-    <TabPane tab="tab 4" key="4">选项卡四</TabPane>
-    <TabPane tab="tab 5" key="5">选项卡五</TabPane>
-    <TabPane tab="tab 6" key="6">选项卡六</TabPane>
-    <TabPane tab="tab 7" key="7">选项卡七</TabPane>
-    <TabPane tab="tab 8" key="8">选项卡八</TabPane>
-    <TabPane tab="tab 9" key="9">选项卡九</TabPane>
+    <TabPane tab="选项一" key="1">选项卡一</TabPane>
+    <TabPane tab="选项二" key="2">选项卡二</TabPane>
+    <TabPane tab="选项三" key="3">选项卡三</TabPane>
+    <TabPane tab="选项四" key="4">选项卡四</TabPane>
+    <TabPane tab="选项五" key="5">选项卡五</TabPane>
+    <TabPane tab="选项六" key="6">选项卡六</TabPane>
+    <TabPane tab="选项七" key="7">选项卡七</TabPane>
+    <TabPane tab="选项八" key="8">选项卡八</TabPane>
+    <TabPane tab="选项九" key="9">选项卡九</TabPane>
   </Tabs>
 , document.getElementById('components-tabs-demo-slide'));
 ````
diff --git a/style/components/tabs.less b/style/components/tabs.less
index 7fa2ca390d..097642767d 100644
--- a/style/components/tabs.less
+++ b/style/components/tabs.less
@@ -34,15 +34,18 @@
     width: 100%;
     position: relative;
     white-space: nowrap;
-    padding-right: 32px;
-    border-bottom: 1px solid #f3f3f3;
+    border-bottom: 1px solid #e9e9e9;
     margin-bottom: 15px;
     .clearfix;
   }
 
+  &-nav-container-scrolling {
+    padding-left: 32px;
+    padding-right: 32px;
+  }
+
   &-tab-prev, &-tab-next {
     user-select: none;
-    -webkit-user-select: none;
     z-index: 2;
     margin-right: -2px;
     margin-top: 1px;
@@ -79,6 +82,12 @@
     }
   }
 
+  &-tab-btn-disabled {
+    cursor: default;
+    color: #ccc;
+    pointer-events: none;
+  }
+
   &-tab-next {
     right: 2px;
 
@@ -89,7 +98,6 @@
 
   &-tab-prev {
     left: 0;
-    background: #fff;
     transform: rotate(180deg);
     filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2);
     &-icon:before {