Merge branch master into develop-1.0.0

This commit is contained in:
afc163 2016-04-11 14:34:18 +08:00
commit db0c909ccd
3 changed files with 10 additions and 7 deletions

View File

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

View File

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