Merge remote-tracking branch 'origin/master'

This commit is contained in:
夏奈 2015-06-15 16:27:01 +08:00
commit 15027544ef
8 changed files with 8 additions and 10 deletions

View File

@ -18,5 +18,5 @@ React.render(
<TabPane tab="tab 2" key="2">选项卡二</TabPane>
<TabPane tab="tab 3" key="3">选项卡三</TabPane>
</Tab>
, document.getElementById('components-tabs-demo-basic'));
, document.getElementById('components-tab-demo-basic'));
````

View File

@ -18,5 +18,5 @@ React.render(
<TabPane tab="tab 2" disabled={true} key="2">选项卡二</TabPane>
<TabPane tab="tab 3" key="3">选项卡三</TabPane>
</Tab>
, document.getElementById('components-tabs-demo-disabled'));
, document.getElementById('components-tab-demo-disabled'));
````

View File

@ -24,5 +24,5 @@ React.render(
<TabPane tab={tabContent[1]} key="2">选项卡一</TabPane>
<TabPane tab={tabContent[2]} key="3">选项卡一</TabPane>
</Tab>
, document.getElementById('components-tabs-demo-icon'));
, document.getElementById('components-tab-demo-icon'));
````

View File

@ -21,5 +21,5 @@ React.render(
<TabPane tab="tab 5" key="5">选项卡五</TabPane>
<TabPane tab="tab 6" key="6">选项卡六</TabPane>
</Tab>
, document.getElementById('components-tabs-demo-slide'));
, document.getElementById('components-tab-demo-slide'));
````

View File

@ -10,7 +10,7 @@ class AntTabs extends React.Component {
}
AntTabs.defaultProps = {
prefixCls: 'ant-tabs'
prefixCls: 'ant-tab'
};
AntTabs.TabPane = Tab.TabPane;

View File

@ -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'),

View File

@ -1,4 +1,4 @@
@prefixClass: ant-tabs;
@prefixClass: ant-tab;
@easing-in-out: cubic-bezier(0.35, 0, 0.25, 1);
@ -122,9 +122,8 @@
}
div.@{prefixClass}-tab-active {
> a, > a:hover, > a:focus {
color: #3fc7fa;
font-weight: bold;
cursor: pointer;
text-decoration: none;
}
@ -149,7 +148,6 @@
> a {
padding: 8px 25px;
transition: color 0.3s @easing-in-out;
font-weight: 500;
display: block;
color: #666;