aboutsummaryrefslogtreecommitdiff
path: root/js/panels/presets
diff options
context:
space:
mode:
authorArmen Kesablyan2012-03-22 14:31:43 -0700
committerArmen Kesablyan2012-03-22 14:31:43 -0700
commitcd0b4714b782f8cc4cf9255fa2653d3d5eeade43 (patch)
tree297399e5ece4aa5800abd17b74da47af1899708c /js/panels/presets
parent49596f2a6b518ed0ee945006787d3c69e40a5757 (diff)
parent57cc00a5ef3ab525e54a030d7692b2d9eefaa68b (diff)
downloadninja-cd0b4714b782f8cc4cf9255fa2653d3d5eeade43.tar.gz
Merge branch 'refs/heads/master' into DataBinding
Diffstat (limited to 'js/panels/presets')
-rw-r--r--js/panels/presets/content.reel/content.html6
-rw-r--r--js/panels/presets/default-transition-presets.js20
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