Browse Source

Merge branch 'master' into develop-0.10.0

pull/393/head
afc163 9 years ago
parent
commit
164c01b5ba
  1. 7
      components/common/openAnimation.js
  2. 2
      style/components/popover.less

7
components/common/openAnimation.js

@ -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) { function animate(node, show, transitionName, done) {
let ok; let ok;
@ -37,4 +40,4 @@ const animation = {
}, },
}; };
export default animation; module.exports = animation;

2
style/components/popover.less

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

Loading…
Cancel
Save