diff options
| author | hwc487 | 2012-05-11 13:52:55 -0700 |
|---|---|---|
| committer | hwc487 | 2012-05-11 13:52:55 -0700 |
| commit | 137bfc9d4c41cc918d969565bec28a834fe10472 (patch) | |
| tree | e9fa109fc65218f45e386df48b713ff5858f3d62 /js/panels/Materials/materials-popup.reel/materials-popup.html | |
| parent | d21aaca3d7093b6af968b7f9f764ab54e004f02b (diff) | |
| parent | 27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff) | |
| download | ninja-137bfc9d4c41cc918d969565bec28a834fe10472.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts:
js/lib/geom/geom-obj.js
js/lib/geom/rectangle.js
js/tools/TagTool.js
Diffstat (limited to 'js/panels/Materials/materials-popup.reel/materials-popup.html')
| -rwxr-xr-x | js/panels/Materials/materials-popup.reel/materials-popup.html | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.html b/js/panels/Materials/materials-popup.reel/materials-popup.html index 9fdbc00d..d18599d6 100755 --- a/js/panels/Materials/materials-popup.reel/materials-popup.html +++ b/js/panels/Materials/materials-popup.reel/materials-popup.html | |||
| @@ -88,29 +88,19 @@ | |||
| 88 | </head> | 88 | </head> |
| 89 | 89 | ||
| 90 | <body> | 90 | <body> |
| 91 | 91 | <div data-montage-id="materials_popup" class="materials_popup"> | |
| 92 | <div id="materials_popup" class="materials_popup"> | 92 | <div data-montage-id="mp_title" class="mp_title">Material Name</div> |
| 93 | <div id="mp_title">Material Name</div> | ||
| 94 | |||
| 95 | <hr /> | 93 | <hr /> |
| 96 | 94 | <div data-montage-id="mp_preview" class="mp_preview">Preview Pane</div> | |
| 97 | <div id="mp_preview">Preview Pane</div> | ||
| 98 | |||
| 99 | <hr /> | 95 | <hr /> |
| 100 | 96 | <div data-montage-id="mp_properties_list" class="mp_properties_list"> | |
| 101 | <div id="mp_properties_list" class="mp_properties_list"> | 97 | <div data-montage-id="mp_property" class="mp_property"></div> |
| 102 | <div id="mp_property" class="mp_property"></div> | ||
| 103 | </div> | 98 | </div> |
| 104 | |||
| 105 | <hr /> | 99 | <hr /> |
| 106 | 100 | <div data-montage-id="mp_buttons" class="mp_buttons"> | |
| 107 | <div id="mp_buttons" class="mp_buttons"> | 101 | <button data-montage-id="mp_cancel_btn" class="mp_cancel_btn nj-skinned"></button> |
| 108 | <button id="mp_cancel_btn" class="mp_cancel_btn nj-skinned"></button> | 102 | <button data-montage-id="mp_ok_btn" class="mp_ok_btn nj-skinned"></button> |
| 109 | <button id="mp_ok_btn" class="mp_ok_btn nj-skinned"></button> | ||
| 110 | </div> | 103 | </div> |
| 111 | |||
| 112 | </div> | 104 | </div> |
| 113 | |||
| 114 | </body> | 105 | </body> |
| 115 | |||
| 116 | </html> \ No newline at end of file | 106 | </html> \ No newline at end of file |