aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
authorEric Guzman2012-03-29 16:28:34 -0700
committerEric Guzman2012-03-29 16:28:34 -0700
commit7aefa059c79c9bef5c7a8a93cdfbd1ce55f69118 (patch)
tree26df8de65a3d309f15a9b56dc2068f8772422d40 /js/panels
parentbfd796e47c856c6620dc4b32ac6c710d4a493d3a (diff)
downloadninja-7aefa059c79c9bef5c7a8a93cdfbd1ce55f69118.tar.gz
Presets - Remove style transition when transition doesn't start. Also added temporary fix for aggregating animations (from timeline/presets)
Diffstat (limited to 'js/panels')
-rw-r--r--js/panels/presets/default-animation-presets.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/js/panels/presets/default-animation-presets.js b/js/panels/presets/default-animation-presets.js
index b12a94b2..578c1622 100644
--- a/js/panels/presets/default-animation-presets.js
+++ b/js/panels/presets/default-animation-presets.js
@@ -14,7 +14,9 @@ exports.animationPresets = {
14 "selectorBase" : "border-morph", 14 "selectorBase" : "border-morph",
15 "rules" : [{ 15 "rules" : [{
16 "styles" : { 16 "styles" : {
17 "-webkit-animation": "border-morph 2s infinite" 17 "-webkit-animation-name": "border-morph",
18 "-webkit-animation-duration": "2s",
19 "-webkit-animation-iteration-count": "infinite"
18 } 20 }
19 }, 21 },
20 { 22 {