Merge branch 'refs/heads/dom-architecture' into binding

Conflicts:
	css/ninja.css
	scss/imports/scss/_toolbar.scss

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

1 files changed, 40 insertions, 0 deletions

diff --git a/node_modules/montage/ui/token-field/token-field.reel/token-field.css b/node_modules/montage/ui/token-field/token-field.reel/token-field.css
new file mode 100644
index 00000000..38f0ae49
--- /dev/null
+++ b/node_modules/montage/ui/token-field/token-field.reel/token-field.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> */
+
+.montage-token-field {
+    background: white;
+    border: 1px solid #bdbdbd;
+    padding: 3px 5px;
+    cursor: text;
+}
+
+.montage-token-field .montage-token-list {
+    display: inline;
+}
+
+.montage-token-field input[type="text"].montage-token-autocomplete {
+    -webkit-appearance: none;
+    -moz-appearance: none;
+    border: none;
+    height: 13px;
+    margin: 3px 1px;
+    outline: 0;
+    -webkit-box-shadow: none;
+    -moz-box-shadow: none;
+    box-shadow: none;
+    width: 2px;
+}
+
+.montage-token-field input[type="text"].montage-token-autocomplete:focus {
+    width: 80%;
+}
+
+.montage-token-field .montage-autocomplete-wrapper {
+    display: inline-block;
+    overflow: hidden;
+    margin: 0px;
+    vertical-align: middle;
+}
\ No newline at end of file