aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Materials/materials-popup.reel/materials-popup.html
diff options
context:
space:
mode:
authorPushkar Joshi2012-03-27 09:10:58 -0700
committerPushkar Joshi2012-03-27 09:10:58 -0700
commit0c26aff9c19c2b39fca06fa6b3bc76b672204065 (patch)
treee778f2b9d5d525aa364360d5996536a0a06379bd /js/panels/Materials/materials-popup.reel/materials-popup.html
parent753244b4713243ab19ca246be674f0b45fb85b72 (diff)
parent309dde5a8c4599cef6a1052c1ff9ee1ad8ec5858 (diff)
downloadninja-0c26aff9c19c2b39fca06fa6b3bc76b672204065.tar.gz
Merge branch 'master' into brushtool
Conflicts: js/controllers/elements/shapes-controller.js
Diffstat (limited to 'js/panels/Materials/materials-popup.reel/materials-popup.html')
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.html8
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>