diff options
| author | Valerio Virgillito | 2012-03-19 14:02:24 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-03-19 14:02:24 -0700 |
| commit | e9c3c7d758fc59ad7b731730dd935170844d9538 (patch) | |
| tree | 2972d0384605eef4ba1a43636bd48db724f15713 /js/panels/presets | |
| parent | cff7deb476f4095d7d3d76c92360617d3316a96f (diff) | |
| parent | afe4b3d6567a35586e970682d71cba61c416e496 (diff) | |
| download | ninja-e9c3c7d758fc59ad7b731730dd935170844d9538.tar.gz | |
Merge branch 'refs/heads/master' into montage-integration
Diffstat (limited to 'js/panels/presets')
| -rw-r--r-- | js/panels/presets/content.reel/content.html | 6 | ||||
| -rw-r--r-- | js/panels/presets/default-transition-presets.js | 20 |
2 files changed, 21 insertions, 5 deletions
diff --git a/js/panels/presets/content.reel/content.html b/js/panels/presets/content.reel/content.html index f01e6435..afbdd559 100644 --- a/js/panels/presets/content.reel/content.html +++ b/js/panels/presets/content.reel/content.html | |||
| @@ -62,9 +62,9 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 62 | <body> | 62 | <body> |
| 63 | <section id="presetsPanel" class="presetsPanel"> | 63 | <section id="presetsPanel" class="presetsPanel"> |
| 64 | <nav id="tab-bar" class="tab-bar"> | 64 | <nav id="tab-bar" class="tab-bar"> |
| 65 | <div id="styles">Style Library</div> | 65 | <div id="styles">Styles</div> |
| 66 | <div id="transitions">Transitions Library</div> | 66 | <div id="transitions">Transitions</div> |
| 67 | <div id="animations">Animations Library</div> | 67 | <div id="animations">Animations</div> |
| 68 | </nav> | 68 | </nav> |
| 69 | <div id="librarySlot" class="librarySlot"></div> | 69 | <div id="librarySlot" class="librarySlot"></div> |
| 70 | </section> | 70 | </section> |
diff --git a/js/panels/presets/default-transition-presets.js b/js/panels/presets/default-transition-presets.js index 271ad821..15f4882f 100644 --- a/js/panels/presets/default-transition-presets.js +++ b/js/panels/presets/default-transition-presets.js | |||
| @@ -88,8 +88,7 @@ exports.transitionPresets = { | |||
| 88 | "-webkit-transform": "rotate(180deg)" | 88 | "-webkit-transform": "rotate(180deg)" |
| 89 | } | 89 | } |
| 90 | }] | 90 | }] |
| 91 | }, | 91 | },{ |
| 92 | { | ||
| 93 | "text": "Scale Up", | 92 | "text": "Scale Up", |
| 94 | "selectorBase" : "scale-up", | 93 | "selectorBase" : "scale-up", |
| 95 | "rules" : [{ | 94 | "rules" : [{ |
| @@ -118,6 +117,23 @@ exports.transitionPresets = { | |||
| 118 | "-webkit-transform": "scale(.5)" | 117 | "-webkit-transform": "scale(.5)" |
| 119 | } | 118 | } |
| 120 | }] | 119 | }] |
| 120 | }, | ||
| 121 | { | ||
| 122 | "text": "Remove 3D", | ||
| 123 | "selectorBase" : "remove-3d", | ||
| 124 | "rules" : [{ | ||
| 125 | "selectorSuffix": "", | ||
| 126 | "styles" : { | ||
| 127 | "-webkit-transition": "all 0.4s ease-in" | ||
| 128 | } | ||
| 129 | }, | ||
| 130 | { | ||
| 131 | "selectorSuffix" : ":hover", | ||
| 132 | "styles" : { | ||
| 133 | "-webkit-transform": "rotateX(0deg)", | ||
| 134 | "opacity": "1" | ||
| 135 | } | ||
| 136 | }] | ||
| 121 | }] | 137 | }] |
| 122 | }] | 138 | }] |
| 123 | }; \ No newline at end of file | 139 | }; \ No newline at end of file |