mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2024-11-24 11:10:01 +08:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

Revert rc-menu upgrade

Browse Source 
Revert "use default hover trigger for horizontal menu demo"

This reverts commit 159b09342d.

Revert "upgrade menu@7.2.0"

This reverts commit d4c9a1deea.

Revert "feat: prevent horizontal menu items wrapping"

This reverts commit 5c7f9feecb.
This commit is contained in:
Wei Zhu 2018-07-17 21:55:28 +08:00
parent 9c792d52a8
commit e6c4c6667d
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/menu/demo/horizontal.md
View File

@ -44,7 +44,7 @@ class App extends React.Component {
<Menu.Item key="app" disabled> <Menu.Item key="app" disabled>
<Icon type="appstore" />Navigation Two <Icon type="appstore" />Navigation Two
</Menu.Item> </Menu.Item>
<SubMenu title={<span className="submenu-title-wrapper"><Icon type="setting" />Navigation Three - Submenu</span>}> <SubMenu title={<span><Icon type="setting" />Navigation Three - Submenu</span>}>
<MenuItemGroup title="Item 1"> <MenuItemGroup title="Item 1">
<Menu.Item key="setting:1">Option 1</Menu.Item> <Menu.Item key="setting:1">Option 1</Menu.Item>
<Menu.Item key="setting:2">Option 2</Menu.Item> <Menu.Item key="setting:2">Option 2</Menu.Item>

7
components/menu/style/index.less
View File

@ -179,10 +179,6 @@
position: absolute; position: absolute;
border-radius: @border-radius-base; border-radius: @border-radius-base;
z-index: @zindex-dropdown; z-index: @zindex-dropdown;
.submenu-title-wrapper {
padding-right: 20px;
}
} }
> .@{menu-prefix-cls} { > .@{menu-prefix-cls} {
@ -266,13 +262,12 @@
border-bottom: @border-width-base @border-style-base @border-color-split; border-bottom: @border-width-base @border-style-base @border-color-split;
box-shadow: none; box-shadow: none;
line-height: 46px; line-height: 46px;
white-space: nowrap;
> .@{menu-prefix-cls}-item, > .@{menu-prefix-cls}-item,
> .@{menu-prefix-cls}-submenu { > .@{menu-prefix-cls}-submenu {
position: relative; position: relative;
top: 1px; top: 1px;
display: inline-block; float: left;
border-bottom: 2px solid transparent; border-bottom: 2px solid transparent;
&:hover, &:hover,

2
package.json
View File

@ -64,7 +64,7 @@
"rc-editor-mention": "^1.0.2", "rc-editor-mention": "^1.0.2",
"rc-form": "^2.1.0", "rc-form": "^2.1.0",
"rc-input-number": "~4.0.0", "rc-input-number": "~4.0.0",
"rc-menu": "~7.2.2", "rc-menu": "~7.0.2",
"rc-notification": "~3.1.1", "rc-notification": "~3.1.1",
"rc-pagination": "~1.16.1", "rc-pagination": "~1.16.1",
"rc-progress": "~2.2.2", "rc-progress": "~2.2.2",