Merge branch master into develop-1.0.0

components/form/demo/search-input.md

@@ -45,12 +45,12 @@ const SearchInput = React.createClass({
       <InputGroup className={searchCls} style={this.props.style}>
         <Input {...this.props} value={this.state.value} onChange={this.handleInputChange}
           onFocus={this.handleFocusBlur} onBlur={this.handleFocusBlur} onPressEnter={this.handleSearch} />
-          <div className="ant-input-group-wrap">
-            <Button className={btnCls} size={this.props.size} onClick={this.handleSearch}>
-              <Icon type="search" />
-            </Button>
-          </div>
-        </InputGroup>
+        <div className="ant-input-group-wrap">
+          <Button className={btnCls} size={this.props.size} onClick={this.handleSearch}>
+            <Icon type="search" />
+          </Button>
+        </div>
+      </InputGroup>
     );
   }
 });

components/upload/demo/basic.md

@@ -11,6 +11,9 @@ import { Upload, message, Button, Icon } from 'antd';
 const props = {
   name: 'file',
   action: '/upload.do',
+  headers: {
+    authorization: 'authorization-text',
+  },
   onChange(info) {
     if (info.file.status !== 'uploading') {
       console.log(info.file, info.fileList);

style/components/pagination.less

@@ -1,7 +1,6 @@
 @pagination-prefix-cls: ant-pagination;
 
 .@{pagination-prefix-cls} {
-  user-select: none;
   font-size: @font-size-base;
 
   &:after {
@@ -23,6 +22,7 @@
   &-item {
     cursor: pointer;
     border-radius: @border-radius-base;
+    user-select: none;
     min-width: 28px;
     height: 28px;
     line-height: 28px;