Skip to content

Commit 63bd2ea

Browse files
committed
Merge branch 'master' of github.com:daneden/animate.css
2 parents 60ea734 + f69eca9 commit 63bd2ea

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+666
-24
lines changed

source/bounce.css

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@
1616
60% {-ms-transform: translateY(-15px);}
1717
}
1818

19+
@-o-keyframes bounce {
20+
0%, 20%, 50%, 80%, 100% {-o-transform: translateY(0);}
21+
40% {-o-transform: translateY(-30px);}
22+
60% {-o-transform: translateY(-15px);}
23+
}
1924
@keyframes bounce {
2025
0%, 20%, 50%, 80%, 100% {transform: translateY(0);}
2126
40% {transform: translateY(-30px);}
@@ -26,5 +31,6 @@
2631
-webkit-animation-name: bounce;
2732
-moz-animation-name: bounce;
2833
-ms-animation-name: bounce;
34+
-o-animation-name: bounce;
2935
animation-name: bounce;
3036
}

source/bounceIn.css

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,26 @@
5858
}
5959
}
6060

61+
@-o-keyframes bounceIn {
62+
0% {
63+
opacity: 0;
64+
-o-transform: scale(.3);
65+
}
66+
67+
50% {
68+
opacity: 1;
69+
-o-transform: scale(1.05);
70+
}
71+
72+
70% {
73+
-o-transform: scale(.9);
74+
}
75+
76+
100% {
77+
-o-transform: scale(1);
78+
}
79+
}
80+
6181
@keyframes bounceIn {
6282
0% {
6383
opacity: 0;
@@ -82,5 +102,6 @@
82102
-webkit-animation-name: bounceIn;
83103
-moz-animation-name: bounceIn;
84104
-ms-animation-name: bounceIn;
105+
-o-animation-name: bounceIn;
85106
animation-name: bounceIn;
86107
}

source/bounceInDown.css

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,26 @@
5858
}
5959
}
6060

61+
@-o-keyframes bounceInDown {
62+
0% {
63+
opacity: 0;
64+
-o-transform: translateY(-2000px);
65+
}
66+
67+
60% {
68+
opacity: 1;
69+
-o-transform: translateY(30px);
70+
}
71+
72+
80% {
73+
-o-transform: translateY(-10px);
74+
}
75+
76+
100% {
77+
-o-transform: translateY(0);
78+
}
79+
}
80+
6181
@keyframes bounceInDown {
6282
0% {
6383
opacity: 0;
@@ -82,5 +102,6 @@
82102
-webkit-animation-name: bounceInDown;
83103
-moz-animation-name: bounceInDown;
84104
-ms-animation-name: bounceInDown;
105+
-o-animation-name: bounceInDown;
85106
animation-name: bounceInDown;
86107
}

source/bounceInLeft.css

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,26 @@
5858
}
5959
}
6060

61+
@-o-keyframes bounceInLeft {
62+
0% {
63+
opacity: 0;
64+
-o-transform: translateX(-2000px);
65+
}
66+
67+
60% {
68+
opacity: 1;
69+
-o-transform: translateX(30px);
70+
}
71+
72+
80% {
73+
-o-transform: translateX(-10px);
74+
}
75+
76+
100% {
77+
-o-transform: translateX(0);
78+
}
79+
}
80+
6181
@keyframes bounceInLeft {
6282
0% {
6383
opacity: 0;
@@ -82,5 +102,6 @@
82102
-webkit-animation-name: bounceInLeft;
83103
-moz-animation-name: bounceInLeft;
84104
-ms-animation-name: bounceInLeft;
105+
-o-animation-name: bounceInLeft;
85106
animation-name: bounceInLeft;
86107
}

source/bounceInRight.css

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,26 @@
5858
}
5959
}
6060

61+
@-o-keyframes bounceInRight {
62+
0% {
63+
opacity: 0;
64+
-o-transform: translateX(2000px);
65+
}
66+
67+
60% {
68+
opacity: 1;
69+
-o-transform: translateX(-30px);
70+
}
71+
72+
80% {
73+
-o-transform: translateX(10px);
74+
}
75+
76+
100% {
77+
-o-transform: translateX(0);
78+
}
79+
}
80+
6181
@keyframes bounceInRight {
6282
0% {
6383
opacity: 0;
@@ -82,5 +102,6 @@
82102
-webkit-animation-name: bounceInRight;
83103
-moz-animation-name: bounceInRight;
84104
-ms-animation-name: bounceInRight;
105+
-o-animation-name: bounceInRight;
85106
animation-name: bounceInRight;
86107
}

source/bounceInUp.css

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,27 @@
5555
-ms-transform: translateY(0);
5656
}
5757
}
58+
59+
@-o-keyframes bounceInUp {
60+
0% {
61+
opacity: 0;
62+
-o-transform: translateY(2000px);
63+
}
64+
65+
60% {
66+
opacity: 1;
67+
-o-transform: translateY(-30px);
68+
}
69+
70+
80% {
71+
-o-transform: translateY(10px);
72+
}
73+
74+
100% {
75+
-o-transform: translateY(0);
76+
}
77+
}
78+
5879
@keyframes bounceInUp {
5980
0% {
6081
opacity: 0;
@@ -79,5 +100,6 @@
79100
-webkit-animation-name: bounceInUp;
80101
-moz-animation-name: bounceInUp;
81102
-ms-animation-name: bounceInUp;
103+
-o-animation-name: bounceInUp;
82104
animation-name: bounceInUp;
83105
}

source/bounceOut.css

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,26 @@
5858
}
5959
}
6060

61+
@-o-keyframes bounceOut {
62+
0% {
63+
-o-transform: scale(1);
64+
}
65+
66+
25% {
67+
-o-transform: scale(.95);
68+
}
69+
70+
50% {
71+
opacity: 1;
72+
-o-transform: scale(1.1);
73+
}
74+
75+
100% {
76+
opacity: 0;
77+
-o-transform: scale(.3);
78+
}
79+
}
80+
6181
@keyframes bounceOut {
6282
0% {
6383
transform: scale(1);
@@ -82,5 +102,6 @@
82102
-webkit-animation-name: bounceOut;
83103
-moz-animation-name: bounceOut;
84104
-ms-animation-name: bounceOut;
105+
-o-animation-name: bounceOut;
85106
animation-name: bounceOut;
86107
}

source/bounceOutLeft.css

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,22 @@
4646
}
4747
}
4848

49+
@-o-keyframes bounceOutLeft {
50+
0% {
51+
-o-transform: translateX(0);
52+
}
53+
54+
20% {
55+
opacity: 1;
56+
-o-transform: translateX(20px);
57+
}
58+
59+
100% {
60+
opacity: 0;
61+
-o-transform: translateX(-2000px);
62+
}
63+
}
64+
4965
@keyframes bounceOutLeft {
5066
0% {
5167
transform: translateX(0);
@@ -66,5 +82,6 @@
6682
-webkit-animation-name: bounceOutLeft;
6783
-moz-animation-name: bounceOutLeft;
6884
-ms-animation-name: bounceOutLeft;
85+
-o-animation-name: bounceOutLeft;
6986
animation-name: bounceOutLeft;
7087
}

source/bounceOutRight.css

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,22 @@
4646
}
4747
}
4848

49+
@-o-keyframes bounceOutRight {
50+
0% {
51+
-o-transform: translateX(0);
52+
}
53+
54+
20% {
55+
opacity: 1;
56+
-o-transform: translateX(-20px);
57+
}
58+
59+
100% {
60+
opacity: 0;
61+
-o-transform: translateX(2000px);
62+
}
63+
}
64+
4965
@keyframes bounceOutRight {
5066
0% {
5167
transform: translateX(0);
@@ -66,5 +82,6 @@
6682
-webkit-animation-name: bounceOutRight;
6783
-moz-animation-name: bounceOutRight;
6884
-ms-animation-name: bounceOutRight;
85+
-o-animation-name: bounceOutRight;
6986
animation-name: bounceOutRight;
7087
}

source/bounceOutUp.css

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,22 @@
4646
}
4747
}
4848

49+
@-o-keyframes bounceOutUp {
50+
0% {
51+
-o-transform: translateY(0);
52+
}
53+
54+
20% {
55+
opacity: 1;
56+
-o-transform: translateY(20px);
57+
}
58+
59+
100% {
60+
opacity: 0;
61+
-o-transform: translateY(-2000px);
62+
}
63+
}
64+
4965
@keyframes bounceOutUp {
5066
0% {
5167
transform: translateY(0);
@@ -66,5 +82,6 @@
6682
-webkit-animation-name: bounceOutUp;
6783
-moz-animation-name: bounceOutUp;
6884
-ms-animation-name: bounceOutUp;
85+
-o-animation-name: bounceOutUp;
6986
animation-name: bounceOutUp;
7087
}

0 commit comments

Comments
 (0)