From 65ed3e090c5b9ec3ac0a48cc552d7c83187e4362 Mon Sep 17 00:00:00 2001
From: nathan <nathangray.bsc+github@gmail.com>
Date: Mon, 27 Jun 2022 15:27:39 -0600
Subject: [PATCH] Mail: Re-size & re-order headers in display popup

---
 mail/templates/default/app.css     |  5 +++++
 mail/templates/default/display.xet | 28 ++++++++++++++--------------
 mail/templates/mobile/app.css      |  4 ++++
 mail/templates/pixelegg/app.css    |  4 ++++
 4 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css
index bd1b5c83aa..a35b404340 100644
--- a/mail/templates/default/app.css
+++ b/mail/templates/default/app.css
@@ -550,6 +550,11 @@ div#mail-index_mailPreview > div, div#mail-index_mailPreview > et2-hbox {
 	margin: 0;
     padding: 5px;
 }
+
+#mail-display_mail_displaysubject {
+    font-size: 14px;
+}
+
 .mailDisplayContainer, .mailDisplayAttachments {
 	display: block;
 	display: -moz-inline-stack;
diff --git a/mail/templates/default/display.xet b/mail/templates/default/display.xet
index 9adcd0710a..a7af53dd30 100644
--- a/mail/templates/default/display.xet
+++ b/mail/templates/default/display.xet
@@ -10,31 +10,31 @@
             <hbox>
                 <hbox class="mailDisplayHeaders" id="mailDisplayHeadersFrom" disabled="!@FROM">
                     <description value="From"/>
-                    <et2-select-email id="FROM" readonly="true" size="small"/>
+                    <et2-select-email id="FROM" readonly="true"/>
                 </hbox>
                 <date-time id="mail_displaydate" label="Date" readonly="true" align="right"/>
             </hbox>
 
             <hbox class="mailDisplayHeaders" id="mailDisplayHeadersSender" disabled="!@SENDER">
                 <description value="on behalf of"/>
-                <et2-select-email id="SENDER" readonly="true" size="small"/>
-            </hbox>
-            <hbox class="mailDisplayHeaders" id="mailDisplayHeadersTo" disabled="!@TO">
-                <description value="To"/>
-                <et2-select-email id="TO" class="mail_extraEmails" readonly="true" size="small"/>
-            </hbox>
-            <hbox class="mailDisplayHeaders" id="mailDisplayHeadersCc" disabled="!@CC" width="100%">
-                <description value="Cc"/>
-                <et2-select-email id="CC" class="mail_extraEmails" readonly="true" size="small"/>
-            </hbox>
-            <hbox class="mailDisplayHeaders" id="mailDisplayHeadersBcc" disabled="!@BCC" width="100%">
-                <description value="Bcc"/>
-                <et2-select-email id="BCC" class="mail_extraEmails" readonly="true" size="small"/>
+                <et2-select-email id="SENDER" readonly="true"/>
             </hbox>
             <hbox class="mailDisplayHeaders" width="100%">
                 <description value="Subject"/>
                 <description id="mail_displaysubject" no_lang="1" readonly="true"/>
             </hbox>
+            <hbox class="mailDisplayHeaders" id="mailDisplayHeadersTo" disabled="!@TO">
+                <description value="To"/>
+                <et2-select-email id="TO" class="mail_extraEmails" readonly="true"/>
+            </hbox>
+            <hbox class="mailDisplayHeaders" id="mailDisplayHeadersCc" disabled="!@CC" width="100%">
+                <description value="Cc"/>
+                <et2-select-email id="CC" class="mail_extraEmails" readonly="true"/>
+            </hbox>
+            <hbox class="mailDisplayHeaders" id="mailDisplayHeadersBcc" disabled="!@BCC" width="100%">
+                <description value="Bcc"/>
+                <et2-select-email id="BCC" class="mail_extraEmails" readonly="true"/>
+            </hbox>
             <old-hbox>
                 <image id="smime_signature" src="smime_sign" statustext="Smime signed message" disabled="true"
                        align="right" width="24"/>
diff --git a/mail/templates/mobile/app.css b/mail/templates/mobile/app.css
index 81ded170dd..7aa7d6c51e 100644
--- a/mail/templates/mobile/app.css
+++ b/mail/templates/mobile/app.css
@@ -561,6 +561,9 @@ div#mail-index_mailPreview > et2-hbox {
   margin: 0;
   padding: 5px;
 }
+#mail-display_mail_displaysubject {
+  font-size: 14px;
+}
 .mailDisplayContainer,
 .mailDisplayAttachments {
   display: block;
@@ -610,6 +613,7 @@ div.mail-display > div:first-parent > div.first-parent {
 .mailDisplayHeaders {
   overflow: hidden;
   right: 8px;
+  font-size: 11px;
 }
 .mailDisplayHeaderSection {
   position: absolute;
diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index 55b6672d49..dffe8a004e 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -549,6 +549,9 @@ div#mail-index_mailPreview > et2-hbox {
   margin: 0;
   padding: 5px;
 }
+#mail-display_mail_displaysubject {
+  font-size: 14px;
+}
 .mailDisplayContainer,
 .mailDisplayAttachments {
   display: block;
@@ -598,6 +601,7 @@ div.mail-display > div:first-parent > div.first-parent {
 .mailDisplayHeaders {
   overflow: hidden;
   right: 8px;
+  font-size: 11px;
 }
 .mailDisplayHeaderSection {
   position: absolute;