aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Guzman2012-03-16 17:56:25 -0700
committerEric Guzman2012-03-16 17:56:25 -0700
commita6a6f9bcc5ff92f5bb5e9275336dfaec2d8e8f4c (patch)
tree01652c975209bae62ff272de74bee62b04b79ab7
parent163ffbf531872a81c4d4be4321b065c22cf0715b (diff)
downloadninja-a6a6f9bcc5ff92f5bb5e9275336dfaec2d8e8f4c.tar.gz
Presets Panel - Change Tab labels, Add Un-3d preset
-rw-r--r--js/panels/presets/content.reel/content.html6
-rw-r--r--js/panels/presets/default-transition-presets.js16
2 files changed, 19 insertions, 3 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 00873231..48f7c2b7 100644
--- a/js/panels/presets/default-transition-presets.js
+++ b/js/panels/presets/default-transition-presets.js
@@ -88,6 +88,22 @@ exports.transitionPresets = {
88 "-webkit-transform": "rotate(180deg)" 88 "-webkit-transform": "rotate(180deg)"
89 } 89 }
90 }] 90 }]
91 },{
92 "text": "Remove 3D",
93 "selectorBase" : "remove-3d",
94 "rules" : [{
95 "selectorSuffix": "",
96 "styles" : {
97 "-webkit-transition": "all 0.4s ease-in"
98 }
99 },
100 {
101 "selectorSuffix" : ":hover",
102 "styles" : {
103 "-webkit-transform": "rotateX(0deg)",
104 "opacity": "1"
105 }
106 }]
91 }] 107 }]
92 }] 108 }]
93}; \ No newline at end of file 109}; \ No newline at end of file