Merge branch 'refs/heads/master' into binding

Conflicts:
	node_modules/montage/ui/application.js

Signed-off-by: Armen Kesablyan <armen@motorola.com>

1 files changed, 26 insertions, 0 deletions

diff --git a/node_modules/montage/ui/textarea.reel/textarea.css b/node_modules/montage/ui/textarea.reel/textarea.css
new file mode 100644
index 00000000..67a9738d
--- /dev/null
+++ b/node_modules/montage/ui/textarea.reel/textarea.css
@@ -0,0 +1,26 @@
+/* <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 {
+    outline: none;
+    box-sizing: border-box;
+    font-size: 12px;
+    width: 10em;
+    min-width: 10em;
+    padding: 0.5em;
+    resize: vertical;
+    border: 1px solid #b3b3b3;
+    border-radius: 3px;
+    background-color: #fff;
+}
+ 
+.montage-textarea:hover {
+  border-color: #ccc;
+}
+ 
+.montage-textarea:focus {
+  border-color: #7f7f7f;
+}
\ No newline at end of file