aboutsummaryrefslogtreecommitdiff
path: root/js/panels/presets/content.reel/content.html
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-04-16 16:06:24 -0700
committerNivesh Rajbhandari2012-04-16 16:06:24 -0700
commitc253192a08b499ea7be46fa5438d273e51f7ec5a (patch)
tree18a1f0e3679c0eb993a9dedb537035d3861f49ac /js/panels/presets/content.reel/content.html
parente19376c54eedd1f1c457ba405b2f110be376a559 (diff)
parent4b900ea5cd6bb77eb30cec8c03b9ec9fa662c1e9 (diff)
downloadninja-c253192a08b499ea7be46fa5438d273e51f7ec5a.tar.gz
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
Diffstat (limited to 'js/panels/presets/content.reel/content.html')
-rw-r--r--js/panels/presets/content.reel/content.html16
1 files changed, 11 insertions, 5 deletions
diff --git a/js/panels/presets/content.reel/content.html b/js/panels/presets/content.reel/content.html
index 38de2a6d..afbdd559 100644
--- a/js/panels/presets/content.reel/content.html
+++ b/js/panels/presets/content.reel/content.html
@@ -19,7 +19,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
19 "tabBar" : {"#": "tab-bar" }, 19 "tabBar" : {"#": "tab-bar" },
20 "tabs" : [ 20 "tabs" : [
21 {"key":"styles", "tab": {"#": "styles" }}, 21 {"key":"styles", "tab": {"#": "styles" }},
22 {"key":"transitions", "tab": {"#": "transitions" }} 22 {"key":"transitions", "tab": {"#": "transitions" }},
23 {"key":"animations", "tab": {"#": "animations" }}
23 ] 24 ]
24 } 25 }
25 }, 26 },
@@ -30,8 +31,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
30 "element": {"#": "librarySlot"}, 31 "element": {"#": "librarySlot"},
31 "switchComponents": { 32 "switchComponents": {
32 "styles": {"@": "stylesLibrary"}, 33 "styles": {"@": "stylesLibrary"},
33 "transitions": {"@": "transitionsLibrary"} 34 "transitions": {"@": "transitionsLibrary"},
34 35 "animations": {"@": "animationsLibrary"}
35 } 36 }
36 }, 37 },
37 "bindings": { 38 "bindings": {
@@ -49,6 +50,10 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
49 "transitionsLibrary": { 50 "transitionsLibrary": {
50 "module": "js/panels/presets/transitions-presets.reel", 51 "module": "js/panels/presets/transitions-presets.reel",
51 "name": "TransitionsLibrary" 52 "name": "TransitionsLibrary"
53 },
54 "animationsLibrary": {
55 "module": "js/panels/presets/animations-presets.reel",
56 "name": "AnimationsLibrary"
52 } 57 }
53 58
54 } 59 }
@@ -57,8 +62,9 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
57<body> 62<body>
58 <section id="presetsPanel" class="presetsPanel"> 63 <section id="presetsPanel" class="presetsPanel">
59 <nav id="tab-bar" class="tab-bar"> 64 <nav id="tab-bar" class="tab-bar">
60 <div id="styles">Style Library</div> 65 <div id="styles">Styles</div>
61 <div id="transitions">Transitions Library</div> 66 <div id="transitions">Transitions</div>
67 <div id="animations">Animations</div>
62 </nav> 68 </nav>
63 <div id="librarySlot" class="librarySlot"></div> 69 <div id="librarySlot" class="librarySlot"></div>
64 </section> 70 </section>