[Rt-commit] rt branch, 4.6/shrink-merge-box, created. rt-4.4.4-721-g1a7ed61c48

[Jim Brandt]

The branch, 4.6/shrink-merge-box has been created
        at  1a7ed61c4885a3389048ff7e34a2f3d5617eb663 (commit)

- Log -----------------------------------------------------------------
commit 1a7ed61c4885a3389048ff7e34a2f3d5617eb663
Author: Jim Brandt <jbrandt at bestpractical.com>
Date:   Mon Jan 27 17:23:16 2020 -0500

    Improve merge ticket styling on Links page
    
    Reduce the width of the input box for merge tickets on the Links
    page, but still allow an alternate style for the inline edit
    box on the ticket display page.

diff --git a/share/html/Ticket/Elements/EditMerge b/share/html/Ticket/Elements/EditMerge
index 99290bd9fa..efaf27337e 100644
--- a/share/html/Ticket/Elements/EditMerge
+++ b/share/html/Ticket/Elements/EditMerge
@@ -45,14 +45,13 @@
 %# those contributions and any derivatives thereof.
 %#
 %# END BPS TAGGED BLOCK }}}
-<i>
+<div class='ticket-merge-text <% $MergeTextClass %>'>
 <&|/l&>Warning: merging is a non-reversible action! Enter a single ticket number to be merged into.</&>
-</i>
-
+</div>
 <div>
   <div class="form-row">
-    <div class="label col-md-3"><&|/l&>Merge into</&>:</div>
-    <div class="value col-md-9"><input type="text" class="form-control" name="<% $Name %>" value="<% $Default || '' %>" data-autocomplete="Tickets" data-autocomplete-exclude="<% join( ' ', @excludes) || '' %>" /></div>
+    <div class="label <% $LabelStyle %>"><&|/l&>Merge into</&>:</div>
+    <div class="value <% $ValueStyle %>"><input type="text" class="form-control" name="<% $Name %>" value="<% $Default || '' %>" data-autocomplete="Tickets" data-autocomplete-exclude="<% join( ' ', @excludes) || '' %>" /></div>
   </div>
 </div>
 
@@ -76,4 +75,7 @@ $Ticket => undef
 $Tickets => undef
 $Name => ''
 $Default => ''
+$MergeTextClass => 'ticket-merge-position'
+$LabelStyle => 'col-md-2'
+$ValueStyle => 'col-md-4'
 </%ARGS>
diff --git a/share/html/Ticket/Elements/ShowSummary b/share/html/Ticket/Elements/ShowSummary
index 388a6200a7..0c5ffdab9b 100644
--- a/share/html/Ticket/Elements/ShowSummary
+++ b/share/html/Ticket/Elements/ShowSummary
@@ -204,7 +204,8 @@ push @extra, (titleright_raw => $links_titleright) if $links_titleright;
                 <& /Elements/EditLinks, Object => $Ticket, TwoColumn => 0 &>
 
                 <h3><&|/l&>Merge</&></h3>
-                <& /Ticket/Elements/EditMerge, Ticket => $Ticket, %ARGS &>
+                <& /Ticket/Elements/EditMerge, Ticket => $Ticket, LabelStyle => 'col-md-3',
+                   ValueStyle => 'col-md-9', MergeTextClass => '', %ARGS &>
 
                 <div class="form-row">
                   <div class="col-md-12 text-right">
diff --git a/share/static/css/elevator-light/ticket.css b/share/static/css/elevator-light/ticket.css
index 5bf0a1df7e..100891e72f 100644
--- a/share/static/css/elevator-light/ticket.css
+++ b/share/static/css/elevator-light/ticket.css
@@ -140,3 +140,11 @@ ul.select-queue li + li {
 ul.select-queue li a:visited {
     color: #000;
 }
+
+.ticket-merge-text {
+    font-style: italic;
+}
+
+.ticket-merge-position {
+    padding-left: 2em;
+}

-----------------------------------------------------------------------