diff options
| author | Pushkar Joshi | 2012-03-27 09:10:58 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-03-27 09:10:58 -0700 |
| commit | 0c26aff9c19c2b39fca06fa6b3bc76b672204065 (patch) | |
| tree | e778f2b9d5d525aa364360d5996536a0a06379bd /js/panels/presets/content.reel | |
| parent | 753244b4713243ab19ca246be674f0b45fb85b72 (diff) | |
| parent | 309dde5a8c4599cef6a1052c1ff9ee1ad8ec5858 (diff) | |
| download | ninja-0c26aff9c19c2b39fca06fa6b3bc76b672204065.tar.gz | |
Merge branch 'master' into brushtool
Conflicts:
js/controllers/elements/shapes-controller.js
Diffstat (limited to 'js/panels/presets/content.reel')
| -rw-r--r-- | js/panels/presets/content.reel/content.html | 16 |
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> |