Skip to content

Commit 8897f6e

Browse files
committed
Merge pull request animate-css#163 from sarbbottam/master
Use load-grunt-tasks, cleaned up devDependencies & added .editorconfig
2 parents 0dbda0e + 662a8eb commit 8897f6e

File tree

5 files changed

+95
-10
lines changed

5 files changed

+95
-10
lines changed

.editorconfig

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# editorconfig.org
2+
root = true
3+
4+
[*]
5+
indent_style = space
6+
indent_size = 2
7+
tab_width = 2
8+
end_of_line = lf
9+
charset = utf-8
10+
trim_trailing_whitespace = true
11+
insert_final_newline = true

Gruntfile.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
module.exports = function(grunt) {
2+
3+
require('load-grunt-tasks')(grunt);
4+
25
pkg: grunt.file.readJSON('package.json'),
36
grunt.initConfig({
47

@@ -49,10 +52,6 @@ module.exports = function(grunt) {
4952
});
5053

5154
// Register our tasks
52-
grunt.loadNpmTasks('grunt-contrib-watch');
53-
grunt.loadNpmTasks('grunt-contrib-concat');
54-
grunt.loadNpmTasks('grunt-autoprefixer');
55-
grunt.loadNpmTasks('grunt-contrib-cssmin');
5655
grunt.registerTask('default', ['concat-anim', 'autoprefixer', 'cssmin', 'watch']);
5756

5857
grunt.registerTask('concat-anim', 'Concatenates activated animations', function () {
@@ -78,4 +77,4 @@ module.exports = function(grunt) {
7877
grunt.config('concat', { 'animate.css': target })
7978
grunt.task.run('concat')
8079
});
81-
};
80+
};

animate.css

Lines changed: 66 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
@charset "UTF-8";
22

3-
43
/*!
54
Animate.css - http://daneden.me/animate
65
Licensed under the MIT license
@@ -137,6 +136,70 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
137136
animation-name: pulse;
138137
}
139138

139+
@-webkit-keyframes rubberBand {
140+
0% {
141+
-webkit-transform: scale(1);
142+
transform: scale(1);
143+
}
144+
145+
30% {
146+
-webkit-transform: scaleX(1.25) scaleY(0.75);
147+
transform: scaleX(1.25) scaleY(0.75);
148+
}
149+
150+
40% {
151+
-webkit-transform: scaleX(0.75) scaleY(1.25);
152+
transform: scaleX(0.75) scaleY(1.25);
153+
}
154+
155+
60% {
156+
-webkit-transform: scaleX(1.15) scaleY(0.85);
157+
transform: scaleX(1.15) scaleY(0.85);
158+
}
159+
160+
100% {
161+
-webkit-transform: scale(1);
162+
transform: scale(1);
163+
}
164+
}
165+
166+
@keyframes rubberBand {
167+
0% {
168+
-webkit-transform: scale(1);
169+
-ms-transform: scale(1);
170+
transform: scale(1);
171+
}
172+
173+
30% {
174+
-webkit-transform: scaleX(1.25) scaleY(0.75);
175+
-ms-transform: scaleX(1.25) scaleY(0.75);
176+
transform: scaleX(1.25) scaleY(0.75);
177+
}
178+
179+
40% {
180+
-webkit-transform: scaleX(0.75) scaleY(1.25);
181+
-ms-transform: scaleX(0.75) scaleY(1.25);
182+
transform: scaleX(0.75) scaleY(1.25);
183+
}
184+
185+
60% {
186+
-webkit-transform: scaleX(1.15) scaleY(0.85);
187+
-ms-transform: scaleX(1.15) scaleY(0.85);
188+
transform: scaleX(1.15) scaleY(0.85);
189+
}
190+
191+
100% {
192+
-webkit-transform: scale(1);
193+
-ms-transform: scale(1);
194+
transform: scale(1);
195+
}
196+
}
197+
198+
.rubberBand {
199+
-webkit-animation-name: rubberBand;
200+
animation-name: rubberBand;
201+
}
202+
140203
@-webkit-keyframes shake {
141204
0%, 100% {
142205
-webkit-transform: translateX(0);
@@ -417,6 +480,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
417480
}
418481

419482
100% {
483+
opacity: 1;
420484
-webkit-transform: scale(1);
421485
transform: scale(1);
422486
}
@@ -444,6 +508,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
444508
}
445509

446510
100% {
511+
opacity: 1;
447512
-webkit-transform: scale(1);
448513
-ms-transform: scale(1);
449514
transform: scale(1);

animate.min.css

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

package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@
44
"devDependencies": {
55
"grunt": "~0.4.1",
66
"grunt-autoprefixer": "~0.4.0",
7-
"grunt-contrib-sass": "~0.5.0",
87
"grunt-contrib-watch": "~0.5.3",
9-
"grunt-csso": "~0.5.0",
108
"grunt-contrib-concat": "~0.3.0",
11-
"grunt-contrib-cssmin": "~0.8.0"
9+
"grunt-contrib-cssmin": "~0.8.0",
10+
"load-grunt-tasks": "~0.2.0"
1211
}
1312
}

0 commit comments

Comments
 (0)