mirror of
https://github.com/ant-design/ant-design.git
synced 2025-06-18 08:00:53 +08:00
Fix Button[shape="circle"] loading style, close #4875
This commit is contained in:
parent
94ec19570e
commit
5327a49161
@ -351,6 +351,19 @@ exports[`test renders ./components/button/demo/loading.md correctly 1`] = `
|
|||||||
Click me!
|
Click me!
|
||||||
</span>
|
</span>
|
||||||
</button>
|
</button>
|
||||||
|
<br />
|
||||||
|
<button
|
||||||
|
class="ant-btn ant-btn-circle ant-btn-loading"
|
||||||
|
type="button">
|
||||||
|
<i
|
||||||
|
class="anticon anticon-spin anticon-loading" />
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
class="ant-btn ant-btn-primary ant-btn-circle ant-btn-loading"
|
||||||
|
type="button">
|
||||||
|
<i
|
||||||
|
class="anticon anticon-spin anticon-loading" />
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
`;
|
`;
|
||||||
|
|
||||||
|
@ -45,6 +45,9 @@ const App = React.createClass({
|
|||||||
<Button type="primary" icon="poweroff" loading={this.state.iconLoading} onClick={this.enterIconLoading}>
|
<Button type="primary" icon="poweroff" loading={this.state.iconLoading} onClick={this.enterIconLoading}>
|
||||||
Click me!
|
Click me!
|
||||||
</Button>
|
</Button>
|
||||||
|
<br />
|
||||||
|
<Button shape="circle" loading />
|
||||||
|
<Button type="primary" shape="circle" loading />
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
|
@ -78,7 +78,11 @@
|
|||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
&&-loading {
|
&&-loading:before {
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
|
||||||
|
&&-loading:not(&-circle):not(&-circle-outline) {
|
||||||
padding-left: 29px;
|
padding-left: 29px;
|
||||||
pointer-events: none;
|
pointer-events: none;
|
||||||
position: relative;
|
position: relative;
|
||||||
@ -86,12 +90,9 @@
|
|||||||
margin-left: -14px;
|
margin-left: -14px;
|
||||||
transition: all .3s @ease-in-out;
|
transition: all .3s @ease-in-out;
|
||||||
}
|
}
|
||||||
&:before {
|
|
||||||
display: block;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
&-sm&-loading {
|
&-sm&-loading:not(&-circle):not(&-circle-outline) {
|
||||||
padding-left: 24px;
|
padding-left: 24px;
|
||||||
.@{iconfont-css-prefix} {
|
.@{iconfont-css-prefix} {
|
||||||
margin-left: -17px;
|
margin-left: -17px;
|
||||||
|
Loading…
Reference in New Issue
Block a user