diff options
author | Eric Guzman | 2012-03-19 11:52:35 -0700 |
---|---|---|
committer | Eric Guzman | 2012-03-19 11:52:35 -0700 |
commit | dde5b5054f93db493e5d4d502e677f5781334b08 (patch) | |
tree | 4960525a5b183f0e966462c566817331bea0f3cd /js/panels/presets/content.reel/content.html | |
parent | f08e3660384ed6ed2ba8ecf959c90fd1ade818eb (diff) | |
parent | 954f5a13e371febcb1c0fb8015c577ee51c23130 (diff) | |
download | ninja-dde5b5054f93db493e5d4d502e677f5781334b08.tar.gz |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/panels/presets/content.reel/content.html')
-rw-r--r-- | js/panels/presets/content.reel/content.html | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/js/panels/presets/content.reel/content.html b/js/panels/presets/content.reel/content.html index 38de2a6d..f01e6435 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 | } |
@@ -59,6 +64,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
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">Style Library</div> |
61 | <div id="transitions">Transitions Library</div> | 66 | <div id="transitions">Transitions Library</div> |
67 | <div id="animations">Animations Library</div> | ||
62 | </nav> | 68 | </nav> |
63 | <div id="librarySlot" class="librarySlot"></div> | 69 | <div id="librarySlot" class="librarySlot"></div> |
64 | </section> | 70 | </section> |