From c164f99aca58bba4299fd4b57f8ffe7011e4dfdd Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 30 Oct 2014 11:11:40 +0000
Subject: [PATCH] fix popup was never wide enought problem by removing
 width:100% from #popupMainDiv

---
 emailadmin/js/app.js                 | 1 +
 emailadmin/templates/default/app.css | 2 +-
 mail/templates/pixelegg/app.css      | 8 ++------
 mail/templates/pixelegg/app.less     | 5 -----
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/emailadmin/js/app.js b/emailadmin/js/app.js
index a19e261a66..f74462c92b 100644
--- a/emailadmin/js/app.js
+++ b/emailadmin/js/app.js
@@ -105,6 +105,7 @@ app.classes.emailadmin = AppJS.extend(
 			var sieve_enabled = this.et2.getWidgetById('acc_sieve_enabled');
 			if (!sieve_enabled || sieve_enabled.get_value())
 			{
+				jQuery('#emailadmin-wizard_output').hide();
 				jQuery('td.emailadmin_progress').show();
 			}
 		}
diff --git a/emailadmin/templates/default/app.css b/emailadmin/templates/default/app.css
index 8093ea9987..ae7ecc08a9 100644
--- a/emailadmin/templates/default/app.css
+++ b/emailadmin/templates/default/app.css
@@ -13,7 +13,7 @@
 }
 .emailadmin_progress {
   display: none;
-  padding: 10px;
+  padding-top: 5px;
 }
 .emailadmin_ssl {
   margin-right: 10px;
diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index 0226c8b39c..a59975900d 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -525,7 +525,8 @@ div.mail-compose_fileselector {
   border: 0px !important;
   display: none !important;
 }
-#mail-display {
+#mail-display,
+#mail-compose {
   min-height: 500px;
 }
 .mailDisplayContainer,
@@ -1471,11 +1472,6 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje
  *          Preview
  * ##################################################################################
  */
-div#popupMainDiv {
-  padding: 8px;
-  margin: -6px 0px 6px -1px;
-  width: 100%;
-}
 #mail-display {
   width: 870px;
   min-height: 500px;
diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less
index e0bfb8a3d5..27aa78e05b 100755
--- a/mail/templates/pixelegg/app.less
+++ b/mail/templates/pixelegg/app.less
@@ -663,11 +663,6 @@ div#mail-index{
  *          Preview
  * ##################################################################################
  */
-div#popupMainDiv{
-        padding: 8px;
-        margin: -6px 0px 6px -1px;
-        width: 100%;
-}
 
 #mail-display{
     //	gesamtbreite