From df483a9a1b905f18c64ab67a557a1c17cec9c85f Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Thu, 18 Dec 2014 09:34:31 +0000
Subject: [PATCH] Fix styling of mail compose and display for jdots

---
 mail/templates/default/app.css     | 18 +++++++++++++-----
 mail/templates/default/compose.xet | 10 +++++-----
 mail/templates/pixelegg/app.css    | 18 +++++++++++++-----
 mail/templates/pixelegg/app.less   |  1 +
 4 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css
index 073d132096..c16b18d8ea 100644
--- a/mail/templates/default/app.css
+++ b/mail/templates/default/app.css
@@ -366,6 +366,7 @@ input[type=button] {
 div.mailUploadSection {
 	border-top: 1px solid silver;
 	margin-top: 16px;
+	width:99%;
 }
 div.mailUploadSection > div.et2_hbox {
 	margin-top: -10px;
@@ -549,14 +550,12 @@ div.mail-compose_fileselector {
 	display: -moz-box;
 	/*width: 99%;*/
 	overflow: hidden;
-	overflow-y: auto;
 	left: 8px;
 	right: 8px;
 }
 .mailDisplayContainer {
 	position: fixed;
 	overflow: hidden;
-	overflow-y: auto;
 	border: 1px solid silver;
 	top: 120px;
 }
@@ -612,9 +611,6 @@ div.mailDisplayHeaders > span:first-child,  div.mailPreviewHeaders > span:first-
 #mail-display_toolbar {
 	display: inline-flex;
 }
-#mail-compose_mailaccount{
-	width: 80%;
-}
 div.mailComposeHeaders > span:first-child {
 	width: 8em;
 }
@@ -845,4 +841,16 @@ and (max-device-width:768){
 and (max-device-width : 1024px)
 and (orientation : landscape) {
 	
+}
+
+span#mail-compose_cc_expander,
+span#mail-compose_bcc_expander,
+span#mail-compose_folder_expander,
+span#mail-compose_replyto_expander {
+	float: left;
+	width: 55px;
+	margin: 3px;
+	margin-left: 12px;
+	text-align: right;
+	padding: 0;
 }
\ No newline at end of file
diff --git a/mail/templates/default/compose.xet b/mail/templates/default/compose.xet
index a646c310b8..8b3b3d60d0 100644
--- a/mail/templates/default/compose.xet
+++ b/mail/templates/default/compose.xet
@@ -46,10 +46,10 @@
 				<rows>
 					<row class="mailComposeHeaders" >
 						<description value="From"/>
-						<menupopup id="mailaccount" onchange="app.mail.submitOnChange"/>
+						<menupopup id="mailaccount" onchange="app.mail.submitOnChange" class="et2_fullWidth"/>
 						<vbox>
-							<description id="replyto_expander" value="Reply to" onclick="app.mail.compose_fieldExpander"/>
-							<description id="folder_expander" value="Folder" onclick="app.mail.compose_fieldExpander"/>
+							<description id="replyto_expander" value="Reply to" class="et2_button_text" onclick="app.mail.compose_fieldExpander"/>
+							<description id="folder_expander" value="Folder" class="et2_button_text" onclick="app.mail.compose_fieldExpander"/>
 							<textbox class="mail-index_quotaDisplayNone" readonly="true" id="composeID"/>
 							<textbox class="mail-index_quotaDisplayNone" readonly="true" id="serverID"/>
 							<textbox class="mail-index_quotaDisplayNone" readonly="true" id="processedmail_id"/>
@@ -76,8 +76,8 @@
 						<description value="To"/>
 						<taglist-email id="to" width="100%" onclick="app.mail.address_click" include_lists="true" onchange="app.mail.set_dragging_dndCompose"/>
 						<vbox>
-							<description id="cc_expander" value="Cc" onclick="app.mail.compose_fieldExpander"/>
-							<description id="bcc_expander" value="Bcc" onclick="app.mail.compose_fieldExpander"/>
+							<description id="cc_expander" value="Cc" class="et2_button_text" onclick="app.mail.compose_fieldExpander"/>
+							<description id="bcc_expander" value="Bcc" class="et2_button_text" onclick="app.mail.compose_fieldExpander"/>
 						</vbox>
 					</row>
 					<row class="mailComposeHeaders mailComposeJQueryCc">
diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index 553fa742dd..dee2a19ecc 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -363,6 +363,7 @@ input[type=button] {
 div.mailUploadSection {
   border-top: 1px solid silver;
   margin-top: 16px;
+  width: 99%;
 }
 div.mailUploadSection > div.et2_hbox {
   margin-top: -10px;
@@ -549,14 +550,12 @@ div.mail-compose_fileselector {
   display: -moz-box;
   /*width: 99%;*/
   overflow: hidden;
-  overflow-y: auto;
   left: 8px;
   right: 8px;
 }
 .mailDisplayContainer {
   position: fixed;
   overflow: hidden;
-  overflow-y: auto;
   border: 1px solid silver;
   top: 120px;
 }
@@ -611,9 +610,6 @@ div.mailPreviewHeaders > span:first-child {
 #mail-display_toolbar {
   display: inline-flex;
 }
-#mail-compose_mailaccount {
-  width: 80%;
-}
 div.mailComposeHeaders > span:first-child {
   width: 8em;
 }
@@ -830,6 +826,17 @@ blockquote blockquote blockquote blockquote blockquote blockquote {
   }
 }
 /* Mobile (landscape) Tablet----------- */
+span#mail-compose_cc_expander,
+span#mail-compose_bcc_expander,
+span#mail-compose_folder_expander,
+span#mail-compose_replyto_expander {
+  float: left;
+  width: 55px;
+  margin: 3px;
+  margin-left: 12px;
+  text-align: right;
+  padding: 0;
+}
 #popupMainDiv {
   padding: 5px;
 }
@@ -1436,6 +1443,7 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje
   margin: 3px;
   font-size: 8px;
   margin-left: 12px;
+  padding: 0;
 }
 #mail-compose .mailComposeHeaders span#mail-compose_cc_expander:hover,
 #mail-compose .mailComposeHeadersSection span#mail-compose_cc_expander:hover,
diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less
index a2fc2ce4d1..5734e4225f 100755
--- a/mail/templates/pixelegg/app.less
+++ b/mail/templates/pixelegg/app.less
@@ -599,6 +599,7 @@ div#mail-index{
             margin: 3px;
             font-size: 8px;
             margin-left: 12px;
+			padding:0;
             &:hover {.box_shadow_standard_light_hover; background-color:@color_positive_action;color: @gray_0;}
 		}
         /*Betreff*/