diff --git a/mail/js/app.js b/mail/js/app.js index e83790bdaf..c4fea47646 100644 --- a/mail/js/app.js +++ b/mail/js/app.js @@ -1113,11 +1113,11 @@ app.classes.mail = AppJS.extend( var dataElem = {data:{FROM:"",SENDER:"",TO:"",CC:"",BCC:""}}; var content = this.et2.getArrayMgr('content').data; var expand_content = [ - {build_children: true, data_one: 'FROM', data: 'FROM', widget: 'FROM', line: 'mailDisplayHeadersFrom', full_email:false}, - {build_children: true, data: 'SENDER', widget: 'SENDER', line: 'mailDisplayHeadersSender'}, - {build_children: true, data: 'TO', widget: 'TO', line: 'mailDisplayHeadersTo'}, - {build_children: true, data: 'CC', widget: 'CC', line: 'mailDisplayHeadersCc'}, - {build_children: true, data: 'BCC', widget:'BCC', line: 'mailDisplayHeadersBcc'} + {build_children: false, data_one: 'FROM', data: 'FROM', widget: 'FROM', line: 'mailDisplayHeadersFrom', full_email: false}, + {build_children: false, data: 'SENDER', widget: 'SENDER', line: 'mailDisplayHeadersSender'}, + {build_children: false, data: 'TO', widget: 'TO', line: 'mailDisplayHeadersTo'}, + {build_children: false, data: 'CC', widget: 'CC', line: 'mailDisplayHeadersCc'}, + {build_children: false, data: 'BCC', widget: 'BCC', line: 'mailDisplayHeadersBcc'} ]; if (typeof content != 'undefiend') diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css index 4a9f0105f0..bd1b5c83aa 100644 --- a/mail/templates/default/app.css +++ b/mail/templates/default/app.css @@ -640,29 +640,42 @@ div.mailDisplayHeaders div.mail_extraEmails { div.mailDisplayHeaders div.mail_extraEmails.visible { position: fixed; left: 7em; - display: block; - max-height: 8em; - min-width: 30em; - z-index: 999; - overflow-y: auto; - background-color: white; - box-shadow: 5px 5px 5px #aaa; - border: 1px solid gray; + display: block; + max-height: 8em; + min-width: 30em; + z-index: 999; + overflow-y: auto; + background-color: white; + box-shadow: 5px 5px 5px #aaa; + border: 1px solid gray; } + .mailComposeBody { - white-space: normal !important; + white-space: normal !important; } + #mail-compose_mail_plaintext { - white-space: pre-wrap !important; + white-space: pre-wrap !important; } + +.mailPreviewHeaders { + font-size: 0.875rem; +} + +.mailPreviewHeaders :first-child, .mailDisplayHeaders :first-child { + width: 5em; + flex: 0 1 auto; +} + div.mailPreviewHeaders div.mail_extraEmails { - display: inline-block; - max-height: 1.3em; - max-width: 50%; - overflow: hidden; - text-overflow: ellipsis; - vertical-align: top; + display: inline-block; + max-height: 1.3em; + max-width: 50%; + overflow: hidden; + text-overflow: ellipsis; + vertical-align: top; } + #mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubject { width: 90%; text-overflow: ellipsis; diff --git a/mail/templates/default/display.xet b/mail/templates/default/display.xet index 801673996d..9adcd0710a 100644 --- a/mail/templates/default/display.xet +++ b/mail/templates/default/display.xet @@ -3,56 +3,45 @@