From 120687c314d6ac2c0536530745adc48298fbcfe0 Mon Sep 17 00:00:00 2001 From: afc163 Date: Mon, 15 Jun 2015 16:20:06 +0800 Subject: [PATCH 1/3] tabs -> tab --- components/{tabs => tab}/demo/basic.md | 2 +- components/{tabs => tab}/demo/disabled.md | 2 +- components/{tabs => tab}/demo/icon.md | 2 +- components/{tabs => tab}/demo/slide.md | 2 +- components/{tabs => tab}/index.jsx | 2 +- components/{tabs => tab}/index.md | 0 index.js | 2 +- style/components/tab.less | 2 +- 8 files changed, 7 insertions(+), 7 deletions(-) rename components/{tabs => tab}/demo/basic.md (86%) rename components/{tabs => tab}/demo/disabled.md (86%) rename components/{tabs => tab}/demo/icon.md (91%) rename components/{tabs => tab}/demo/slide.md (90%) rename components/{tabs => tab}/index.jsx (91%) rename components/{tabs => tab}/index.md (100%) diff --git a/components/tabs/demo/basic.md b/components/tab/demo/basic.md similarity index 86% rename from components/tabs/demo/basic.md rename to components/tab/demo/basic.md index b5819b4ee4..694c882a3a 100644 --- a/components/tabs/demo/basic.md +++ b/components/tab/demo/basic.md @@ -18,5 +18,5 @@ React.render( 选项卡二 选项卡三 -, document.getElementById('components-tabs-demo-basic')); +, document.getElementById('components-tab-demo-basic')); ```` diff --git a/components/tabs/demo/disabled.md b/components/tab/demo/disabled.md similarity index 86% rename from components/tabs/demo/disabled.md rename to components/tab/demo/disabled.md index f89329d162..37d697c7f6 100644 --- a/components/tabs/demo/disabled.md +++ b/components/tab/demo/disabled.md @@ -18,5 +18,5 @@ React.render( 选项卡二 选项卡三 -, document.getElementById('components-tabs-demo-disabled')); +, document.getElementById('components-tab-demo-disabled')); ```` diff --git a/components/tabs/demo/icon.md b/components/tab/demo/icon.md similarity index 91% rename from components/tabs/demo/icon.md rename to components/tab/demo/icon.md index d07d72974a..5dcce8bc3a 100644 --- a/components/tabs/demo/icon.md +++ b/components/tab/demo/icon.md @@ -24,5 +24,5 @@ React.render( 选项卡一 选项卡一 -, document.getElementById('components-tabs-demo-icon')); +, document.getElementById('components-tab-demo-icon')); ```` diff --git a/components/tabs/demo/slide.md b/components/tab/demo/slide.md similarity index 90% rename from components/tabs/demo/slide.md rename to components/tab/demo/slide.md index 935f0c004b..41dc326111 100644 --- a/components/tabs/demo/slide.md +++ b/components/tab/demo/slide.md @@ -21,5 +21,5 @@ React.render( 选项卡五 选项卡六 -, document.getElementById('components-tabs-demo-slide')); +, document.getElementById('components-tab-demo-slide')); ```` diff --git a/components/tabs/index.jsx b/components/tab/index.jsx similarity index 91% rename from components/tabs/index.jsx rename to components/tab/index.jsx index fae321ece4..8a4058be26 100644 --- a/components/tabs/index.jsx +++ b/components/tab/index.jsx @@ -10,7 +10,7 @@ class AntTabs extends React.Component { } AntTabs.defaultProps = { - prefixCls: 'ant-tabs' + prefixCls: 'ant-tab' }; AntTabs.TabPane = Tab.TabPane; diff --git a/components/tabs/index.md b/components/tab/index.md similarity index 100% rename from components/tabs/index.md rename to components/tab/index.md diff --git a/index.js b/index.js index f4d8e42296..377807b66d 100644 --- a/index.js +++ b/index.js @@ -3,7 +3,7 @@ require('./style/index.less'); var antd = { Datepicker: require('./components/datepicker'), Tooltip: require('./components/tooltip'), - Tab: require('./components/tabs'), + Tab: require('./components/tab'), Modal: require('./components/modal'), Menu: require('rc-menu'), Dropdown: require('./components/dropdown'), diff --git a/style/components/tab.less b/style/components/tab.less index 30dea05e1f..32382657c8 100644 --- a/style/components/tab.less +++ b/style/components/tab.less @@ -1,4 +1,4 @@ -@prefixClass: ant-tabs; +@prefixClass: ant-tab; @easing-in-out: cubic-bezier(0.35, 0, 0.25, 1); From 7d45ed3a6b184a68db91f16cc7ed19680240f4b1 Mon Sep 17 00:00:00 2001 From: afc163 Date: Mon, 15 Jun 2015 16:21:57 +0800 Subject: [PATCH 2/3] fix active tab font-weight --- style/components/tab.less | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/style/components/tab.less b/style/components/tab.less index 32382657c8..1c8a33d161 100644 --- a/style/components/tab.less +++ b/style/components/tab.less @@ -122,8 +122,8 @@ } div.@{prefixClass}-tab-active { - > a, > a:hover, > a:focus { + font-weight: bold; color: #3fc7fa; cursor: pointer; text-decoration: none; @@ -149,7 +149,6 @@ > a { padding: 8px 25px; transition: color 0.3s @easing-in-out; - font-weight: 500; display: block; color: #666; From bc9ef26383a466179b7b18b6c4d132b9738c6624 Mon Sep 17 00:00:00 2001 From: afc163 Date: Mon, 15 Jun 2015 16:22:58 +0800 Subject: [PATCH 3/3] fix active tab color --- style/components/tab.less | 1 - 1 file changed, 1 deletion(-) diff --git a/style/components/tab.less b/style/components/tab.less index 1c8a33d161..dbeba4bcb1 100644 --- a/style/components/tab.less +++ b/style/components/tab.less @@ -124,7 +124,6 @@ div.@{prefixClass}-tab-active { > a, > a:hover, > a:focus { font-weight: bold; - color: #3fc7fa; cursor: pointer; text-decoration: none; }