From 3420fdd1879af0536f007503a074f2e15c89f8e3 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hnategh@gmail.com>
Date: Wed, 19 May 2021 12:35:19 +0200
Subject: [PATCH] Fix category column misalignment for mail ui list

---
 mail/templates/mobile/app.css    | 18 +++++++++++-------
 mail/templates/pixelegg/app.css  | 17 ++++++++++-------
 mail/templates/pixelegg/app.less |  8 +++++++-
 3 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/mail/templates/mobile/app.css b/mail/templates/mobile/app.css
index a3b27ced2c..fe8cd8c3a1 100644
--- a/mail/templates/mobile/app.css
+++ b/mail/templates/mobile/app.css
@@ -76,10 +76,10 @@ tr.mail.label1 td:first-child {
   border-left: 6px solid #ff0080 !important;
 }
 tr.mail.label2 td:first-child {
-  border-left: 6px solid  #ff8000 !important;
+  border-left: 6px solid #ff8000 !important;
 }
 tr.mail.label3 td:first-child {
-  border-left: 6px solid  #008000 !important;
+  border-left: 6px solid #008000 !important;
 }
 tr.mail.label4 td:first-child {
   border-left: 6px solid #0000ff !important;
@@ -476,7 +476,7 @@ div#mail-index_mailPreview > div {
   border: none;
 }
 #mail-compose_composeToolbar > button {
-  padding: .2em .4em;
+  padding: 0.2em 0.4em;
 }
 #mail-compose_composeToolbar > img {
   width: 16px;
@@ -489,7 +489,7 @@ div#mail-index_mailPreview > div {
   height: 16px !important;
 }
 #mail-compose_composeToolbar > button {
-  padding: .2em .4em;
+  padding: 0.2em 0.4em;
 }
 #mail-compose_to div.ms-sel-ctn,
 #mail-compose_cc .ms-sel-ctn,
@@ -497,7 +497,7 @@ div#mail-index_mailPreview > div {
   max-height: 75px;
 }
 #mail-display_toolbar > button > span {
-  padding: .2em .4em;
+  padding: 0.2em 0.4em;
 }
 #mail-display_toolbar > button > span > img {
   width: 16px;
@@ -520,7 +520,7 @@ div#mail-index_mailPreview > div {
   height: 35px;
 }
 #mail-index_toolbar > button > span {
-  padding: .2em .4em;
+  padding: 0.2em 0.4em;
 }
 #mail-index_toolbar > button > span > img {
   width: 16px;
@@ -1915,7 +1915,7 @@ input[type=button] {
   padding: 0px;
 }
 #mail-display_toolbar > button > span {
-  padding: .2em .4em;
+  padding: 0.2em 0.4em;
 }
 #mail-display_toolbar > button > span > img {
   width: 16px;
@@ -2084,6 +2084,10 @@ table#mail-index_previewAttachmentArea::-webkit-scrollbar-thumb:hover {
 #mail-index_nm.et2_nextmatch .egwGridView_outer thead tr {
   border-left: 12px solid #B4B4B4;
 }
+#mail-index_nm.et2_nextmatch .egwGridView_outer thead tr.row_category td:first-child > div {
+  margin-left: 0px;
+  padding-left: 0px;
+}
 /* import */
 /* tablets and smartphones  */
 @media all {
diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index 670013e7dc..180229cfef 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -64,10 +64,10 @@ tr.mail.label1 td:first-child {
   border-left: 6px solid #ff0080 !important;
 }
 tr.mail.label2 td:first-child {
-  border-left: 6px solid  #ff8000 !important;
+  border-left: 6px solid #ff8000 !important;
 }
 tr.mail.label3 td:first-child {
-  border-left: 6px solid  #008000 !important;
+  border-left: 6px solid #008000 !important;
 }
 tr.mail.label4 td:first-child {
   border-left: 6px solid #0000ff !important;
@@ -464,7 +464,7 @@ div#mail-index_mailPreview > div {
   border: none;
 }
 #mail-compose_composeToolbar > button {
-  padding: .2em .4em;
+  padding: 0.2em 0.4em;
 }
 #mail-compose_composeToolbar > img {
   width: 16px;
@@ -477,7 +477,7 @@ div#mail-index_mailPreview > div {
   height: 16px !important;
 }
 #mail-compose_composeToolbar > button {
-  padding: .2em .4em;
+  padding: 0.2em 0.4em;
 }
 #mail-compose_to div.ms-sel-ctn,
 #mail-compose_cc .ms-sel-ctn,
@@ -485,7 +485,7 @@ div#mail-index_mailPreview > div {
   max-height: 75px;
 }
 #mail-display_toolbar > button > span {
-  padding: .2em .4em;
+  padding: 0.2em 0.4em;
 }
 #mail-display_toolbar > button > span > img {
   width: 16px;
@@ -508,7 +508,7 @@ div#mail-index_mailPreview > div {
   height: 35px;
 }
 #mail-index_toolbar > button > span {
-  padding: .2em .4em;
+  padding: 0.2em 0.4em;
 }
 #mail-index_toolbar > button > span > img {
   width: 16px;
@@ -1903,7 +1903,7 @@ input[type=button] {
   padding: 0px;
 }
 #mail-display_toolbar > button > span {
-  padding: .2em .4em;
+  padding: 0.2em 0.4em;
 }
 #mail-display_toolbar > button > span > img {
   width: 16px;
@@ -2072,3 +2072,6 @@ table#mail-index_previewAttachmentArea::-webkit-scrollbar-thumb:hover {
 #mail-index_nm.et2_nextmatch .egwGridView_outer thead tr {
   border-left: 12px solid #B4B4B4;
 }
+#mail-index_nm.et2_nextmatch.et2_nextmatch .egwGridView_outer .egwGridView_scrollarea tbody tr.row_category td:first-child > div {
+  margin-left: 0px;
+}
diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less
index c73a11a8e3..85b63eaf29 100755
--- a/mail/templates/pixelegg/app.less
+++ b/mail/templates/pixelegg/app.less
@@ -1214,4 +1214,10 @@ table#mail-index_previewAttachmentArea::-webkit-scrollbar-thumb {
 table#mail-index_previewAttachmentArea::-webkit-scrollbar-thumb:hover {
   background: #555;
 }
-#mail-index_nm.et2_nextmatch .egwGridView_outer thead tr {border-left: 12px solid @gray_30;}
\ No newline at end of file
+#mail-index_nm.et2_nextmatch .egwGridView_outer thead tr {border-left: 12px solid @gray_30;}
+
+#mail-index_nm.et2_nextmatch .egwGridView_outer thead tr.row_category td:first-child > div {
+	margin-left: 0px;
+	padding-left: 0px;
+
+}