From 15e727fc8e07b0cff99b099eaa88a67791d111ff Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Tue, 10 Feb 2015 10:42:24 +0000
Subject: [PATCH] Fix broken styling in compose dialog for jdots

---
 mail/templates/default/app.css   |  9 +++++----
 mail/templates/pixelegg/app.css  | 12 ++++++++----
 mail/templates/pixelegg/app.less |  4 +++-
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css
index eba1b8bff4..ea34b52e17 100644
--- a/mail/templates/default/app.css
+++ b/mail/templates/default/app.css
@@ -464,6 +464,7 @@ div.mail-compose_fileselector {
 }
 #mail-compose_composeToolbar {
 	padding: 0px !important;
+	border: none;
 }
 #mail-compose_composeToolbar > button {
 	padding: .2em .4em;
@@ -854,10 +855,10 @@ span#mail-compose_bcc_expander,
 span#mail-compose_folder_expander,
 span#mail-compose_replyto_expander {
 	float: left;
-	width: 55px;
+	width: 100%;
 	margin: 3px;
-	margin-left: 12px;
-	text-align: right;
+	margin-right: 12px;
+	text-align: center;
 	padding: 0;
 }
 /*Make file uploads in compose dialog invisible*/
@@ -870,5 +871,5 @@ div.mail-compose_toolbar_assist div.mail-compose_fileselector, #mail-compose_sel
 }
 
 div.mailComposeHeaderSection>table {
-	padding-top: 10px;
+	padding-top: 35px;
 }
\ No newline at end of file
diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index 2b8b135b5b..cf8699cd7b 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -461,6 +461,7 @@ div.mail-compose_fileselector {
 }
 #mail-compose_composeToolbar {
   padding: 0px !important;
+  border: none;
 }
 #mail-compose_composeToolbar > button {
   padding: .2em .4em;
@@ -837,10 +838,10 @@ span#mail-compose_bcc_expander,
 span#mail-compose_folder_expander,
 span#mail-compose_replyto_expander {
   float: left;
-  width: 55px;
+  width: 100%;
   margin: 3px;
-  margin-left: 12px;
-  text-align: right;
+  margin-right: 12px;
+  text-align: center;
   padding: 0;
 }
 /*Make file uploads in compose dialog invisible*/
@@ -856,7 +857,7 @@ div.mail-compose_toolbar_assist {
   display: none;
 }
 div.mailComposeHeaderSection > table {
-  padding-top: 10px;
+  padding-top: 35px;
 }
 #popupMainDiv {
   padding: 5px;
@@ -2529,3 +2530,6 @@ div.mailDisplayHeaders div.mail_extraEmails.visible {
   height: auto;
   width: 24px;
 }
+div.mailComposeHeaderSection > table {
+  padding-top: 10px;
+}
diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less
index 47e70063c1..c78b0b07f6 100755
--- a/mail/templates/pixelegg/app.less
+++ b/mail/templates/pixelegg/app.less
@@ -1717,5 +1717,7 @@ div.mailDisplayHeaders div.mail_extraEmails.visible {
         			width: 24px;
         		}
 }
-
+div.mailComposeHeaderSection > table {
+	padding-top: 10px;
+}
 //