aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Materials/materials-popup.reel/materials-popup.html
diff options
context:
space:
mode:
authorPushkar Joshi2012-05-07 11:00:22 -0700
committerPushkar Joshi2012-05-07 11:00:22 -0700
commite5ae6e0b6e54db0e6efd75d1f14cb791060ed67a (patch)
treee84d2dc5033c1b5c1b993662660a90af12584b69 /js/panels/Materials/materials-popup.reel/materials-popup.html
parentba890518b5a35d5e6893f9fc72d2eee30ae07e17 (diff)
parent526e423e4a2734c2b139af23911e912452a4443f (diff)
downloadninja-e5ae6e0b6e54db0e6efd75d1f14cb791060ed67a.tar.gz
Merge branch 'master' into pentool
Diffstat (limited to 'js/panels/Materials/materials-popup.reel/materials-popup.html')
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.html26
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