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-transition-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-transition-presets.js')
-rw-r--r-- | js/panels/presets/default-transition-presets.js | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/js/panels/presets/default-transition-presets.js b/js/panels/presets/default-transition-presets.js index 15f4882f..f8968085 100644 --- a/js/panels/presets/default-transition-presets.js +++ b/js/panels/presets/default-transition-presets.js | |||
@@ -13,7 +13,6 @@ exports.transitionPresets = { | |||
13 | "text": "Fade In", | 13 | "text": "Fade In", |
14 | "selectorBase" : "fade-in", | 14 | "selectorBase" : "fade-in", |
15 | "rules" : [{ | 15 | "rules" : [{ |
16 | "selectorSuffix": "", | ||
17 | "styles" : { | 16 | "styles" : { |
18 | "opacity": "0.25", | 17 | "opacity": "0.25", |
19 | "-webkit-transition": "all 0.4s ease-in" | 18 | "-webkit-transition": "all 0.4s ease-in" |
@@ -29,7 +28,6 @@ exports.transitionPresets = { | |||
29 | "text": "Fade Out", | 28 | "text": "Fade Out", |
30 | "selectorBase" : "fade-out", | 29 | "selectorBase" : "fade-out", |
31 | "rules" : [{ | 30 | "rules" : [{ |
32 | "selectorSuffix": "", | ||
33 | "styles" : { | 31 | "styles" : { |
34 | "opacity": "1", | 32 | "opacity": "1", |
35 | "-webkit-transition": "all 0.4s ease-in" | 33 | "-webkit-transition": "all 0.4s ease-in" |
@@ -48,7 +46,6 @@ exports.transitionPresets = { | |||
48 | "text": "Slide Right", | 46 | "text": "Slide Right", |
49 | "selectorBase" : "slide-right", | 47 | "selectorBase" : "slide-right", |
50 | "rules" : [{ | 48 | "rules" : [{ |
51 | "selectorSuffix": "", | ||
52 | "styles" : { | 49 | "styles" : { |
53 | "-webkit-transition": "all 0.4s ease-in" | 50 | "-webkit-transition": "all 0.4s ease-in" |
54 | } | 51 | } |
@@ -63,7 +60,6 @@ exports.transitionPresets = { | |||
63 | "text": "Slide Left", | 60 | "text": "Slide Left", |
64 | "selectorBase" : "slide-left", | 61 | "selectorBase" : "slide-left", |
65 | "rules" : [{ | 62 | "rules" : [{ |
66 | "selectorSuffix": "", | ||
67 | "styles" : { | 63 | "styles" : { |
68 | "-webkit-transition": "all 0.4s ease-in" | 64 | "-webkit-transition": "all 0.4s ease-in" |
69 | } | 65 | } |
@@ -78,7 +74,6 @@ exports.transitionPresets = { | |||
78 | "text": "Rotate", | 74 | "text": "Rotate", |
79 | "selectorBase" : "rotate", | 75 | "selectorBase" : "rotate", |
80 | "rules" : [{ | 76 | "rules" : [{ |
81 | "selectorSuffix" : "", | ||
82 | "styles" : { | 77 | "styles" : { |
83 | "-webkit-transition": "all 0.4s ease-in" | 78 | "-webkit-transition": "all 0.4s ease-in" |
84 | } | 79 | } |
@@ -92,7 +87,6 @@ exports.transitionPresets = { | |||
92 | "text": "Scale Up", | 87 | "text": "Scale Up", |
93 | "selectorBase" : "scale-up", | 88 | "selectorBase" : "scale-up", |
94 | "rules" : [{ | 89 | "rules" : [{ |
95 | "selectorSuffix" : "", | ||
96 | "styles" : { | 90 | "styles" : { |
97 | "-webkit-transition": "-webkit-transform 0.4s ease-in" | 91 | "-webkit-transition": "-webkit-transform 0.4s ease-in" |
98 | } | 92 | } |
@@ -107,7 +101,6 @@ exports.transitionPresets = { | |||
107 | "text": "Scale Down", | 101 | "text": "Scale Down", |
108 | "selectorBase" : "scale-down", | 102 | "selectorBase" : "scale-down", |
109 | "rules" : [{ | 103 | "rules" : [{ |
110 | "selectorSuffix" : "", | ||
111 | "styles" : { | 104 | "styles" : { |
112 | "-webkit-transition": "-webkit-transform 0.4s ease-in" | 105 | "-webkit-transition": "-webkit-transform 0.4s ease-in" |
113 | } | 106 | } |
@@ -122,7 +115,6 @@ exports.transitionPresets = { | |||
122 | "text": "Remove 3D", | 115 | "text": "Remove 3D", |
123 | "selectorBase" : "remove-3d", | 116 | "selectorBase" : "remove-3d", |
124 | "rules" : [{ | 117 | "rules" : [{ |
125 | "selectorSuffix": "", | ||
126 | "styles" : { | 118 | "styles" : { |
127 | "-webkit-transition": "all 0.4s ease-in" | 119 | "-webkit-transition": "all 0.4s ease-in" |
128 | } | 120 | } |