Merge pull request #163 from sarbbottam/master

Use load-grunt-tasks, cleaned up devDependencies & added .editorconfig
This commit is contained in:
Daniel Eden 2014-02-23 11:48:07 -08:00
commit 8897f6e799
5 changed files with 95 additions and 10 deletions

11
.editorconfig Normal file
View File

@ -0,0 +1,11 @@
# editorconfig.org
root = true
[*]
indent_style = space
indent_size = 2
tab_width = 2
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

View File

@ -1,4 +1,7 @@
module.exports = function(grunt) {
require('load-grunt-tasks')(grunt);
pkg: grunt.file.readJSON('package.json'),
grunt.initConfig({
@ -49,10 +52,6 @@ module.exports = function(grunt) {
});
// Register our tasks
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-autoprefixer');
grunt.loadNpmTasks('grunt-contrib-cssmin');
grunt.registerTask('default', ['concat-anim', 'autoprefixer', 'cssmin', 'watch']);
grunt.registerTask('concat-anim', 'Concatenates activated animations', function () {
@ -78,4 +77,4 @@ module.exports = function(grunt) {
grunt.config('concat', { 'animate.css': target })
grunt.task.run('concat')
});
};
};

67
animate.css vendored
View File

@ -1,6 +1,5 @@
@charset "UTF-8";
/*!
Animate.css - http://daneden.me/animate
Licensed under the MIT license
@ -137,6 +136,70 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
animation-name: pulse;
}
@-webkit-keyframes rubberBand {
0% {
-webkit-transform: scale(1);
transform: scale(1);
}
30% {
-webkit-transform: scaleX(1.25) scaleY(0.75);
transform: scaleX(1.25) scaleY(0.75);
}
40% {
-webkit-transform: scaleX(0.75) scaleY(1.25);
transform: scaleX(0.75) scaleY(1.25);
}
60% {
-webkit-transform: scaleX(1.15) scaleY(0.85);
transform: scaleX(1.15) scaleY(0.85);
}
100% {
-webkit-transform: scale(1);
transform: scale(1);
}
}
@keyframes rubberBand {
0% {
-webkit-transform: scale(1);
-ms-transform: scale(1);
transform: scale(1);
}
30% {
-webkit-transform: scaleX(1.25) scaleY(0.75);
-ms-transform: scaleX(1.25) scaleY(0.75);
transform: scaleX(1.25) scaleY(0.75);
}
40% {
-webkit-transform: scaleX(0.75) scaleY(1.25);
-ms-transform: scaleX(0.75) scaleY(1.25);
transform: scaleX(0.75) scaleY(1.25);
}
60% {
-webkit-transform: scaleX(1.15) scaleY(0.85);
-ms-transform: scaleX(1.15) scaleY(0.85);
transform: scaleX(1.15) scaleY(0.85);
}
100% {
-webkit-transform: scale(1);
-ms-transform: scale(1);
transform: scale(1);
}
}
.rubberBand {
-webkit-animation-name: rubberBand;
animation-name: rubberBand;
}
@-webkit-keyframes shake {
0%, 100% {
-webkit-transform: translateX(0);
@ -417,6 +480,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
}
100% {
opacity: 1;
-webkit-transform: scale(1);
transform: scale(1);
}
@ -444,6 +508,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
}
100% {
opacity: 1;
-webkit-transform: scale(1);
-ms-transform: scale(1);
transform: scale(1);

13
animate.min.css vendored

File diff suppressed because one or more lines are too long

View File

@ -4,10 +4,9 @@
"devDependencies": {
"grunt": "~0.4.1",
"grunt-autoprefixer": "~0.4.0",
"grunt-contrib-sass": "~0.5.0",
"grunt-contrib-watch": "~0.5.3",
"grunt-csso": "~0.5.0",
"grunt-contrib-concat": "~0.3.0",
"grunt-contrib-cssmin": "~0.8.0"
"grunt-contrib-cssmin": "~0.8.0",
"load-grunt-tasks": "~0.2.0"
}
}