Merge branch 'master' into antd-3.0

components/auto-complete/index.tsx

@@ -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>
     );
   }
 

components/auto-complete/style/index.less

@@ -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;
-      }
-    }
   }
 }

components/table/style/index.less

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