aboutsummaryrefslogtreecommitdiff
path: root/js/panels/presets/default-animation-presets.js
diff options
context:
space:
mode:
authorAnanya Sen2012-03-28 14:21:35 -0700
committerAnanya Sen2012-03-28 14:21:35 -0700
commit2c794eca1b01743b0221af4341835d3608185dd3 (patch)
tree96c3bedfc5afe4b12ad0c3b261dda493c80fb3c1 /js/panels/presets/default-animation-presets.js
parent0d83ad4dc08448e016c79ae739e84c3d71552b56 (diff)
parent3fd2cdb59027b3f973b9165db9db4fdd22026941 (diff)
downloadninja-2c794eca1b01743b0221af4341835d3608185dd3.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Codeview-improvements
Diffstat (limited to 'js/panels/presets/default-animation-presets.js')
-rw-r--r--js/panels/presets/default-animation-presets.js2
1 files changed, 0 insertions, 2 deletions
diff --git a/js/panels/presets/default-animation-presets.js b/js/panels/presets/default-animation-presets.js
index 64f91ea6..b12a94b2 100644
--- a/js/panels/presets/default-animation-presets.js
+++ b/js/panels/presets/default-animation-presets.js
@@ -13,7 +13,6 @@ exports.animationPresets = {
13 "text": "Border Morph", 13 "text": "Border Morph",
14 "selectorBase" : "border-morph", 14 "selectorBase" : "border-morph",
15 "rules" : [{ 15 "rules" : [{
16 "selectorSuffix" : "",
17 "styles" : { 16 "styles" : {
18 "-webkit-animation": "border-morph 2s infinite" 17 "-webkit-animation": "border-morph 2s infinite"
19 } 18 }
@@ -91,7 +90,6 @@ exports.animationPresets = {
91 "text": "Rotater", 90 "text": "Rotater",
92 "selectorBase" : "rotate-with-alpha-keyframes", 91 "selectorBase" : "rotate-with-alpha-keyframes",
93 "rules" : [{ 92 "rules" : [{
94 "selectorSuffix" : "",
95 "styles" : { 93 "styles" : {
96 "-webkit-animation-name": "rotate-with-alpha-keyframes", 94 "-webkit-animation-name": "rotate-with-alpha-keyframes",
97 "-webkit-animation-duration": "5s", 95 "-webkit-animation-duration": "5s",