diff --git a/mail/js/app.js b/mail/js/app.js
index 1e630ecf2f..180bf1fbde 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -3064,6 +3064,8 @@ app.classes.mail = AppJS.extend(
var groupbox = boxAttachment.getParent();
if (groupbox) groupbox.set_disabled(false);
}
+ //Resize the compose dialog
+ this.compose_resizeHandler();
return true;
},
diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css
index 3d88c239ac..7507e18a58 100644
--- a/mail/templates/default/app.css
+++ b/mail/templates/default/app.css
@@ -181,7 +181,16 @@ A.sieveRowInActive
.bodyDIVAttachment {
bottom:80px;
}
-
+table tr.attachmentRow > td{
+ padding:0 !important;
+}
+table tr.attachmentRow > td > img {
+ background:transparent;
+ padding-left: 5px;
+}
+#mail-compose_attachments.egwGridView_grid {
+ display:table !important;
+}
#attachmentSpanAllDIV{
background-color:#efefdf;
height:260px;
@@ -275,11 +284,9 @@ pre {
}
.useEllipsis {
text-overflow: ellipsis;
- width: 250px;
white-space: nowrap;
overflow: hidden;
word-wrap: break-word;
- float: left;
}
#mail-index {
position: relative
@@ -540,7 +547,6 @@ div.mail-compose_fileselector {
margin:0px;
}
.mailDisplayAttachments {
- background-color:#f0f0f0;
height: 121px;
position: fixed;
bottom: .1em;
diff --git a/mail/templates/default/compose.xet b/mail/templates/default/compose.xet
index 527a53e862..0846811e7b 100644
--- a/mail/templates/default/compose.xet
+++ b/mail/templates/default/compose.xet
@@ -116,25 +116,22 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/mail/templates/default/display.xet b/mail/templates/default/display.xet
index 70512dfd58..b5a8691116 100644
--- a/mail/templates/default/display.xet
+++ b/mail/templates/default/display.xet
@@ -52,14 +52,13 @@
-
+
-
-
+
@@ -67,13 +66,12 @@
-
+
-
diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index 79228d3ed1..e0836ff28b 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -174,6 +174,16 @@ A.sieveRowInActive {
.bodyDIVAttachment {
bottom: 80px;
}
+table tr.attachmentRow > td {
+ padding: 0 !important;
+}
+table tr.attachmentRow > td > img {
+ background: transparent;
+ padding-left: 5px;
+}
+#mail-compose_attachments.egwGridView_grid {
+ display: table !important;
+}
#attachmentSpanAllDIV {
background-color: #efefdf;
height: 260px;
@@ -270,11 +280,9 @@ pre {
}
.useEllipsis {
text-overflow: ellipsis;
- width: 250px;
white-space: nowrap;
overflow: hidden;
word-wrap: break-word;
- float: left;
}
#mail-index {
position: relative;
@@ -539,7 +547,6 @@ div.mail-compose_fileselector {
margin: 0px;
}
.mailDisplayAttachments {
- background-color: #f0f0f0;
height: 121px;
position: fixed;
bottom: .1em;
@@ -548,6 +555,9 @@ div.mail-compose_fileselector {
-moz-opacity: 1;
filter: alpha(opacity=100);
}
+#mail-display_mailDisplayBodySrc {
+ height: 100%;
+}
#divGenTime_mail {
display: none;
}
@@ -1402,10 +1412,9 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje
margin: 0px 8px;
}
#mail-compose fieldset.mailUploadSection {
+ border: 1px solid silver;
font-size: 0.8em;
- border: none;
margin: 8px 0;
- background-color: #d9d9d9;
}
#divGenTime_mail {
display: none;
@@ -2123,9 +2132,9 @@ pre {
}
.useEllipsis {
text-overflow: ellipsis;
- width: 250px;
white-space: nowrap;
overflow: hidden;
+ word-wrap: break-word;
}
#mail-index {
position: relative;
diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less
index 5a9ca0a5fa..252a3ea9bc 100755
--- a/mail/templates/pixelegg/app.less
+++ b/mail/templates/pixelegg/app.less
@@ -635,11 +635,9 @@ div#mail-index{
// Anhang
fieldset.mailUploadSection{
-
+ border:1px solid silver;
font-size: 0.8em;
- border: none;
margin: 8px 0;
- .background_color_15_gray;
}
@@ -1406,9 +1404,9 @@ pre {
.useEllipsis {
text-overflow: ellipsis;
- width: 250px;
white-space: nowrap;
overflow: hidden;
+ word-wrap: break-word;
}