diff options
author | Valerio Virgillito | 2012-03-19 14:02:24 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-03-19 14:02:24 -0700 |
commit | e9c3c7d758fc59ad7b731730dd935170844d9538 (patch) | |
tree | 2972d0384605eef4ba1a43636bd48db724f15713 /js/panels/Materials/materials-popup.reel/materials-popup.html | |
parent | cff7deb476f4095d7d3d76c92360617d3316a96f (diff) | |
parent | afe4b3d6567a35586e970682d71cba61c416e496 (diff) | |
download | ninja-e9c3c7d758fc59ad7b731730dd935170844d9538.tar.gz |
Merge branch 'refs/heads/master' into montage-integration
Diffstat (limited to 'js/panels/Materials/materials-popup.reel/materials-popup.html')
-rwxr-xr-x | js/panels/Materials/materials-popup.reel/materials-popup.html | 8 |
1 files changed, 4 insertions, 4 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..34f68554 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"}, |
@@ -111,8 +111,8 @@ | |||
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> |