Merge branch 'refs/heads/master' into CSSPanelUpdates

Conflicts:
	js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js

1 files changed, 14 insertions, 0 deletions

diff --git a/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.css b/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.css
new file mode 100755
index 00000000..227a232b
--- /dev/null
+++ b/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.css
@@ -0,0 +1,14 @@
+/* <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;
+}
\ No newline at end of file