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, 7 insertions, 13 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
index 38f0ae49..3ccedcf4 100644
--- 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
@@ -4,37 +4,31 @@
  (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
  </copyright> */
 
-.montage-token-field {
+.montage-tokenField {
     background: white;
     border: 1px solid #bdbdbd;
     padding: 3px 5px;
+    border-radius: 3px;
     cursor: text;
 }
 
-.montage-token-field .montage-token-list {
+.montage-tokenField-list {
     display: inline;
 }
 
-.montage-token-field input[type="text"].montage-token-autocomplete {
+.montage-tokenField-autocomplete.montage-inputText {
     -webkit-appearance: none;
     -moz-appearance: none;
     border: none;
     height: 13px;
     margin: 3px 1px;
+    padding: 0;
     outline: 0;
-    -webkit-box-shadow: none;
-    -moz-box-shadow: none;
+    vertical-align: middle;
     box-shadow: none;
     width: 2px;
 }
 
-.montage-token-field input[type="text"].montage-token-autocomplete:focus {
+.montage-tokenField-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