Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste

Conflicts:
	js/controllers/styles-controller.js

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

1 files changed, 15 insertions, 1 deletions

diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.css b/js/components/tools-properties/shape-properties.reel/shape-properties.css
index 0441c1cf..49d0c778 100755
--- a/js/components/tools-properties/shape-properties.reel/shape-properties.css
+++ b/js/components/tools-properties/shape-properties.reel/shape-properties.css
@@ -2,4 +2,18 @@
  This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
  (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
- </copyright> */
\ No newline at end of file
+ </copyright> */
+ 
+.optionsShapeTool select.nj-skinned {
+    margin-top: 2px;
+}
+
+.optionsShapeTool .shapeCustomProps {
+    margin-top: 0px;
+    margin-left: -7px;
+}
+
+.optionsShapeTool checkbox {
+    padding: 6px;
+    margin-left: 4px;
+}
\ No newline at end of file