diff options
author | Pushkar Joshi | 2012-03-16 11:52:13 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-03-16 11:52:13 -0700 |
commit | 1da989027e46102a9dc2aa2b5d764f58b97aa31b (patch) | |
tree | 496b8c7952c01b2caae76dda901b4173eedb11d2 /js/panels/presets | |
parent | e574f722864a246bad40d3f5a4e59f7ccb206ea9 (diff) | |
parent | 3e98d9eaf6f691aa0f7a4334983537a4ee3ffd39 (diff) | |
download | ninja-1da989027e46102a9dc2aa2b5d764f58b97aa31b.tar.gz |
Merge branch 'master' into brushtool
Diffstat (limited to 'js/panels/presets')
-rw-r--r-- | js/panels/presets/default-transition-presets.js | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/js/panels/presets/default-transition-presets.js b/js/panels/presets/default-transition-presets.js index 00873231..271ad821 100644 --- a/js/panels/presets/default-transition-presets.js +++ b/js/panels/presets/default-transition-presets.js | |||
@@ -88,6 +88,36 @@ exports.transitionPresets = { | |||
88 | "-webkit-transform": "rotate(180deg)" | 88 | "-webkit-transform": "rotate(180deg)" |
89 | } | 89 | } |
90 | }] | 90 | }] |
91 | }, | ||
92 | { | ||
93 | "text": "Scale Up", | ||
94 | "selectorBase" : "scale-up", | ||
95 | "rules" : [{ | ||
96 | "selectorSuffix" : "", | ||
97 | "styles" : { | ||
98 | "-webkit-transition": "-webkit-transform 0.4s ease-in" | ||
99 | } | ||
100 | }, { | ||
101 | "selectorSuffix" : ":hover", | ||
102 | "styles" : { | ||
103 | "-webkit-transform": "scale(1.4)" | ||
104 | } | ||
105 | }] | ||
106 | }, | ||
107 | { | ||
108 | "text": "Scale Down", | ||
109 | "selectorBase" : "scale-down", | ||
110 | "rules" : [{ | ||
111 | "selectorSuffix" : "", | ||
112 | "styles" : { | ||
113 | "-webkit-transition": "-webkit-transform 0.4s ease-in" | ||
114 | } | ||
115 | }, { | ||
116 | "selectorSuffix" : ":hover", | ||
117 | "styles" : { | ||
118 | "-webkit-transform": "scale(.5)" | ||
119 | } | ||
120 | }] | ||
91 | }] | 121 | }] |
92 | }] | 122 | }] |
93 | }; \ No newline at end of file | 123 | }; \ No newline at end of file |