mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2025-06-07 09:26:06 +08:00
Code Issues Actions 18 Packages Projects Releases Wiki Activity

Merge branch 'master' into antd-3.0

Browse Source
This commit is contained in:
afc163 2017-09-27 20:13:44 +08:00
commit a3c7d6611c
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/auto-complete/index.tsx
View File

@ -52,7 +52,7 @@ export default class AutoComplete extends React.Component<AutoCompleteProps, any
const element = children && React.isValidElement(children) && children.type !== Option ?
React.Children.only(this.props.children) : <Input />;
return (
<InputElement {...element.props}>{element}</InputElement>
<InputElement>{element}</InputElement>
);
}

14
components/auto-complete/style/index.less
View File

@ -35,6 +35,12 @@
.@{input-prefix-cls} {
background: transparent;
border-width: @border-width-base;
line-height: @line-height-base;
&:focus,
&:hover {
.hover;
}
}
&-lg {
@ -54,13 +60,5 @@
.input-sm();
}
}
.@{input-prefix-cls} {
border-width: @border-width-base;
&:focus,
&:hover {
.hover;
}
}
}
}

2
components/table/style/index.less
View File

@ -461,7 +461,7 @@
}
&-item > label + span {
padding: 0;
padding-right: 0;
}
&-sub {