Merge branch 'master' into usebanner

Conflicts:
	animate.min.css
This commit is contained in:
1UP 2015-12-06 01:52:01 +09:00
commit a6bb17272c
6 changed files with 109 additions and 1 deletions

View File

@ -21,6 +21,7 @@
* `pulse`
* `rubberBand`
* `shake`
* `headShake`
* `swing`
* `tada`
* `wobble`
@ -157,6 +158,7 @@ Next, run `grunt watch` to watch for changes and compile your custom builds. For
"flash": false,
"pulse": false,
"shake": true,
"headShake": true,
"swing": true,
"tada": true,
"wobble": true,

View File

@ -6,6 +6,7 @@
"pulse": true,
"rubberBand": true,
"shake": true,
"headShake": true,
"swing": true,
"tada": true,
"wobble": true,

71
animate.css vendored
View File

@ -280,6 +280,77 @@
animation-name: shake;
}
@-webkit-keyframes headShake {
0 {
-webkit-transform: translateX(0);
transform: translateX(0);
}
6.5% {
-webkit-transform: translateX(-6px) rotateY(-9deg);
transform: translateX(-6px) rotateY(-9deg);
}
18.5% {
-webkit-transform: translateX(5px) rotateY(7deg);
transform: translateX(5px) rotateY(7deg);
}
31.5% {
-webkit-transform: translateX(-3px) rotateY(-5deg);
transform: translateX(-3px) rotateY(-5deg);
}
43.5% {
-webkit-transform: translateX(2px) rotateY(3deg);
transform: translateX(2px) rotateY(3deg);
}
50% {
-webkit-transform: translateX(0);
transform: translateX(0);
}
}
@keyframes headShake {
0 {
-webkit-transform: translateX(0);
transform: translateX(0);
}
6.5% {
-webkit-transform: translateX(-6px) rotateY(-9deg);
transform: translateX(-6px) rotateY(-9deg);
}
18.5% {
-webkit-transform: translateX(5px) rotateY(7deg);
transform: translateX(5px) rotateY(7deg);
}
31.5% {
-webkit-transform: translateX(-3px) rotateY(-5deg);
transform: translateX(-3px) rotateY(-5deg);
}
43.5% {
-webkit-transform: translateX(2px) rotateY(3deg);
transform: translateX(2px) rotateY(3deg);
}
50% {
-webkit-transform: translateX(0);
transform: translateX(0);
}
}
.headShake {
-webkit-animation-timing-function: ease-in-out;
animation-timing-function: ease-in-out;
-webkit-animation-name: headShake;
animation-name: headShake;
}
@-webkit-keyframes swing {
20% {
-webkit-transform: rotate3d(0, 0, 1, 15deg);

2
animate.min.css vendored

File diff suppressed because one or more lines are too long

View File

@ -1,6 +1,7 @@
{
"name": "animate.css",
"version": "3.4.0",
"main": "animate.css",
"repository": {
"type": "git",
"url": "https://github.com/daneden/animate.css.git"

View File

@ -0,0 +1,33 @@
@keyframes headShake {
0 {
transform: translateX(0)
}
6.5% {
transform: translateX(-6px) rotateY(-9deg)
}
18.5% {
transform: translateX(5px) rotateY(7deg)
}
31.5% {
transform: translateX(-3px) rotateY(-5deg)
}
43.5% {
transform: translateX(2px) rotateY(3deg)
}
50% {
transform: translateX(0)
}
}
.headShake {
animation-timing-function: ease-in-out;
animation-name: headShake;
}