Skip to content

Commit

Permalink
Merge pull request animate-css#505 from woneob/missing-semicolons
Browse files Browse the repository at this point in the history
Clean up - missing semicolons, whitespace
  • Loading branch information
daneden committed Dec 10, 2015
2 parents a1847ce + 44b2600 commit c998daf
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 37 deletions.
16 changes: 5 additions & 11 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
module.exports = function(grunt) {

require('load-grunt-tasks')(grunt);

var concatAnim;

grunt.initConfig({

pkg: grunt.file.readJSON('package.json'),

concat: {
Expand Down Expand Up @@ -71,22 +68,21 @@ module.exports = function(grunt) {
tasks: ['default']
}
}

});

// fuction to perform custom task
concatAnim = function () {

var categories = grunt.file.readJSON('animate-config.json'),
category, files, file,
target = [ 'source/_base.css' ],
count = 0;

for ( category in categories ) {
if ( categories.hasOwnProperty(category) ) {
files = categories[category]
for (category in categories) {
if (categories.hasOwnProperty(category)) {
files = categories[category];

for (file in files) {
if ( files.hasOwnProperty(file) && files[file] ) {
if (files.hasOwnProperty(file) && files[file]) {
target.push('source/' + category + '/' + file + '.css');
count += 1;
}
Expand All @@ -102,12 +98,10 @@ module.exports = function(grunt) {

grunt.config('concat', { 'animate.css': target });
grunt.task.run('concat');

};

// register task
grunt.registerTask('concat-anim', 'Concatenates activated animations', concatAnim); // custom task
grunt.registerTask('default', ['concat-anim', 'autoprefixer', 'cssmin', 'usebanner']);
grunt.registerTask('dev', ['watch']);

};
17 changes: 7 additions & 10 deletions source/attention_seekers/headShake.css
Original file line number Diff line number Diff line change
@@ -1,33 +1,30 @@
@keyframes headShake {


0 {
transform: translateX(0)
transform: translateX(0);
}

6.5% {
transform: translateX(-6px) rotateY(-9deg)
transform: translateX(-6px) rotateY(-9deg);
}

18.5% {
transform: translateX(5px) rotateY(7deg)
transform: translateX(5px) rotateY(7deg);
}

31.5% {
transform: translateX(-3px) rotateY(-5deg)
transform: translateX(-3px) rotateY(-5deg);
}

43.5% {
transform: translateX(2px) rotateY(3deg)
transform: translateX(2px) rotateY(3deg);
}

50% {
transform: translateX(0)
transform: translateX(0);
}
}


.headShake {
animation-timing-function: ease-in-out;
animation-name: headShake;
}
}
29 changes: 17 additions & 12 deletions source/attention_seekers/jello.css
Original file line number Diff line number Diff line change
@@ -1,33 +1,38 @@
@keyframes jello {
from, 11.1%, to {
transform: none
transform: none;
}

22.2% {
transform: skewX(-12.5deg) skewY(-12.5deg)
transform: skewX(-12.5deg) skewY(-12.5deg);
}

33.3% {
transform: skewX(6.25deg) skewY(6.25deg)
transform: skewX(6.25deg) skewY(6.25deg);
}

44.4% {
transform: skewX(-3.125deg) skewY(-3.125deg)
transform: skewX(-3.125deg) skewY(-3.125deg);
}

55.5% {
transform: skewX(1.5625deg) skewY(1.5625deg)
transform: skewX(1.5625deg) skewY(1.5625deg);
}

66.6% {
transform: skewX(-0.78125deg) skewY(-0.78125deg)
transform: skewX(-0.78125deg) skewY(-0.78125deg);
}

77.7% {
transform: skewX(0.390625deg) skewY(0.390625deg)
transform: skewX(0.390625deg) skewY(0.390625deg);
}

88.8% {
transform: skewX(-0.1953125deg) skewY(-0.1953125deg)
transform: skewX(-0.1953125deg) skewY(-0.1953125deg);
}
}



.jello{
animation-name:jello;
transform-origin: center
animation-name:jello;
transform-origin: center;
}
9 changes: 7 additions & 2 deletions source/fading_entrances/fadeIn.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
@keyframes fadeIn {
from {opacity: 0;}
to {opacity: 1;}
from {
opacity: 0;
}

to {
opacity: 1;
}
}

.fadeIn {
Expand Down
9 changes: 7 additions & 2 deletions source/fading_exits/fadeOut.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
@keyframes fadeOut {
from {opacity: 1;}
to {opacity: 0;}
from {
opacity: 1;
}

to {
opacity: 0;
}
}

.fadeOut {
Expand Down

0 comments on commit c998daf

Please sign in to comment.