From 8fe92b94ce5e1e2857d088752d94e19db7e3d8a8 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Sun, 17 Jun 2012 22:31:44 -0700 Subject: montage v11 merge into ninja Signed-off-by: Valerio Virgillito --- .../token-field/token-field.reel/token-field.css | 20 ++++++--------- .../token-field/token-field.reel/token-field.html | 29 +++++++++++----------- .../montage/ui/token-field/token.reel/token.html | 16 ++++++------ 3 files changed, 29 insertions(+), 36 deletions(-) (limited to 'node_modules/montage/ui/token-field') 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. */ -.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 diff --git a/node_modules/montage/ui/token-field/token-field.reel/token-field.html b/node_modules/montage/ui/token-field/token-field.reel/token-field.html index 2a2d98d4..1db54025 100644 --- a/node_modules/montage/ui/token-field/token-field.reel/token-field.html +++ b/node_modules/montage/ui/token-field/token-field.reel/token-field.html @@ -1,13 +1,15 @@ + - - TokenField Template - - + + - -
-
+
+
- - - +
- - + \ No newline at end of file diff --git a/node_modules/montage/ui/token-field/token.reel/token.html b/node_modules/montage/ui/token-field/token.reel/token.html index c478ef0c..e12ae329 100644 --- a/node_modules/montage/ui/token-field/token.reel/token.html +++ b/node_modules/montage/ui/token-field/token.reel/token.html @@ -1,13 +1,15 @@ + - - Token Template - - + + - @@ -42,4 +42,4 @@ ✕ - + \ No newline at end of file -- cgit v1.2.3