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

Merge branch 'ddcat1115-fix-2414' into 1.x-stable

Browse Source
This commit is contained in:
afc163 2016-07-24 14:24:05 +08:00
commit d24bee4250
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -219,6 +219,13 @@
} }
} }
&-vertical &-submenu-selected {
color: @primary-color;
> a {
color: @primary-color;
}
}
&-horizontal { &-horizontal {
border: 0; border: 0;
border-bottom: 1px solid @border-color-split; border-bottom: 1px solid @border-color-split;
@ -347,6 +354,7 @@
&-dark &-item:hover, &-dark &-item:hover,
&-dark &-item-active, &-dark &-item-active,
&-dark &-submenu-active, &-dark &-submenu-active,
&-dark &-submenu-selected,
&-dark &-submenu:hover, &-dark &-submenu:hover,
&-dark &-submenu-title:hover { &-dark &-submenu-title:hover {
background-color: transparent; background-color: transparent;

2
package.json
View File

@ -49,7 +49,7 @@
"rc-dropdown": "~1.4.8", "rc-dropdown": "~1.4.8",
"rc-form": "~0.17.1", "rc-form": "~0.17.1",
"rc-input-number": "~2.5.12", "rc-input-number": "~2.5.12",
"rc-menu": "~4.12.4", "rc-menu": "~4.13.0",
"rc-notification": "~1.3.4", "rc-notification": "~1.3.4",
"rc-pagination": "~1.5.3", "rc-pagination": "~1.5.3",
"rc-progress": "~1.0.4", "rc-progress": "~1.0.4",