From 14b44c880e904b60d5510227dfbb945273f5d262 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=81=8F=E5=8F=B3?= Date: Mon, 25 Sep 2017 14:15:06 +0800 Subject: [PATCH 1/5] Update utils.jsx --- site/theme/template/utils.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/theme/template/utils.jsx b/site/theme/template/utils.jsx index 1a6e278d7d..e3f9ee0fc0 100644 --- a/site/theme/template/utils.jsx +++ b/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) => { From 6c38ca62c675421003a04c20f197b33b96cb3c43 Mon Sep 17 00:00:00 2001 From: Miaow Date: Mon, 25 Sep 2017 16:59:40 +0800 Subject: [PATCH 2/5] update get started doc port (#7729) --- docs/react/getting-started.en-US.md | 2 +- docs/react/getting-started.zh-CN.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/react/getting-started.en-US.md b/docs/react/getting-started.en-US.md index 31b155785b..76b652066b 100644 --- a/docs/react/getting-started.en-US.md +++ b/docs/react/getting-started.en-US.md @@ -94,7 +94,7 @@ ReactDOM.render(, 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 diff --git a/docs/react/getting-started.zh-CN.md b/docs/react/getting-started.zh-CN.md index 76111b11d7..b024ca5ff9 100644 --- a/docs/react/getting-started.zh-CN.md +++ b/docs/react/getting-started.zh-CN.md @@ -93,7 +93,7 @@ ReactDOM.render(, document.getElementById('root')); ### 4. 开发调试 -一键启动调试，访问 http://127.0.0.1:8000 查看效果。 +一键启动调试，访问 http://127.0.0.1:8001 查看效果。 ```bash $ npm start From 3118e2898e1eb5d511ab8aba96de1e6df8ee4d96 Mon Sep 17 00:00:00 2001 From: afc163 Date: Mon, 25 Sep 2017 16:59:18 +0800 Subject: [PATCH 3/5] Fix broken small pagination via #7634's fix --- components/pagination/style/index.less | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/components/pagination/style/index.less b/components/pagination/style/index.less index 0a4f8d3624..5b8e0ddab4 100644 --- a/components/pagination/style/index.less +++ b/components/pagination/style/index.less @@ -250,6 +250,7 @@ &-simple &-simple-pager { display: inline-block; margin-right: 8px; + height: 24px; input { margin-right: 8px; @@ -259,7 +260,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; @@ -270,8 +271,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; } From 10f6907da4c047f909b258075574818c00620f2c Mon Sep 17 00:00:00 2001 From: thegatheringstorm Date: Mon, 25 Sep 2017 18:15:36 +0800 Subject: [PATCH 4/5] Fix: Upload Use object destructuring instead of creating temporary references for onRemove. (#7726) --- components/upload/UploadList.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/upload/UploadList.tsx b/components/upload/UploadList.tsx index 261f719ed3..07e66f74a5 100644 --- a/components/upload/UploadList.tsx +++ b/components/upload/UploadList.tsx @@ -26,7 +26,7 @@ export default class UploadList extends React.Component { }; handleClose = (file: UploadFile) => { - const onRemove = this.props.onRemove; + const { onRemove } = this.props; if (onRemove) { onRemove(file); } From 463a5db9baad36c6605a99b60c69fdab6d6a35bb Mon Sep 17 00:00:00 2001 From: afc163 Date: Mon, 25 Sep 2017 20:02:33 +0800 Subject: [PATCH 5/5] Fix transfer checkbox padding --- components/checkbox/style/mixin.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/checkbox/style/mixin.less b/components/checkbox/style/mixin.less index 90019d74a2..f4425afc72 100644 --- a/components/checkbox/style/mixin.less +++ b/components/checkbox/style/mixin.less @@ -151,8 +151,8 @@ cursor: pointer; font-size: @font-size-base; display: inline-block; - &:not(:last-child) { - margin-right: 8px; + & + & { + margin-left: 8px; } }