From 11ddde01a7fc75b7ec47ed364f29ab9d5d0727c0 Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Mon, 13 Apr 2020 14:27:11 -0400
Subject: [PATCH] Fixed dataset and file pg btn dropdown align and margin
 issues [ref #6684]

---
 src/main/webapp/dataset.xhtml               | 2 +-
 src/main/webapp/file.xhtml                  | 5 +++--
 src/main/webapp/resources/css/structure.css | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index b7346948d57..96b6eea9a59 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -807,7 +807,7 @@
                                         <button class="btn btn-default btn-export dropdown-toggle" type="button" data-toggle="dropdown">
                                             <span class="glyphicon glyphicon-export"/> #{bundle['dataset.exportBtn']} <span class="caret"></span>
                                         </button>
-                                        <ul class="dropdown-menu" role="menu">
+                                        <ul class="dropdown-menu pull-right text-left">
                                             <ui:repeat var="exporter" value="#{DatasetPage.exporters}">
                                                 <li>
                                                     <h:outputLink value="#{exporter[1]}" target="_blank">
diff --git a/src/main/webapp/file.xhtml b/src/main/webapp/file.xhtml
index 0fac9d27e39..8d8bf06875b 100644
--- a/src/main/webapp/file.xhtml
+++ b/src/main/webapp/file.xhtml
@@ -401,11 +401,12 @@
                                         </div>
                                         
                                         
-                                        
                                         <!-- DEACCESSION ONLY?? NO SUMMARY BLOCK?? RESPONSIVE ORDER HACK BOOTSTRAP 3 https://stackoverflow.com/a/24834574 -->
                                         <div jsf:rendered="#{FilePage.fileMetadata.datasetVersion.deaccessioned}" 
                                              id="dataset-colorder-block" class="visible-md-block visible-lg-block col-md-8 col-lg-9"><!--Hack--></div>
                                         <!-- END: RESPONSIVE ORDER HACK BOOTSTRAP 3 -->
+                                        
+                                        
                                         <!-- DEACCESSION REASON -->
                                         <div class="col-xs-12 col-sm-12 col-md-8 col-lg-9 margin-bottom" jsf:rendered="#{FilePage.fileMetadata.datasetVersion.deaccessioned}">
                                             <div id="deaccession-reason-block" class="col-xs-12 bg-danger">
@@ -546,7 +547,7 @@
                                         <button class="btn btn-default btn-export dropdown-toggle" type="button" data-toggle="dropdown">
                                             <span class="glyphicon glyphicon-export"/> #{bundle['dataset.exportBtn']} <span class="caret"/>
                                         </button>
-                                        <ul class="dropdown-menu" role="menu">
+                                        <ul class="dropdown-menu pull-right text-left">
                                             <ui:repeat var="exporter" value="#{FilePage.getExporters()}">
                                                 <li>
                                                     <h:outputLink value="#{exporter[1]}" target="_blank">
diff --git a/src/main/webapp/resources/css/structure.css b/src/main/webapp/resources/css/structure.css
index 2622a457754..1cec41ed9b8 100644
--- a/src/main/webapp/resources/css/structure.css
+++ b/src/main/webapp/resources/css/structure.css
@@ -390,7 +390,8 @@ td.col-file-action > .button-block, .col-manage-action > .button-block,
 div.ui-datatable-header > .button-block, .button-block.tab-header, #actionButtonBlock > .button-block, .inline-buttons > .button-block {margin-top:0;}
 th.col-file-action.text-right {text-align: right;}
 form.btn-form {display:inline-block;}
-.button-block button, .button-block a.btn, .button-block input.btn, .button-block div.btn-group, .button-block span.btn.ui-state-disabled, .button-block .button-container {margin-right:1em;}
+.button-block button, .button-block a.btn, .button-block input.btn, .button-block div.btn-group, .button-block .button-container,
+.button-block span.btn.ui-state-disabled, .button-block span.btn.disabled {margin-right:1em;}
 
 /*td.col-file-action span.ingest-warning, .button-block span.ingest-warning {margin-left:.5em;}*/