diff options
author | Eric Guzman | 2012-04-02 15:36:08 -0700 |
---|---|---|
committer | Eric Guzman | 2012-04-02 15:36:08 -0700 |
commit | 0241bf331b7e06e206a54be441edf2f4c7261f63 (patch) | |
tree | b7e2f9cad73eed4fc616cf1841cd0be02bd955d4 /js/panels/presets/default-transition-presets.js | |
parent | dde5b5054f93db493e5d4d502e677f5781334b08 (diff) | |
parent | c6de22bf42be90b403491b5f87b1818d9020310c (diff) | |
download | ninja-0241bf331b7e06e206a54be441edf2f4c7261f63.tar.gz |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/panels/presets/default-transition-presets.js')
-rw-r--r-- | js/panels/presets/default-transition-presets.js | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/js/panels/presets/default-transition-presets.js b/js/panels/presets/default-transition-presets.js index 271ad821..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 | } |
@@ -88,12 +83,10 @@ exports.transitionPresets = { | |||
88 | "-webkit-transform": "rotate(180deg)" | 83 | "-webkit-transform": "rotate(180deg)" |
89 | } | 84 | } |
90 | }] | 85 | }] |
91 | }, | 86 | },{ |
92 | { | ||
93 | "text": "Scale Up", | 87 | "text": "Scale Up", |
94 | "selectorBase" : "scale-up", | 88 | "selectorBase" : "scale-up", |
95 | "rules" : [{ | 89 | "rules" : [{ |
96 | "selectorSuffix" : "", | ||
97 | "styles" : { | 90 | "styles" : { |
98 | "-webkit-transition": "-webkit-transform 0.4s ease-in" | 91 | "-webkit-transition": "-webkit-transform 0.4s ease-in" |
99 | } | 92 | } |
@@ -108,7 +101,6 @@ exports.transitionPresets = { | |||
108 | "text": "Scale Down", | 101 | "text": "Scale Down", |
109 | "selectorBase" : "scale-down", | 102 | "selectorBase" : "scale-down", |
110 | "rules" : [{ | 103 | "rules" : [{ |
111 | "selectorSuffix" : "", | ||
112 | "styles" : { | 104 | "styles" : { |
113 | "-webkit-transition": "-webkit-transform 0.4s ease-in" | 105 | "-webkit-transition": "-webkit-transform 0.4s ease-in" |
114 | } | 106 | } |
@@ -118,6 +110,22 @@ exports.transitionPresets = { | |||
118 | "-webkit-transform": "scale(.5)" | 110 | "-webkit-transform": "scale(.5)" |
119 | } | 111 | } |
120 | }] | 112 | }] |
113 | }, | ||
114 | { | ||
115 | "text": "Remove 3D", | ||
116 | "selectorBase" : "remove-3d", | ||
117 | "rules" : [{ | ||
118 | "styles" : { | ||
119 | "-webkit-transition": "all 0.4s ease-in" | ||
120 | } | ||
121 | }, | ||
122 | { | ||
123 | "selectorSuffix" : ":hover", | ||
124 | "styles" : { | ||
125 | "-webkit-transform": "rotateX(0deg)", | ||
126 | "opacity": "1" | ||
127 | } | ||
128 | }] | ||
121 | }] | 129 | }] |
122 | }] | 130 | }] |
123 | }; \ No newline at end of file | 131 | }; \ No newline at end of file |