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, 40 insertions, 0 deletions

diff --git a/js/panels/properties.reel/sections/position-size.reel/position-size.css b/js/panels/properties.reel/sections/position-size.reel/position-size.css
new file mode 100755
index 00000000..7f8fdbc2
--- /dev/null
+++ b/js/panels/properties.reel/sections/position-size.reel/position-size.css
@@ -0,0 +1,40 @@
+/* <copyright>
+ 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> */
+
+.fieldCol .hide {
+    display: none;
+}
+
+.fieldCol .disabled {
+    color:#999999;
+}
+
+
+#posBound {
+    position: absolute;
+    left: 105px;
+    border: none;
+    background-color: transparent;
+    top: 2px;
+    opacity: 0.7;
+    width: 17px;
+    height: 18px;
+    margin-right: 10px;
+}
+
+#posBound:hover {
+    opacity: 1;
+}
+
+.unlock{
+    background: url("../../../../../images/optionsbar/unlinked.png") no-repeat;
+
+}
+
+.lockUp {
+    background: url("../../../../../images/optionsbar/link.png") no-repeat;
+}
+