aboutsummaryrefslogtreecommitdiff
path: root/js/panels/presets/default-animation-presets.js
diff options
context:
space:
mode:
authorhwc4872012-04-05 17:09:51 -0700
committerhwc4872012-04-05 17:09:51 -0700
commit2d21b01d6dd64af643f5f38818b57fcace05ea0b (patch)
tree44fac83294dae2efad48389ddb44cb1dbe06caad /js/panels/presets/default-animation-presets.js
parent7656b6eac7aec59697c6cddbe2a507fe9e4aa187 (diff)
parent96bfeee2e6b735b87e8482d6e2cf24d5224c6417 (diff)
downloadninja-2d21b01d6dd64af643f5f38818b57fcace05ea0b.tar.gz
Merge branch 'Snapping' of github.com:ericmueller/ninja-internal into Snapping_II
Diffstat (limited to 'js/panels/presets/default-animation-presets.js')
-rw-r--r--js/panels/presets/default-animation-presets.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/js/panels/presets/default-animation-presets.js b/js/panels/presets/default-animation-presets.js
index 578c1622..4793c356 100644
--- a/js/panels/presets/default-animation-presets.js
+++ b/js/panels/presets/default-animation-presets.js
@@ -13,6 +13,7 @@ exports.animationPresets = {
13 "text": "Border Morph", 13 "text": "Border Morph",
14 "selectorBase" : "border-morph", 14 "selectorBase" : "border-morph",
15 "rules" : [{ 15 "rules" : [{
16 "selectorSuffix" : "",
16 "styles" : { 17 "styles" : {
17 "-webkit-animation-name": "border-morph", 18 "-webkit-animation-name": "border-morph",
18 "-webkit-animation-duration": "2s", 19 "-webkit-animation-duration": "2s",
@@ -92,6 +93,7 @@ exports.animationPresets = {
92 "text": "Rotater", 93 "text": "Rotater",
93 "selectorBase" : "rotate-with-alpha-keyframes", 94 "selectorBase" : "rotate-with-alpha-keyframes",
94 "rules" : [{ 95 "rules" : [{
96 "selectorSuffix" : "",
95 "styles" : { 97 "styles" : {
96 "-webkit-animation-name": "rotate-with-alpha-keyframes", 98 "-webkit-animation-name": "rotate-with-alpha-keyframes",
97 "-webkit-animation-duration": "5s", 99 "-webkit-animation-duration": "5s",