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

Merge branch 'master' into antd-3.0

Browse Source
This commit is contained in:
afc163 2017-09-25 17:01:02 +08:00
commit 7cc386df52
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/pagination/style/index.less
View File

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

2
docs/react/getting-started.en-US.md
View File

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

2
docs/react/getting-started.zh-CN.md
View File

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

2
site/theme/template/utils.jsx
View File

@ -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) => {