diff options
author | Eric Guzman | 2012-04-04 13:10:36 -0700 |
---|---|---|
committer | Eric Guzman | 2012-04-04 13:10:36 -0700 |
commit | 72697c2a48480509cd89ac506d8a4873f2853fd4 (patch) | |
tree | 66d24fd4e298c545b4ddcaa6e000a462d3d9c55f /js/panels/presets/default-animation-presets.js | |
parent | c394a1cf04bbf3b9ad3003ec86498a30d00926bb (diff) | |
parent | 8482e23cd9b8c4700b5130f2588e5eb24d376536 (diff) | |
download | ninja-72697c2a48480509cd89ac506d8a4873f2853fd4.tar.gz |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/panels/presets/default-animation-presets.js')
-rw-r--r-- | js/panels/presets/default-animation-presets.js | 4 |
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 | { |