diff --git a/mail/js/app.js b/mail/js/app.js
index 180bf1fbde..b63e5f237c 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -3058,7 +3058,7 @@ app.classes.mail = AppJS.extend(
*/
composeUploadStart: function ()
{
- var boxAttachment = this.et2.getWidgetById('mailUploadProgress');
+ var boxAttachment = this.et2.getWidgetById('attachments');
if (boxAttachment)
{
var groupbox = boxAttachment.getParent();
diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css
index 7507e18a58..5932d9a6ab 100644
--- a/mail/templates/default/app.css
+++ b/mail/templates/default/app.css
@@ -187,6 +187,7 @@ table tr.attachmentRow > td{
table tr.attachmentRow > td > img {
background:transparent;
padding-left: 5px;
+ cursor: pointer;
}
#mail-compose_attachments.egwGridView_grid {
display:table !important;
diff --git a/mail/templates/default/compose.xet b/mail/templates/default/compose.xet
index 0846811e7b..67775f580e 100644
--- a/mail/templates/default/compose.xet
+++ b/mail/templates/default/compose.xet
@@ -14,7 +14,7 @@
-
+
@@ -115,7 +115,6 @@
-
diff --git a/mail/templates/default/display.xet b/mail/templates/default/display.xet
index b5a8691116..267733f256 100644
--- a/mail/templates/default/display.xet
+++ b/mail/templates/default/display.xet
@@ -50,37 +50,37 @@
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index e0836ff28b..b7dcb50b0a 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -180,6 +180,7 @@ table tr.attachmentRow > td {
table tr.attachmentRow > td > img {
background: transparent;
padding-left: 5px;
+ cursor: pointer;
}
#mail-compose_attachments.egwGridView_grid {
display: table !important;
@@ -756,6 +757,9 @@ iframe#mail-display_mailDisplayBodySrc {
.mailDisplayContainer {
border: 0px;
}
+body {
+ background-color: white;
+}
div#mail-index {
margin: 0 1% 0 0 !important;
}
@@ -1412,9 +1416,13 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje
margin: 0px 8px;
}
#mail-compose fieldset.mailUploadSection {
- border: 1px solid silver;
+ border-top: 1px solid silver;
font-size: 0.8em;
margin: 8px 0;
+ border-bottom: none;
+ border-left: none;
+ border-right: none;
+ width: 99%;
}
#divGenTime_mail {
display: none;
@@ -1705,14 +1713,14 @@ div#popupMainDiv {
background-color: .background_color_15_gray;
}
#mail-display .mailDisplayAttachments {
- background-color: #f0f0f0;
- max-height: 10%;
+ max-height: 12%;
position: fixed;
- bottom: 26px;
border: 0px solid #560ead;
border-bottom: 0px;
opacity: 1;
-moz-opacity: 1;
+ margin-left: 10px;
+ width: 98%;
}
#mail-display .mailDisplayAttachments img {
width: 16px;
@@ -2651,9 +2659,13 @@ div.mailPreviewHeaders div.mail_extraEmails img.et2_button_icon {
position: fixed;
overflow: hidden;
overflow-y: auto;
- border: 0px solid silver;
+ border-top: 2px solid silver;
top: 120px;
- bottom: 110px;
+ bottom: 108px;
+ border-bottom: 1px solid silver;
+ width: 98%;
+ background-color: white;
+ margin-left: 10px;
}
.mailDisplayHeaders {
overflow: hidden;
diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less
index 252a3ea9bc..755816d4ca 100755
--- a/mail/templates/pixelegg/app.less
+++ b/mail/templates/pixelegg/app.less
@@ -56,7 +56,9 @@ iframe#mail-display_mailDisplayBodySrc{
border: 0px;
}
-
+body {
+ background-color: white;
+}
@@ -635,9 +637,13 @@ div#mail-index{
// Anhang
fieldset.mailUploadSection{
- border:1px solid silver;
- font-size: 0.8em;
- margin: 8px 0;
+ border-top: 1px solid silver;
+ font-size: 0.8em;
+ margin: 8px 0;
+ border-bottom: none;
+ border-left: none;
+ border-right: none;
+ width: 99%;
}
@@ -869,19 +875,16 @@ div#popupMainDiv{
.mailDisplayAttachments {
// background-color:#efefdf;
- .background_color_10_gray;
-
- max-height: 10%;
+ max-height: 12%;
position: fixed;
- bottom: 26px;
-
border: 0px solid @egw_color_3_a;
-
+
border-bottom: 0px;
opacity: 1;
-moz-opacity:1;
// filter: Alpha(opacity=100);
-
+ margin-left: 10px;
+ width:98%;
img {width: 16px;}
}
@@ -1838,9 +1841,13 @@ div.mailPreviewHeaders div.mail_extraEmails {
position: fixed;
overflow: hidden;
overflow-y: auto;
- border: 0px solid silver;
- top: 120px;
- bottom: 110px;
+ border-top: 2px solid silver;
+ top: 120px;
+ bottom: 108px;
+ border-bottom: 1px solid silver;
+ width: 98%;
+ background-color: white;
+ margin-left: 10px;
}
.mailDisplayHeaders {