Merge pull request #6079 from dannon/dropdown-zindex-fix

[18.05] Dropdown zindex fix

client/galaxy/scripts/mvc/history/hdca-li-edit.js

@@ -1,8 +1,10 @@
+import * as _ from "underscore";
 import HDCA_LI from "mvc/history/hdca-li";
 import DC_VIEW_EDIT from "mvc/collection/collection-view-edit";
-import faIconButton from "ui/fa-icon-button";
 import _l from "utils/localization";
 
+/* global $ */
+
 //==============================================================================
 var _super = HDCA_LI.HDCAListItemView;
 /** @class Editing view for HistoryDatasetCollectionAssociation.
@@ -38,23 +40,19 @@ var HDCAListItemEdit = _super.extend(
                     <a class="delete-btn icon-btn" title="${_l("Delete")}" data-toggle="dropdown">
                         <span class="fa fa-times"></span>
                     </a>
-                    <ul class="dropdown-menu float-right" role="menu">
-                        <li>
-                            <a href="#" class="delete-collection">
+                    <div class="dropdown-menu" role="menu">
+                            <a href="#" class="dropdown-item" delete-collection">
                                 ${_l("Collection Only")}
                             </a>
-                        </li>
-                        <li>
-                            <a href="#" class="delete-collection-and-datasets">
+                            <a href="#" class="dropdown-item delete-collection-and-datasets">
                                 ${_l("Delete Datasets")}
                             </a>
-                        </li>
-                        <li style="display: ${this.purgeAllowed ? "inherit" : "none"}">
-                            <a href="#" class="delete-collection-and-purge-datasets">
+                            <a href="#" style="display: ${
+                                this.purgeAllowed ? "inherit" : "none"
+                            }" class="dropdown-item delete-collection-and-purge-datasets">
                                 ${_l("Permanently Delete Datasets")}
                             </a>
-                        </li>
-                    </ul>
+                    </div>
                 </div>`);
         },
 

client/galaxy/style/scss/history.scss

@@ -602,10 +602,6 @@
         &:last-child {
             margin-right: 0px;
         }
-        .dropdown-menu {
-            z-index: inherit;
-        }
-
         .panel-controls {
             width: 100%;
             height: ($mph-controls_height + 4);

static/style/blue/base.css

@@ -14561,8 +14561,6 @@ pre.peek {
       margin-left: 328px; }
     .multi-panel-history .history-column:last-child {
       margin-right: 0px; }
-    .multi-panel-history .history-column .dropdown-menu {
-      z-index: inherit; }
     .multi-panel-history .history-column .panel-controls {
       width: 100%;
       height: 24px;