diff options
author | Jonathan Duran | 2012-04-05 08:09:18 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-04-05 08:09:18 -0700 |
commit | e186c49247689b5c2df6125037e2473636701d17 (patch) | |
tree | e626b006027949f87b5aa1e76eb0ed719adb99bb /js/panels/presets | |
parent | 135c5257e2a4d5f1b25f62758c6783fd2ebe5e19 (diff) | |
parent | 17ca01f54591187f5c0812c0fd2cb7260afa9639 (diff) | |
download | ninja-e186c49247689b5c2df6125037e2473636701d17.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/panels/presets')
-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 | { |