Skip to content

Commit 0589ff5

Browse files
danedendaneden
committed
Merge branch 'master' of github.com:daneden/animate.css
Conflicts: animate.min.css
2 parents 9692cb9 + e06d92f commit 0589ff5

File tree

5 files changed

+37
-52
lines changed

5 files changed

+37
-52
lines changed

‎animate.css‎

Lines changed: 26 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,9 @@
22

33
/*!
44
Animate.css - http://daneden.me/animate
5-
Licensed under the MIT license
5+
Licensed under the MIT license - http://opensource.org/licenses/MIT
66
77
Copyright (c) 2013 Daniel Eden
8-
9-
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
10-
11-
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
12-
13-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
148
*/
159

1610
.animated {
@@ -1676,78 +1670,78 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
16761670

16771671
@-webkit-keyframes flip {
16781672
0% {
1679-
-webkit-transform: perspective(400px) translateZ(0) rotateY(0) scale(1);
1680-
transform: perspective(400px) translateZ(0) rotateY(0) scale(1);
1673+
-webkit-transform: perspective(400px) translateZ(0) rotateY(-360deg) scale(1);
1674+
transform: perspective(400px) translateZ(0) rotateY(-360deg) scale(1);
16811675
-webkit-animation-timing-function: ease-out;
16821676
animation-timing-function: ease-out;
16831677
}
16841678

16851679
40% {
1686-
-webkit-transform: perspective(400px) translateZ(150px) rotateY(170deg) scale(1);
1687-
transform: perspective(400px) translateZ(150px) rotateY(170deg) scale(1);
1680+
-webkit-transform: perspective(400px) translateZ(150px) rotateY(-190deg) scale(1);
1681+
transform: perspective(400px) translateZ(150px) rotateY(-190deg) scale(1);
16881682
-webkit-animation-timing-function: ease-out;
16891683
animation-timing-function: ease-out;
16901684
}
16911685

16921686
50% {
1693-
-webkit-transform: perspective(400px) translateZ(150px) rotateY(190deg) scale(1);
1694-
transform: perspective(400px) translateZ(150px) rotateY(190deg) scale(1);
1687+
-webkit-transform: perspective(400px) translateZ(150px) rotateY(-170deg) scale(1);
1688+
transform: perspective(400px) translateZ(150px) rotateY(-170deg) scale(1);
16951689
-webkit-animation-timing-function: ease-in;
16961690
animation-timing-function: ease-in;
16971691
}
16981692

16991693
80% {
1700-
-webkit-transform: perspective(400px) translateZ(0) rotateY(360deg) scale(.95);
1701-
transform: perspective(400px) translateZ(0) rotateY(360deg) scale(.95);
1694+
-webkit-transform: perspective(400px) translateZ(0) rotateY(0deg) scale(.95);
1695+
transform: perspective(400px) translateZ(0) rotateY(0deg) scale(.95);
17021696
-webkit-animation-timing-function: ease-in;
17031697
animation-timing-function: ease-in;
17041698
}
17051699

17061700
100% {
1707-
-webkit-transform: perspective(400px) translateZ(0) rotateY(360deg) scale(1);
1708-
transform: perspective(400px) translateZ(0) rotateY(360deg) scale(1);
1701+
-webkit-transform: perspective(400px) translateZ(0) rotateY(0deg) scale(1);
1702+
transform: perspective(400px) translateZ(0) rotateY(0deg) scale(1);
17091703
-webkit-animation-timing-function: ease-in;
17101704
animation-timing-function: ease-in;
17111705
}
17121706
}
17131707

17141708
@keyframes flip {
17151709
0% {
1716-
-webkit-transform: perspective(400px) translateZ(0) rotateY(0) scale(1);
1717-
-ms-transform: perspective(400px) translateZ(0) rotateY(0) scale(1);
1718-
transform: perspective(400px) translateZ(0) rotateY(0) scale(1);
1710+
-webkit-transform: perspective(400px) translateZ(0) rotateY(-360deg) scale(1);
1711+
-ms-transform: perspective(400px) translateZ(0) rotateY(-360deg) scale(1);
1712+
transform: perspective(400px) translateZ(0) rotateY(-360deg) scale(1);
17191713
-webkit-animation-timing-function: ease-out;
17201714
animation-timing-function: ease-out;
17211715
}
17221716

17231717
40% {
1724-
-webkit-transform: perspective(400px) translateZ(150px) rotateY(170deg) scale(1);
1725-
-ms-transform: perspective(400px) translateZ(150px) rotateY(170deg) scale(1);
1726-
transform: perspective(400px) translateZ(150px) rotateY(170deg) scale(1);
1718+
-webkit-transform: perspective(400px) translateZ(150px) rotateY(-190deg) scale(1);
1719+
-ms-transform: perspective(400px) translateZ(150px) rotateY(-190deg) scale(1);
1720+
transform: perspective(400px) translateZ(150px) rotateY(-190deg) scale(1);
17271721
-webkit-animation-timing-function: ease-out;
17281722
animation-timing-function: ease-out;
17291723
}
17301724

17311725
50% {
1732-
-webkit-transform: perspective(400px) translateZ(150px) rotateY(190deg) scale(1);
1733-
-ms-transform: perspective(400px) translateZ(150px) rotateY(190deg) scale(1);
1734-
transform: perspective(400px) translateZ(150px) rotateY(190deg) scale(1);
1726+
-webkit-transform: perspective(400px) translateZ(150px) rotateY(-170deg) scale(1);
1727+
-ms-transform: perspective(400px) translateZ(150px) rotateY(-170deg) scale(1);
1728+
transform: perspective(400px) translateZ(150px) rotateY(-170deg) scale(1);
17351729
-webkit-animation-timing-function: ease-in;
17361730
animation-timing-function: ease-in;
17371731
}
17381732

17391733
80% {
1740-
-webkit-transform: perspective(400px) translateZ(0) rotateY(360deg) scale(.95);
1741-
-ms-transform: perspective(400px) translateZ(0) rotateY(360deg) scale(.95);
1742-
transform: perspective(400px) translateZ(0) rotateY(360deg) scale(.95);
1734+
-webkit-transform: perspective(400px) translateZ(0) rotateY(0deg) scale(.95);
1735+
-ms-transform: perspective(400px) translateZ(0) rotateY(0deg) scale(.95);
1736+
transform: perspective(400px) translateZ(0) rotateY(0deg) scale(.95);
17431737
-webkit-animation-timing-function: ease-in;
17441738
animation-timing-function: ease-in;
17451739
}
17461740

17471741
100% {
1748-
-webkit-transform: perspective(400px) translateZ(0) rotateY(360deg) scale(1);
1749-
-ms-transform: perspective(400px) translateZ(0) rotateY(360deg) scale(1);
1750-
transform: perspective(400px) translateZ(0) rotateY(360deg) scale(1);
1742+
-webkit-transform: perspective(400px) translateZ(0) rotateY(0deg) scale(1);
1743+
-ms-transform: perspective(400px) translateZ(0) rotateY(0deg) scale(1);
1744+
transform: perspective(400px) translateZ(0) rotateY(0deg) scale(1);
17511745
-webkit-animation-timing-function: ease-in;
17521746
animation-timing-function: ease-in;
17531747
}

‎animate.min.css‎

Lines changed: 2 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,8 @@
88
"grunt-contrib-concat": "~0.3.0",
99
"grunt-contrib-cssmin": "~0.8.0",
1010
"load-grunt-tasks": "~0.2.0"
11+
},
12+
"spm": {
13+
"main": "./animate.css"
1114
}
1215
}

‎source/_base.css‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
@charset "UTF-8";
22
/*!
33
Animate.css - http://daneden.me/animate
4-
Licensed under the MIT license
4+
Licensed under the MIT license - http://opensource.org/licenses/MIT
55
66
Copyright (c) 2013 Daniel Eden
7-
8-
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
9-
10-
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
11-
12-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
137
*/
148

159
.animated {

‎source/flippers/flip.css‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
@keyframes flip {
22
0% {
3-
transform: perspective(400px) translateZ(0) rotateY(0) scale(1);
3+
transform: perspective(400px) translateZ(0) rotateY(-360deg) scale(1);
44
animation-timing-function: ease-out;
55
}
66

77
40% {
8-
transform: perspective(400px) translateZ(150px) rotateY(170deg) scale(1);
8+
transform: perspective(400px) translateZ(150px) rotateY(-190deg) scale(1);
99
animation-timing-function: ease-out;
1010
}
1111

1212
50% {
13-
transform: perspective(400px) translateZ(150px) rotateY(190deg) scale(1);
13+
transform: perspective(400px) translateZ(150px) rotateY(-170deg) scale(1);
1414
animation-timing-function: ease-in;
1515
}
1616

1717
80% {
18-
transform: perspective(400px) translateZ(0) rotateY(360deg) scale(.95);
18+
transform: perspective(400px) translateZ(0) rotateY(0deg) scale(.95);
1919
animation-timing-function: ease-in;
2020
}
2121

2222
100% {
23-
transform: perspective(400px) translateZ(0) rotateY(360deg) scale(1);
23+
transform: perspective(400px) translateZ(0) rotateY(0deg) scale(1);
2424
animation-timing-function: ease-in;
2525
}
2626
}

0 commit comments

Comments
 (0)