diff options
| author | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
| commit | dc075ffcc6dd03c090d90fad999eee9b924d56ee (patch) | |
| tree | 867f8bdd588c8f9076979233ca46a688ff70523e /js/panels/Materials/materials-library-panel.reel/materials-library-panel.html | |
| parent | 5d7e470351fd150d5e70a97332fa2f2553797499 (diff) | |
| parent | 4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff) | |
| download | ninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz | |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/components/layout/tools-properties.reel/tools-properties.html
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/panels/Materials/materials-library-panel.reel/materials-library-panel.html')
| -rwxr-xr-x | js/panels/Materials/materials-library-panel.reel/materials-library-panel.html | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html index 741ff6aa..7fc48a55 100755 --- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html +++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html | |||
| @@ -88,15 +88,15 @@ | |||
| 88 | </head> | 88 | </head> |
| 89 | <body> | 89 | <body> |
| 90 | 90 | ||
| 91 | <div id="materials_library_panel" class="materials_library_panel"> | 91 | <div data-montage-id="materials_library_panel" class="materials_library_panel"> |
| 92 | <section id="ml_tree_holder" class="animationsLibrary"> | 92 | <section data-montage-id="ml_tree_holder" class="animationsLibrary"> |
| 93 | <div id="materials_library_tree"></div> | 93 | <div data-montage-id="materials_library_tree"></div> |
| 94 | </section> | 94 | </section> |
| 95 | <hr /> | 95 | <hr /> |
| 96 | <div id="ml_buttons"> | 96 | <div data-montage-id="ml_buttons" class="ml_buttons"> |
| 97 | <button id="ml_add_btn" class="nj-skinned">Add</button> | 97 | <button data-montage-id="ml_add_btn" class="nj-skinned">Add</button> |
| 98 | <button id="ml_copy_btn" class="nj-skinned">Copy</button> | 98 | <button data-montage-id="ml_copy_btn" class="nj-skinned">Copy</button> |
| 99 | <button id="ml_delete_btn" class="nj-skinned">Delete</button> | 99 | <button data-montage-id="ml_delete_btn" class="nj-skinned">Delete</button> |
| 100 | </div> | 100 | </div> |
| 101 | </div> | 101 | </div> |
| 102 | 102 | ||