3 files changed, 52 insertions, 17 deletions

diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.css b/js/panels/Materials/materials-popup.reel/materials-popup.css
index 89233c64..2d339411 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.css
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.css
@@ -37,21 +37,53 @@
 .mp_property
 {
     height:40px;
+    position: relative;
 }
 
 .mp_property > .prop-label
 {
-  float: left;
-  /*width:86px;*/
-  margin: 0px 8px 2px 5px;
+    position:relative;
+    top:12px;
+    float: left;
+    width: 100px;
 }
 
 .mp_property > .prop-controller
 {
-  float: right;
-  clear: left;
-  width: auto;
-  margin: 0px 0px 3px 0px;
+    position:relative;
+    top:12px;
+    left: 10px;
+    float: left;
+}
+
+.mp_property .hottext,
+.mp_property .hottextInput
+{
+    width: 30px;
+}
+
+.mp_property .button
+{
+    width: 30px;
+    height: 20px;
+}
+
+.mp_property .inputRow
+{
+    top: 8px;
+    position: relative;
+}
+
+.mp_properties_list
+{
+   padding-bottom: 8px;
+}
+
+.mp_properties_list > .mp_property > .colortoolbar
+{
+        width: 27px !important;
+        height: 27px !important;
+    overflow:hidden !important;
 }
 
 .mp_buttons {
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 @@
                 <script type="text/montage-serialization">
         {
             "okButton": {
-                "module": "js/components/button.reel",
+                "module": "montage/ui/button.reel",
                 "name": "Button",
                 "properties": {
                     "element": {"#": "mp_ok_btn"},
@@ -22,7 +22,7 @@
                 }
             },
             "cancelButton": {
-                "module": "js/components/button.reel",
+                "module": "montage/ui/button.reel",
                 "name": "Button",
                 "properties": {
                     "element": {"#": "mp_cancel_btn"},
@@ -104,15 +104,15 @@
 
             <hr />
 
-            <div id="mp_properties_list" class="mp_properties_list" style="-webkit-user-select: none;">
+            <div id="mp_properties_list" class="mp_properties_list">
                 <div id="mp_property" class="mp_property"></div>
             </div>
 
             <hr />
             
             <div id="mp_buttons" class="mp_buttons">
-                <button id="mp_cancel_btn" class="mp_cancel_btn"></button>
-                <button id="mp_ok_btn" class="mp_ok_btn"></button>
+                <button id="mp_cancel_btn" class="mp_cancel_btn nj-skinned"></button>
+                <button id="mp_ok_btn" class="mp_ok_btn nj-skinned"></button>
             </div>
 
         </div>
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.js b/js/panels/Materials/materials-popup.reel/materials-popup.js
index c57bb2d7..bbccf45d 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.js
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.js
@@ -5,9 +5,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 </copyright> */
 
 var Montage = require("montage/core/core").Montage,
-    Component   = require("montage/ui/component").Component;
-var Button =                    require("js/components/button.reel").Button;
-var MaterialsModel = require("js/models/materials-model").MaterialsModel;
+    Component   = require("montage/ui/component").Component,
+    MaterialsModel = require("js/models/materials-model").MaterialsModel;
 
 ////////////////////////////////////////////////////////////////////////
 //Exporting as MaterialsPopup
@@ -215,7 +214,11 @@ exports.MaterialsPopup = Montage.create(Component, {
                 enumerable: true,
                 value: function(materialID)
                 {
-           this._materialName = materialID;
+            // Note that setting Array.length = 0 will empty arrays,
+            // which is fine if you use getMaterialData to get a new array, but not for the
+            // dummyData arrays.
+            this._materialsData.length = 0;
+            this._materialName = materialID;
             if(
                                         (materialID ===  "UberMaterial")                                ||
                                         (materialID ===  "FlatMaterial")                                ||
@@ -234,7 +237,7 @@ exports.MaterialsPopup = Montage.create(Component, {
             }
             else
             {
-                this.materialsData = this._dummyData1;
+                this.materialsData = this._dummyData1.slice(0);
             }
             
            this.needsDraw = true;