Merge branch 'refs/heads/NinjaInternal' into Color

Conflicts:
	js/controllers/elements/shapes-controller.js
	js/data/pi/pi-data.js
	js/panels/properties/content.reel/content.js

1 files changed, 35 insertions, 0 deletions

diff --git a/node_modules/montage/ui/bluemoon/textfield.reel/textfield.css b/node_modules/montage/ui/bluemoon/textfield.reel/textfield.css
new file mode 100644
index 00000000..59e638bc
--- /dev/null
+++ b/node_modules/montage/ui/bluemoon/textfield.reel/textfield.css
@@ -0,0 +1,35 @@
+/* <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> */
+
+.montage-textfield {
+    line-height: 1em;
+    z-index: 1;
+    cursor: pointer;
+    background-color: hsl(0, 0%, 80%);
+    border: 1px solid hsl(0, 0%, 40%);
+    padding: 5px;
+    width: 300px;
+    font-size: 1.0em;
+}
+
+.montage-textfield:focus {
+    background-color: hsl(0, 100%, 99%);
+    border: 2px solid hsl(0, 0%, 40%);
+}
+
+.montage-text-invalid {
+    border: 2px solid #E73525;
+    border-style: dashed;
+}
+
+.montage-error-text {
+    /*color: #E73525;
+    margin: 2px 0;
+    background-image: url(dialog_warning.png);
+    background-repeat: no-repeat;
+    padding: 5px 0 5px 32px;
+    */
+}