Merge branch 'master' of github.com:ant-design/ant-design

This commit is contained in:
afc163 2018-01-10 13:42:43 +08:00
commit 0a82003703
4 changed files with 7 additions and 6 deletions

View File

@ -22,7 +22,7 @@ export interface TimePickerProps {
className?: string; className?: string;
size?: 'large' | 'default' | 'small'; size?: 'large' | 'default' | 'small';
value?: moment.Moment; value?: moment.Moment;
defaultValue?: moment.Moment; defaultValue?: moment.Moment | moment.Moment[];
open?: boolean; open?: boolean;
format?: string; format?: string;
onChange?: (time: moment.Moment, timeString: string) => void; onChange?: (time: moment.Moment, timeString: string) => void;

View File

@ -137,7 +137,7 @@
"rc-drawer-menu": "^0.5.3", "rc-drawer-menu": "^0.5.3",
"rc-queue-anim": "^1.4.1", "rc-queue-anim": "^1.4.1",
"rc-scroll-anim": "^2.2.1", "rc-scroll-anim": "^2.2.1",
"rc-tween-one": "^1.7.1", "rc-tween-one": "^1.7.2",
"react": "^16.0.0", "react": "^16.0.0",
"react-color": "^2.11.7", "react-color": "^2.11.7",
"react-copy-to-clipboard": "^5.0.0", "react-copy-to-clipboard": "^5.0.0",

View File

@ -65,6 +65,9 @@
max-width: 560px; max-width: 560px;
min-height: 336px; min-height: 336px;
color: #0d1a26; color: #0d1a26;
> * {
will-change: transform;
}
h1 { h1 {
font-size: 68px; font-size: 68px;
font-weight: 600; font-weight: 600;
@ -86,13 +89,11 @@
right: 0; right: 0;
bottom: 26px; bottom: 26px;
} }
.banner-btns { .banner-btns {
display: flex; display: flex;
align-items: center; align-items: center;
margin-top: 24px; margin-top: 24px;
} }
.banner-btn { .banner-btn {
padding: 0 24px; padding: 0 24px;
border-radius: 100px; border-radius: 100px;
@ -271,7 +272,6 @@ svg {
justify-content: flex-end; justify-content: flex-end;
} }
} }
&:hover { &:hover {
h4 { h4 {
color: @home-bg-color; color: @home-bg-color;

View File

@ -6,6 +6,7 @@ TweenOne.plugins.push(PathPlugin);
const duration = 7000; const duration = 7000;
const ease = 'easeInOutSine'; const ease = 'easeInOutSine';
const p = 'M123.5,89.5 C148,82.5 239.5,48.5 230,17.5 C220.5,-13.5 127,6 99.5,13.5 C72,21 -9.5,56.5 1.5,84.5 C12.5,112.5 99,96.5 123.5,89.5 Z'; const p = 'M123.5,89.5 C148,82.5 239.5,48.5 230,17.5 C220.5,-13.5 127,6 99.5,13.5 C72,21 -9.5,56.5 1.5,84.5 C12.5,112.5 99,96.5 123.5,89.5 Z';
const easePath = 'M0,100 C7.33333333,89 14.3333333,81.6666667 21,78 C25.3601456,75.6019199 29.8706084,72.9026327 33,70 C37.0478723,66.2454406 39.3980801,62.0758689 42.5,57 C48,46.5 61.5,32.5 70,28 C77.5,23.5 81.5,20 86.5,16 C89.8333333,13.3333333 94.3333333,8 100,0';
const loop = { const loop = {
yoyo: true, yoyo: true,
repeat: -1, repeat: -1,
@ -17,7 +18,7 @@ const animate = {
path: { x: p, y: p }, path: { x: p, y: p },
duration: 5000, duration: 5000,
repeat: -1, repeat: -1,
ease: 'linear', ease: TweenOne.easing.path(easePath, { lengthPixel: 400 }),
}, },
rotate: { rotate: {
...loop, ...loop,