Skip to content

Commit a6bb172

Browse files
committed
Merge branch 'master' into usebanner
Conflicts: animate.min.css
2 parents fe3cf0a + 11188f5 commit a6bb172

6 files changed

Lines changed: 109 additions & 1 deletion

File tree

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
* `pulse`
2222
* `rubberBand`
2323
* `shake`
24+
* `headShake`
2425
* `swing`
2526
* `tada`
2627
* `wobble`
@@ -157,6 +158,7 @@ Next, run `grunt watch` to watch for changes and compile your custom builds. For
157158
"flash": false,
158159
"pulse": false,
159160
"shake": true,
161+
"headShake": true,
160162
"swing": true,
161163
"tada": true,
162164
"wobble": true,

animate-config.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"pulse": true,
77
"rubberBand": true,
88
"shake": true,
9+
"headShake": true,
910
"swing": true,
1011
"tada": true,
1112
"wobble": true,

animate.css

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,77 @@
280280
animation-name: shake;
281281
}
282282

283+
@-webkit-keyframes headShake {
284+
0 {
285+
-webkit-transform: translateX(0);
286+
transform: translateX(0);
287+
}
288+
289+
6.5% {
290+
-webkit-transform: translateX(-6px) rotateY(-9deg);
291+
transform: translateX(-6px) rotateY(-9deg);
292+
}
293+
294+
18.5% {
295+
-webkit-transform: translateX(5px) rotateY(7deg);
296+
transform: translateX(5px) rotateY(7deg);
297+
}
298+
299+
31.5% {
300+
-webkit-transform: translateX(-3px) rotateY(-5deg);
301+
transform: translateX(-3px) rotateY(-5deg);
302+
}
303+
304+
43.5% {
305+
-webkit-transform: translateX(2px) rotateY(3deg);
306+
transform: translateX(2px) rotateY(3deg);
307+
}
308+
309+
50% {
310+
-webkit-transform: translateX(0);
311+
transform: translateX(0);
312+
}
313+
}
314+
315+
@keyframes headShake {
316+
0 {
317+
-webkit-transform: translateX(0);
318+
transform: translateX(0);
319+
}
320+
321+
6.5% {
322+
-webkit-transform: translateX(-6px) rotateY(-9deg);
323+
transform: translateX(-6px) rotateY(-9deg);
324+
}
325+
326+
18.5% {
327+
-webkit-transform: translateX(5px) rotateY(7deg);
328+
transform: translateX(5px) rotateY(7deg);
329+
}
330+
331+
31.5% {
332+
-webkit-transform: translateX(-3px) rotateY(-5deg);
333+
transform: translateX(-3px) rotateY(-5deg);
334+
}
335+
336+
43.5% {
337+
-webkit-transform: translateX(2px) rotateY(3deg);
338+
transform: translateX(2px) rotateY(3deg);
339+
}
340+
341+
50% {
342+
-webkit-transform: translateX(0);
343+
transform: translateX(0);
344+
}
345+
}
346+
347+
.headShake {
348+
-webkit-animation-timing-function: ease-in-out;
349+
animation-timing-function: ease-in-out;
350+
-webkit-animation-name: headShake;
351+
animation-name: headShake;
352+
}
353+
283354
@-webkit-keyframes swing {
284355
20% {
285356
-webkit-transform: rotate3d(0, 0, 1, 15deg);

animate.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"name": "animate.css",
33
"version": "3.4.0",
4+
"main": "animate.css",
45
"repository": {
56
"type": "git",
67
"url": "https://github.com/daneden/animate.css.git"
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
@keyframes headShake {
2+
3+
4+
0 {
5+
transform: translateX(0)
6+
}
7+
8+
6.5% {
9+
transform: translateX(-6px) rotateY(-9deg)
10+
}
11+
12+
18.5% {
13+
transform: translateX(5px) rotateY(7deg)
14+
}
15+
16+
31.5% {
17+
transform: translateX(-3px) rotateY(-5deg)
18+
}
19+
20+
43.5% {
21+
transform: translateX(2px) rotateY(3deg)
22+
}
23+
24+
50% {
25+
transform: translateX(0)
26+
}
27+
}
28+
29+
30+
.headShake {
31+
animation-timing-function: ease-in-out;
32+
animation-name: headShake;
33+
}

0 commit comments

Comments
 (0)