mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2024-11-28 13:09:40 +08:00
Code Issues Actions 50 Packages Projects Releases Wiki Activity

Merge branch 'master' into develop-0.10.0

Browse Source
This commit is contained in:
afc163 2015-10-14 16:44:52 +08:00
commit 164c01b5ba
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
components/common/openAnimation.js
View File

@ -1,4 +1,7 @@
import velocity from 'velocity-animate';
let velocity;
if (typeof document !== 'undefined' && typeof window !== 'undefined') {
velocity = require('velocity-animate');
}
function animate(node, show, transitionName, done) {
let ok;
@ -37,4 +40,4 @@ const animation = {
},
};
export default animation;
module.exports = animation;

2
style/components/popover.less
View File

@ -125,7 +125,7 @@
&-message {
padding: 8px 0 16px;
font-size: 12px;
color: text-color;
color: @text-color;
.anticon {
margin-right: 8px;
color: @error-color;