Merge branch 'antd-3.0' of github.com:ant-design/ant-design into antd-3.0

components/checkbox/style/mixin.less

@@ -153,8 +153,8 @@
     .reset-component;
     cursor: pointer;
     display: inline-block;
-    &:not(:last-child) {
-      margin-right: 8px;
+    & + & {
+      margin-left: 8px;
     }
   }
 

components/pagination/style/index.less

@@ -257,6 +257,7 @@
   &-simple &-simple-pager {
     display: inline-block;
     margin-right: 8px;
+    height: 24px;
 
     input {
       margin-right: 8px;
@@ -266,7 +267,7 @@
       border: @border-width-base @border-style-base @border-color-base;
       outline: none;
       padding: 0 6px;
-      height: 24px;
+      height: 100%;
       text-align: center;
       transition: border-color .3s;
 
@@ -277,8 +278,9 @@
   }
 }
 
-.@{pagination-prefix-cls}:not(.@{pagination-prefix-cls}-simple) {
-  &.mini &-total-text {
+.@{pagination-prefix-cls} {
+  &.mini &-total-text,
+  &.mini &-simple-pager {
     height: 20px;
     line-height: 20px;
   }

components/upload/UploadList.tsx

@@ -26,7 +26,7 @@ export default class UploadList extends React.Component<UploadListProps, any> {
   };
 
   handleClose = (file: UploadFile) => {
-    const onRemove = this.props.onRemove;
+    const { onRemove } = this.props;
     if (onRemove) {
       onRemove(file);
     }

docs/react/getting-started.en-US.md

@@ -94,7 +94,7 @@ ReactDOM.render(<App />, document.getElementById('root'));
 
 ### 4. Development & Debugging
 
-Run your project and visit http://127.0.0.1:8000
+Run your project and visit http://127.0.0.1:8001
 
 ```bash
 $ npm start

docs/react/getting-started.zh-CN.md

@@ -93,7 +93,7 @@ ReactDOM.render(<App />, document.getElementById('root'));
 
 ### 4. 开发调试
 
-一键启动调试，访问 http://127.0.0.1:8000 查看效果。
+一键启动调试，访问 http://127.0.0.1:8001 查看效果。
 
 ```bash
 $ npm start

site/theme/template/utils.jsx

@@ -37,7 +37,7 @@ export function getLocalizedPathname(path, zhCN) {
 
 export function ping(callback) {
   // eslint-disable-next-line
-  const url = 'https://private-a' + 'lipay' + 'objects.com/alip' + 'ay-rmsdeploy-image/rmsportal/RKuAiriJqrUhyqW.png';
+  const url = 'https://private-a' + 'lipay' + 'objects.alip' + 'ay.com/alip' + 'ay-rmsdeploy-image/rmsportal/RKuAiriJqrUhyqW.png';
   const img = new Image();
   let done;
   const finish = (status) => {