Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes

Conflicts:
	js/helper-classes/3D/StageLine.js

1 files changed, 17 insertions, 1 deletions

diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css
index d73134ae..39294779 100755
--- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css
+++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css
@@ -39,6 +39,12 @@ POSSIBILITY OF SUCH DAMAGE.
     margin: 4px 0 4px 0;
 }
 
+.materials_library_panel .ml_tree_holder {
+    height: 200px;
+    min-height: 200px;
+    max-height: 200px;
+    overflow-y: scroll;
+}
 
 .ml_buttons {
     clear:both;
@@ -54,9 +60,19 @@ POSSIBILITY OF SUCH DAMAGE.
     cursor: pointer;
     margin: 0 1px;
     float: left;
+    width: 40px;
+}
+
+.ml_buttons .ml_duplicate_btn {
     width: 60px;
 }
 
-.ml_buttons .nj-skinned:last-child {
+.ml_buttons .ml_delete_btn {
+    width: 50px;
     float: right;
 }
+
+.ml_buttons .nj-skinned:hover,
+.ml_buttons .nj-skinned:active {
+    color: white;
+}
\ No newline at end of file