Merge branch 'master' into brushtool

Conflicts:
	js/controllers/elements/shapes-controller.js

1 files changed, 9 insertions, 10 deletions

diff --git a/js/components/tools-properties/rect-properties.reel/rect-properties.css b/js/components/tools-properties/rect-properties.reel/rect-properties.css
index 74509555..cbd9dde8 100755
--- a/js/components/tools-properties/rect-properties.reel/rect-properties.css
+++ b/js/components/tools-properties/rect-properties.reel/rect-properties.css
@@ -4,16 +4,15 @@
  (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
  </copyright> */
 
-.rectProperties .button {
-    border:none;
-    cursor:default;
-    text-align:center;
-    -webkit-user-select:none;
-    opacity:0.8;
-    display:table-cell;
-    vertical-align:middle;
-    background-color:#333333;
-    color:white;
+#lockButton {
+    float:left;
+    border: none;
+    background-color: transparent;
+    top: 2px;
+    opacity: 0.7;
+    width: 17px;
+    height: 18px;
+    margin-right: 10px;
 }
 
 .rectProperties .subToolButton {