diff options
author | Nivesh Rajbhandari | 2012-04-05 10:31:45 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-04-05 10:31:45 -0700 |
commit | 55f4835aa33546f5cd27e501ed461a0f7eb5038b (patch) | |
tree | 2bac6f39d12fcf2116a7f79acf45c1672d6f5522 /js/panels/presets/default-animation-presets.js | |
parent | 4ae2fd54e3844d788536dd00814c6aad0aa9f121 (diff) | |
download | ninja-55f4835aa33546f5cd27e501ed461a0f7eb5038b.tar.gz |
Undoing mistakes from auto-merge.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/panels/presets/default-animation-presets.js')
-rw-r--r-- | js/panels/presets/default-animation-presets.js | 2 |
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 4793c356..578c1622 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-name": "border-morph", | 17 | "-webkit-animation-name": "border-morph", |
19 | "-webkit-animation-duration": "2s", | 18 | "-webkit-animation-duration": "2s", |
@@ -93,7 +92,6 @@ exports.animationPresets = { | |||
93 | "text": "Rotater", | 92 | "text": "Rotater", |
94 | "selectorBase" : "rotate-with-alpha-keyframes", | 93 | "selectorBase" : "rotate-with-alpha-keyframes", |
95 | "rules" : [{ | 94 | "rules" : [{ |
96 | "selectorSuffix" : "", | ||
97 | "styles" : { | 95 | "styles" : { |
98 | "-webkit-animation-name": "rotate-with-alpha-keyframes", | 96 | "-webkit-animation-name": "rotate-with-alpha-keyframes", |
99 | "-webkit-animation-duration": "5s", | 97 | "-webkit-animation-duration": "5s", |