diff options
author | Nivesh Rajbhandari | 2012-04-16 16:06:24 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-04-16 16:06:24 -0700 |
commit | c253192a08b499ea7be46fa5438d273e51f7ec5a (patch) | |
tree | 18a1f0e3679c0eb993a9dedb537035d3861f49ac /js/panels/Materials/materials-popup.reel/materials-popup.html | |
parent | e19376c54eedd1f1c457ba405b2f110be376a559 (diff) | |
parent | 4b900ea5cd6bb77eb30cec8c03b9ec9fa662c1e9 (diff) | |
download | ninja-c253192a08b499ea7be46fa5438d273e51f7ec5a.tar.gz |
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
Diffstat (limited to 'js/panels/Materials/materials-popup.reel/materials-popup.html')
-rwxr-xr-x | js/panels/Materials/materials-popup.reel/materials-popup.html | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.html b/js/panels/Materials/materials-popup.reel/materials-popup.html index de4f98c1..ae0ee2c8 100755 --- a/js/panels/Materials/materials-popup.reel/materials-popup.html +++ b/js/panels/Materials/materials-popup.reel/materials-popup.html | |||
@@ -14,7 +14,7 @@ | |||
14 | <script type="text/montage-serialization"> | 14 | <script type="text/montage-serialization"> |
15 | { | 15 | { |
16 | "okButton": { | 16 | "okButton": { |
17 | "module": "js/components/button.reel", | 17 | "module": "montage/ui/button.reel", |
18 | "name": "Button", | 18 | "name": "Button", |
19 | "properties": { | 19 | "properties": { |
20 | "element": {"#": "mp_ok_btn"}, | 20 | "element": {"#": "mp_ok_btn"}, |
@@ -22,7 +22,7 @@ | |||
22 | } | 22 | } |
23 | }, | 23 | }, |
24 | "cancelButton": { | 24 | "cancelButton": { |
25 | "module": "js/components/button.reel", | 25 | "module": "montage/ui/button.reel", |
26 | "name": "Button", | 26 | "name": "Button", |
27 | "properties": { | 27 | "properties": { |
28 | "element": {"#": "mp_cancel_btn"}, | 28 | "element": {"#": "mp_cancel_btn"}, |
@@ -104,15 +104,15 @@ | |||
104 | 104 | ||
105 | <hr /> | 105 | <hr /> |
106 | 106 | ||
107 | <div id="mp_properties_list" class="mp_properties_list" style="-webkit-user-select: none;"> | 107 | <div id="mp_properties_list" class="mp_properties_list"> |
108 | <div id="mp_property" class="mp_property"></div> | 108 | <div id="mp_property" class="mp_property"></div> |
109 | </div> | 109 | </div> |
110 | 110 | ||
111 | <hr /> | 111 | <hr /> |
112 | 112 | ||
113 | <div id="mp_buttons" class="mp_buttons"> | 113 | <div id="mp_buttons" class="mp_buttons"> |
114 | <button id="mp_cancel_btn" class="mp_cancel_btn"></button> | 114 | <button id="mp_cancel_btn" class="mp_cancel_btn nj-skinned"></button> |
115 | <button id="mp_ok_btn" class="mp_ok_btn"></button> | 115 | <button id="mp_ok_btn" class="mp_ok_btn nj-skinned"></button> |
116 | </div> | 116 | </div> |
117 | 117 | ||
118 | </div> | 118 | </div> |