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

Conflicts:
	js/components/layout/tools-list.reel/tools-list.html
	js/components/layout/tools-properties.reel/tools-properties.html
	js/components/tools-properties/brush-properties.reel/brush-properties.html
	js/components/tools-properties/fill-properties.reel/fill-properties.html
	js/components/tools-properties/pen-properties.reel/pen-properties.html
	js/components/tools-properties/pencil-properties.reel/pencil-properties.html
	js/components/tools-properties/selection-properties.reel/selection-properties.html
	js/components/tools-properties/shape-properties.reel/shape-properties.html
	js/components/tools-properties/tag-properties.reel/tag-properties.html
	js/components/tools-properties/text-properties.reel/text-properties.html

1 files changed, 10 insertions, 5 deletions

diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.css b/js/panels/Materials/materials-popup.reel/materials-popup.css
index 2d339411..943d9bcb 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.css
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.css
@@ -21,15 +21,15 @@
     background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0.5, #1d1d1d), color-stop(0.75, #424242));
     border: none;
     height: 2px;
-    margin: 4px 0px 4px 0px;
+    margin: 4px 0 4px 0;
 }
 
-#mp_title {
-    margin: 4px 0px 0px 0px;
+.mp_title {
+    margin: 4px 0 0 0;
     text-align: center;
 }
 
-#mp_preview {
+.mp_preview {
     height: 100px;
     text-align: center;
 }
@@ -84,12 +84,17 @@
         width: 27px !important;
         height: 27px !important;
     overflow:hidden !important;
+    margin-top: -6px;
+}
+
+.mp_properties_list .mp_property:first-child {
+    margin-bottom: 12px;
 }
 
 .mp_buttons {
     clear:both;
     float: left;
-    margin: 0px -4px 0px 4px;
+    margin: 0 -4px 4px 4px;
     width: 97%;
 }