Merge branch 'master' into components

Conflicts:
	node_modules/montage/ui/bluemoon/progress.reel/progress.html
	node_modules/montage/ui/image2.reel/image2.html
	node_modules/ninja-components/effect/desaturate-effect.js
	node_modules/ninja-components/effect/effect.js
	node_modules/ninja-components/effect/invert-effect.js
	node_modules/ninja-components/effect/kaliedoscope-effect.js
	node_modules/ninja-components/effect/multiply-effect.js
	node_modules/ninja-components/effect/sepia-effect.js
	node_modules/ninja-components/flow-controller.reel/flow-controller.html
	node_modules/ninja-components/flow-controller.reel/flow-controller.js
	node_modules/ninja-components/flow-offset.js
	node_modules/ninja-components/hottext.reel/hottext.css
	node_modules/ninja-components/hottext.reel/hottext.html
	node_modules/ninja-components/hottext.reel/hottext.js
	node_modules/ninja-components/hottextunit.reel/hottextunit.css
	node_modules/ninja-components/hottextunit.reel/hottextunit.html
	node_modules/ninja-components/hottextunit.reel/hottextunit.js
	node_modules/ninja-components/image2.reel/image2.html
	node_modules/ninja-components/image2.reel/image2.js
	node_modules/ninja-components/image3d.reel/image3d.html
	node_modules/ninja-components/image3d.reel/image3d.js
	node_modules/ninja-components/photo-editor.reel/photo-editor.css
	node_modules/ninja-components/photo-editor.reel/photo-editor.html
	node_modules/ninja-components/photo-editor.reel/photo-editor.js
	node_modules/ninja-components/slider-base.js
	user-document-templates/montage-application-cloud/appdelegate.js

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

1 files changed, 36 insertions, 0 deletions

diff --git a/node_modules/montage/ui/bluemoon/textarea.reel/textarea.css b/node_modules/montage/ui/bluemoon/textarea.reel/textarea.css
new file mode 100644
index 00000000..4164fdc9
--- /dev/null
+++ b/node_modules/montage/ui/bluemoon/textarea.reel/textarea.css
@@ -0,0 +1,36 @@
+/* <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-textarea {
+    width: 300px;
+    height: 100px;
+    line-height: 1em;
+    z-index: 1;
+    cursor: pointer;
+    background-color: hsl(0, 0%, 80%);
+    border: 1px solid hsl(0, 0%, 40%);
+    padding: 5px;
+    font-size: 1.0em;
+}
+
+.montage-textarea: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;
+    */
+}