Merge branch 'master' into develop-0.11.0

This commit is contained in:
afc163 2015-12-07 11:20:46 +08:00
commit 0690e7137d
2 changed files with 2 additions and 1 deletions

View File

@ -31,7 +31,7 @@ const App = React.createClass({
<Menu.Item key="mail">
<Icon type="mail" />导航一
</Menu.Item>
<Menu.Item key="app">
<Menu.Item key="app" disabled>
<Icon type="appstore" />导航二
</Menu.Item>
<SubMenu title={<span><Icon type="setting" />导航 - 子菜单</span>}>

View File

@ -100,6 +100,7 @@
&.@{menu-prefix-cls}-item-disabled,
&.@{menu-prefix-cls}-submenu-disabled {
color: #999 !important;
cursor: not-allowed;
}
}
& > &-item-divider {