From 74343260061e5dc2813efccbff740fe8e3a7b829 Mon Sep 17 00:00:00 2001
From: Dannon Baker <dannon.baker@gmail.com>
Date: Thu, 18 Jan 2018 15:32:08 -0500
Subject: [PATCH 1/2] Constrain tag editor height, minor refactoring.  Will be
 removed with the conversion to a vue component that can pop out with a more
 flexible display.

---
 client/galaxy/style/less/base.less    | 13 +++++++++++++
 client/galaxy/style/less/dataset.less |  9 +--------
 client/galaxy/style/less/history.less | 11 -----------
 3 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/client/galaxy/style/less/base.less b/client/galaxy/style/less/base.less
index f5ba8069140..4bad662448e 100644
--- a/client/galaxy/style/less/base.less
+++ b/client/galaxy/style/less/base.less
@@ -1887,6 +1887,19 @@ div.toolTitleNoSection
   opacity: 1;
 }
 
+/* Temporary tag editor display; will be moved to a scoped Vue SFC upon refactoring */
+.tags-display {
+    max-height: 80px;
+    overflow: auto;
+    .list-item .vertical-spacing;
+    .select2-container {
+        min-width: 0px;
+        .select2-choices {
+            border-radius: 3px;
+        }
+    }
+}
+
 /* For Vue */
 [v-cloak] {
     display:none;
diff --git a/client/galaxy/style/less/dataset.less b/client/galaxy/style/less/dataset.less
index 196a4451ed3..e9e4d32a6ee 100644
--- a/client/galaxy/style/less/dataset.less
+++ b/client/galaxy/style/less/dataset.less
@@ -263,16 +263,9 @@
             }
         }
 
-        //TODO: move these out
         .tags-display {
+            // Hidden by default; the interface toggles this.
             display: none;
-            .list-item .vertical-spacing;
-            .select2-container {
-                min-width: 0px;
-                .select2-choices {
-                    border-radius: 3px;
-                }
-            }
         }
         .annotation-display {
             display: none;
diff --git a/client/galaxy/style/less/history.less b/client/galaxy/style/less/history.less
index 7673caed008..731e809e6ce 100644
--- a/client/galaxy/style/less/history.less
+++ b/client/galaxy/style/less/history.less
@@ -66,17 +66,6 @@
                 content: ':';
             }
         }
-        .tags-display {
-            .select2-container {
-                min-width: 0px;
-                .select2-choices {
-                    border-radius: 3px;
-                }
-            }
-            input {
-                border-radius: 3px;
-            }
-        }
         .annotation-display {
             .annotation {
                 background: white;

From d51ea5d200412af2c0a8a8158a8265530858ebe6 Mon Sep 17 00:00:00 2001
From: Dannon Baker <dannon.baker@gmail.com>
Date: Thu, 18 Jan 2018 15:35:38 -0500
Subject: [PATCH 2/2] Constrain the select2 container for the tags display,
 instead of the outer box; this prevents the prompt from (in some cases)
 taking the space.

---
 client/galaxy/style/less/base.less | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/galaxy/style/less/base.less b/client/galaxy/style/less/base.less
index 4bad662448e..9f8db6d3181 100644
--- a/client/galaxy/style/less/base.less
+++ b/client/galaxy/style/less/base.less
@@ -1889,10 +1889,10 @@ div.toolTitleNoSection
 
 /* Temporary tag editor display; will be moved to a scoped Vue SFC upon refactoring */
 .tags-display {
-    max-height: 80px;
-    overflow: auto;
     .list-item .vertical-spacing;
     .select2-container {
+        max-height: 80px;
+        overflow: auto;
         min-width: 0px;
         .select2-choices {
             border-radius: 3px;