From fb2dd89a65946a13e02eef99fbf31d76f7934c00 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Fri, 29 Apr 2016 21:15:14 -0400
Subject: [PATCH] Adjust multiCombo styling

---
 css/app.css              | 29 ++++++++++++++++++++++-------
 js/id/ui/preset/combo.js |  5 +++--
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/css/app.css b/css/app.css
index c3b1f8a68..36ec32e1e 100644
--- a/css/app.css
+++ b/css/app.css
@@ -298,6 +298,7 @@ ul li { list-style: none;}
 .al { left: 0; }
 .ar { right: 0; }
 
+input.hide,
 div.hide,
 form.hide,
 button.hide,
@@ -1018,7 +1019,7 @@ button.save.has-count .count::before {
 }
 
 .form-label button {
-    border-left: 1px solid #CCC;
+    border-left: 1px solid #ccc;
     width: 10%;
     height: 100%;
     border-radius: 0;
@@ -1041,7 +1042,7 @@ button.save.has-count .count::before {
 .form-field > input,
 .form-field > textarea,
 .form-field .preset-input-wrap {
-    border: 1px solid #CCC;
+    border: 1px solid #ccc;
     min-height: 30px;
     border-top: 0;
     border-radius: 0 0 4px 4px;
@@ -1053,23 +1054,30 @@ button.save.has-count .count::before {
 }
 
 .inspector-border {
-    border-bottom: 1px solid #CCC
+    border-bottom: 1px solid #ccc
 }
 
 /* Preset form (hover mode) */
 
 .inspector-hover .checkselect label:last-of-type,
 .inspector-hover .preset-input-wrap .label,
+.inspector-hover .form-field-multiselect,
 .inspector-hover input,
 .inspector-hover label {
     background: #ececec;
 }
 
 .inspector-hover a,
+.inspector-hover .form-field-multiselect .chips,
 .inspector-hover .checkselect label:last-of-type {
     color: #666;
 }
 
+.inspector-hover .form-field-multiselect .chips {
+    background: #eee;
+    border: 1px solid #ccc;
+}
+
 /* hide and remove from layout */
 .inspector-hidden,
 .inspector-hover label input[type="checkbox"],
@@ -1078,6 +1086,7 @@ button.save.has-count .count::before {
 .inspector-hover .toggle-list label span,
 .inspector-hover .inspector-inner .add-tag,
 .inspector-hover .inspector-inner .add-relation,
+.inspector-hover .form-field-multiselect .combobox-input,
 .inspector-hover .toggle-list label.remove .icon {
     height: 0;
     width: 0;
@@ -1093,6 +1102,7 @@ button.save.has-count .count::before {
 .inspector-hover .combobox-caret,
 .inspector-hover .entity-editor-pane .header button,
 .inspector-hover .spin-control,
+.inspector-hover .form-field-multiselect .chips .remove,
 .inspector-hover .hide-toggle:before,
 .inspector-hover .more-fields,
 .inspector-hover .form-label-button-wrap,
@@ -1221,14 +1231,14 @@ button.save.has-count .count::before {
     line-height: 25px;
     display: inline-block;
     padding: 2px 5px;
-    margin: 0 10px 5px 0;
+    margin: 3px;
     height: 30px;
 }
 
 .form-field-multiselect a {
     font-family: Arial, Helvetica, sans-serif !important;
     font-size: 16px !important;
-    line-height: 25px;
+    line-height: 24px;
     float: right;
     margin: 1px 0 0 5px;
     padding: 0;
@@ -1237,8 +1247,13 @@ button.save.has-count .count::before {
 }
 
 .form-field-multiselect input {
-    border: 0px;
-    width: 110px;
+    border: 1px solid #ddd;
+    width: 100px;
+    margin: 3px;
+}
+
+.form-field-multiselect .combobox-caret {
+    margin: 3px 3px 3px -30px;
 }
 
 .form-field-multiselect input:focus {
diff --git a/js/id/ui/preset/combo.js b/js/id/ui/preset/combo.js
index e29ab05f8..50590f809 100644
--- a/js/id/ui/preset/combo.js
+++ b/js/id/ui/preset/combo.js
@@ -247,9 +247,10 @@ iD.ui.preset.multiCombo = function(field, context) {
             var available = objectDifference(comboData, multiData);
             combobox.data(available);
 
-            // Hide "Add" button if there are no available multiselect options remaining..
+            // Hide "Add" button if this field uses fixed set of
+            // translateable optstrings and they're all currently used..
             container.selectAll('.combobox-input, .combobox-caret')
-                .classed('hide', !available.length);
+                .classed('hide', optstrings && !available.length);
 
 
             // Render chips