[Rt-commit] rt branch, 4.6/fix-inconsistent-ticket-display-spacing, created. rt-4.4.4-773-g1fff1da47
? sunnavy
sunnavy at bestpractical.com
Thu Feb 13 14:02:56 EST 2020
The branch, 4.6/fix-inconsistent-ticket-display-spacing has been created
at 1fff1da477fc0df659daba035c6d09c4198fe9f4 (commit)
- Log -----------------------------------------------------------------
commit d8fad8726114bf57ad0661c47b9bc45e3d99943b
Author: Craig Kaiser <craig at bestpractical.com>
Date: Mon Jan 27 08:15:30 2020 -0500
Remove unnecessary <br> tag on ticket pages
diff --git a/share/html/Ticket/Create.html b/share/html/Ticket/Create.html
index f2e03be80..4a2eee722 100644
--- a/share/html/Ticket/Create.html
+++ b/share/html/Ticket/Create.html
@@ -277,7 +277,7 @@
</div>
</div>
</&>
-<br />
+
<div class="ticket-info-dates">
<&|/Widgets/TitleBox, title => loc("Dates"),
title_class=> 'inverse',
@@ -304,7 +304,7 @@
</&>
</div>
</div>
-<br />
+
</div>
<div class="boxcontainer col-md-6">
@@ -317,7 +317,6 @@
&>
</&>
</div>
-<br />
</div>
</div>
diff --git a/share/html/Ticket/Display.html b/share/html/Ticket/Display.html
index 5c2642b32..1ad1d1c68 100644
--- a/share/html/Ticket/Display.html
+++ b/share/html/Ticket/Display.html
@@ -85,7 +85,6 @@ my $titleright = qq{
<& /Ticket/Elements/ShowSummary, Ticket => $TicketObj, Attachments => $attachments, InlineEdit => $InlineEdit &>
</&>
</div>
-<br />
% $m->callback( Ticket => $TicketObj, %ARGS, Transactions => $transactions, Attachments => $attachments, CallbackName => 'BeforeShowHistory' );
diff --git a/share/html/Ticket/Forward.html b/share/html/Ticket/Forward.html
index 42bbc9d14..5061cf9a0 100644
--- a/share/html/Ticket/Forward.html
+++ b/share/html/Ticket/Forward.html
@@ -53,7 +53,7 @@
<form action="Forward.html" id="ForwardMessage" name="ForwardMessage" method="post">
% $m->callback( CallbackName => 'FormStart', ARGSRef => \%ARGS );
-<input type="hidden" class="hidden" name="id" value="<% $id %>" /><br />
+<input type="hidden" class="hidden" name="id" value="<% $id %>" />
<input type="hidden" class="hidden" name="QuoteTransaction" value="<% $ARGS{'QuoteTransaction'} || '' %>" />
<& /Elements/Crypt/SignEncryptWidget:ShowIssues, self => $gnupg_widget &>
diff --git a/share/html/Ticket/History.html b/share/html/Ticket/History.html
index f617380d1..239d4e15f 100644
--- a/share/html/Ticket/History.html
+++ b/share/html/Ticket/History.html
@@ -50,9 +50,6 @@
% $m->callback( %ARGS, Ticket => $Ticket, CallbackName => 'BeforeActionList' );
-
-<br />
-
<& /Elements/ShowHistory,
Object => $Ticket,
ShowHeaders => $ARGS{'ShowHeaders'},
diff --git a/share/html/Ticket/ModifyAll.html b/share/html/Ticket/ModifyAll.html
index 0a2ce9cab..b64aa2174 100644
--- a/share/html/Ticket/ModifyAll.html
+++ b/share/html/Ticket/ModifyAll.html
@@ -72,27 +72,18 @@
<& Elements/EditDates, TicketObj => $Ticket &>
</&>
-<br />
-
-
<&| /Widgets/TitleBox, title => loc('People'), class=>'ticket-info-people' &>
<& Elements/EditPeople, Ticket => $Ticket, UserField => $UserField, UserString => $UserString, UserOp => $UserOp, GroupString => $GroupString, GroupOp => $GroupOp, GroupField => $GroupField &>
</&>
-<br />
-
<&| /Widgets/TitleBox, title => loc('Links'), class=>'ticket-info-links' &>
<& /Elements/EditLinks, Object => $Ticket &>
</&>
-<br />
-
<&| /Widgets/TitleBox, title => loc('Merge'), class=>'ticket-info-merge' &>
<& Elements/EditMerge, Ticket => $Ticket, %ARGS &>
</&>
-<br />
-
<&| /Widgets/TitleBox, title => loc('Update ticket'), class => 'messagedetails' &>
<div>
<div class="form-row input-row">
commit 6be74d0864395bd90e1f6d39013dfa5702a60c59
Author: Craig Kaiser <craig at bestpractical.com>
Date: Mon Jan 27 12:45:58 2020 -0500
Remove individual padding rule for ticket elememts
Having unqiue padding rules for only some ticket components leads to
incorrect spacing.
diff --git a/share/static/css/elevator-light/ticket.css b/share/static/css/elevator-light/ticket.css
index 492517604..fd3fa8839 100644
--- a/share/static/css/elevator-light/ticket.css
+++ b/share/static/css/elevator-light/ticket.css
@@ -64,18 +64,6 @@
font-style: normal;
}
-.summary {
- padding-top: .1em;
-}
-
-div#body .ticket-info-basics,
-div#body .ticket-info-people,
-div#body .ticket-info-dates,
-div#body .ticket-info-links,
-div#body .ticket-info-reminders {
- padding-top: .1em;
-}
-
.unread-messages .titlebox-content :link {
text-decoration: underline;
}
commit 1785a5f6e2007beae294de0d327ac9fa0d591ade
Author: Craig Kaiser <craig at bestpractical.com>
Date: Mon Jan 27 12:59:57 2020 -0500
Remove margin from bottom of titlebox
Having a margin-bottom rule for titleboxes adds unwanted white-space
at the bottom of a titleboxes and the next component. For example
between the last titleboxe in the ticket summay div and the start of
the ticket history div.
diff --git a/share/static/css/elevator-light/boxes.css b/share/static/css/elevator-light/boxes.css
index ba017d195..12f0027f3 100644
--- a/share/static/css/elevator-light/boxes.css
+++ b/share/static/css/elevator-light/boxes.css
@@ -1,6 +1,5 @@
.titlebox {
margin-top: 1em;
- margin-bottom: 2em;
padding: 5px;
}
commit 27b974afb2ab6c9d930d957bf822921d6c42bc6b
Author: Craig Kaiser <craig at bestpractical.com>
Date: Thu Feb 6 08:56:21 2020 -0500
Remove outdated padding setting specifically for smaller screen sizes
It caused inconsistent spacing. We will tweak padding later for small
screen sizes.
diff --git a/share/static/css/elevator-light/layout.css b/share/static/css/elevator-light/layout.css
index eb30e3142..12a564a73 100644
--- a/share/static/css/elevator-light/layout.css
+++ b/share/static/css/elevator-light/layout.css
@@ -13,23 +13,6 @@ div#body {
z-index: 1;
}
- at media (max-width: 800px) {
- div#body {
- padding: 3em 4.875%; /* 3em at 13px font size => 39px => 39/800 => .04875 */
- }
- /* at narrow widths we'll have broken into a single column, so the default
- padding-right just causes the layout to degrade */
- .boxcontainer {
- padding-right: 0;
- }
-}
-
- at media (max-width: 700px) {
- div#body {
- padding: 3em 0;
- }
-}
-
div#footer {
position: absolute;
font-size: 0.8em;
commit e0241ec823e1190c2881facb92b1aff8e8cbc039
Author: sunnavy <sunnavy at bestpractical.com>
Date: Wed Feb 12 01:09:10 2020 +0800
Wrap Submit into a form-row on ticket modify pages
We do so consistently, and specially as .titlebox doesn't have
margin-bottom any more, we need this to get a decent spacing.
diff --git a/share/html/Ticket/Modify.html b/share/html/Ticket/Modify.html
index 070875335..a5adee4ae 100644
--- a/share/html/Ticket/Modify.html
+++ b/share/html/Ticket/Modify.html
@@ -65,7 +65,11 @@
<& /Elements/EditCustomFieldCustomGroupings, %ARGS, Object => $TicketObj, AsTable => !!RT->Config->Get('EditCustomFieldsSingleColumn', $session{'CurrentUser'}) &>
-<& /Elements/Submit, Name => 'SubmitTicket', Label => loc('Save Changes'), Caption => loc("If you've updated anything above, be sure to"), color => "#993333" &>
+ <div class="form-row">
+ <div class="col-md-12">
+ <& /Elements/Submit, Name => 'SubmitTicket', Label => loc('Save Changes'), Caption => loc("If you've updated anything above, be sure to"), color => "#993333" &>
+ </div>
+ </div>
</form>
% $m->callback(CallbackName => 'AfterForm', ARGSRef => \%ARGS, Ticket => $TicketObj);
diff --git a/share/html/Ticket/ModifyDates.html b/share/html/Ticket/ModifyDates.html
index c1149bc3a..c73a02164 100644
--- a/share/html/Ticket/ModifyDates.html
+++ b/share/html/Ticket/ModifyDates.html
@@ -57,7 +57,11 @@
<&| /Widgets/TitleBox,title => loc('Modify dates for ticket #[_1]', $TicketObj->Id), class=> 'ticket-info-dates' &>
<& Elements/EditDates, TicketObj => $TicketObj &>
</&>
-<& /Elements/Submit, Name => 'SubmitTicket', Label => loc('Save Changes') &>
+ <div class="form-row">
+ <div class="col-md-12">
+ <& /Elements/Submit, Name => 'SubmitTicket', Label => loc('Save Changes') &>
+ </div>
+ </div>
</form>
% $m->callback(CallbackName => 'AfterForm', ARGSRef => \%ARGS, Ticket => $TicketObj);
diff --git a/share/html/Ticket/ModifyLinks.html b/share/html/Ticket/ModifyLinks.html
index 4361deeaa..1b93d03d2 100644
--- a/share/html/Ticket/ModifyLinks.html
+++ b/share/html/Ticket/ModifyLinks.html
@@ -65,7 +65,11 @@
<& Elements/EditMerge, Ticket => $Ticket, %ARGS &>
</&>
-<& /Elements/Submit, Name => 'SubmitTicket', Label => loc('Save Changes') &>
+ <div class="form-row">
+ <div class="col-md-12">
+ <& /Elements/Submit, Name => 'SubmitTicket', Label => loc('Save Changes') &>
+ </div>
+ </div>
</form>
% $m->callback(CallbackName => 'AfterForm', ARGSRef => \%ARGS, Ticket => $Ticket);
diff --git a/share/html/Ticket/ModifyPeople.html b/share/html/Ticket/ModifyPeople.html
index 8e08c8e41..0c32293c9 100644
--- a/share/html/Ticket/ModifyPeople.html
+++ b/share/html/Ticket/ModifyPeople.html
@@ -84,7 +84,11 @@ my $all_recipients_checked = (grep { !$_ } values %recips) ? 0 : 1;
% }
</ul>
</&>
-<& /Elements/Submit, Name => 'SubmitTicket', Label => loc('Save Changes'), Caption => loc("If you've updated anything above, be sure to"), color => "#333399" &>
+ <div class="form-row">
+ <div class="col-md-12">
+ <& /Elements/Submit, Name => 'SubmitTicket', Label => loc('Save Changes'), Caption => loc("If you've updated anything above, be sure to"), color => "#333399" &>
+ </div>
+ </div>
</form>
% $m->callback(CallbackName => 'AfterForm', ARGSRef => \%ARGS, Ticket => $Ticket);
commit e0c38082eb18f5b8cad61d5612e96c3f373e07b8
Author: sunnavy <sunnavy at bestpractical.com>
Date: Wed Feb 12 01:28:33 2020 +0800
Use consistent border spacing for titleboxes
This covers x and y axes and also nested titleboxes
diff --git a/share/static/css/elevator-light/boxes.css b/share/static/css/elevator-light/boxes.css
index 12f0027f3..7c3a3a332 100644
--- a/share/static/css/elevator-light/boxes.css
+++ b/share/static/css/elevator-light/boxes.css
@@ -1,11 +1,20 @@
.titlebox {
- margin-top: 1em;
+ margin-top: 20px;
padding: 5px;
}
+.titlebox .boxcontainer > :first-child > .titlebox {
+ margin-top: 15px;
+}
+
+.boxcontainer:not(:first-of-type) {
+ padding-left: 5px;
+}
+
.titlebox .titlebox-title {
position: relative;
background-color: transparent;
+ padding-bottom: 0;
}
.titlebox .titlebox-title a {
@@ -88,7 +97,7 @@ div.results .titlebox .titlebox-content {
}
.titlebox .card-body {
- padding-top: 0;
+ padding: 0 15px 15px 15px;
}
/* Ticket display page colored top borders */
commit 1fff1da477fc0df659daba035c6d09c4198fe9f4
Author: sunnavy <sunnavy at bestpractical.com>
Date: Fri Feb 14 02:54:48 2020 +0800
Use the same padding for the container of the outer titlebox
diff --git a/share/static/css/elevator-light/layout.css b/share/static/css/elevator-light/layout.css
index 12a564a73..4c2993c60 100644
--- a/share/static/css/elevator-light/layout.css
+++ b/share/static/css/elevator-light/layout.css
@@ -5,8 +5,7 @@ html {
}
div#body {
- padding: 0 2.5em;
- margin-top: 0.3em;
+ padding: 0 20px;
margin-right: 0;
margin-bottom: 0em;
background: #fff;
@@ -107,7 +106,7 @@ div#header {
div#header h1 {
font-size: 1.4em;
- padding-left: 2em;
+ padding-left: 20px;
display: inline-block;
}
@@ -152,5 +151,5 @@ ol ol {
overflow: hidden;
display: block;
position: relative;
- padding-bottom: 5em;
+ padding-bottom: 5.15em;
}
-----------------------------------------------------------------------
More information about the rt-commit
mailing list