diff --git a/mail/js/app.js b/mail/js/app.js index 3e3c1b5464..eac93116cf 100644 --- a/mail/js/app.js +++ b/mail/js/app.js @@ -251,7 +251,10 @@ app.classes.mail = AppJS.extend( jQuery('#mail-compose').on ('load',function() { if (textAreaWidget && textAreaWidget.ckeditor) { - textAreaWidget.ckeditor.on('instanceReady', function(){that.compose_fieldExpander();}); + textAreaWidget.ckeditor.on('instanceReady', function(){ + that.compose_fieldExpander(); + if (egwIsMobile()) jQuery(jQuery('iframe.cke_wysiwyg_frame')[0].contentWindow.document.body).css({margin:'0'}) + }); } else { diff --git a/mail/templates/mobile/compose.xet b/mail/templates/mobile/compose.xet new file mode 100644 index 0000000000..7d47a07ee4 --- /dev/null +++ b/mail/templates/mobile/compose.xet @@ -0,0 +1,112 @@ + + + + + + diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css index 36fdded2da..236d040155 100755 --- a/mail/templates/pixelegg/app.css +++ b/mail/templates/pixelegg/app.css @@ -2599,19 +2599,65 @@ div.mailComposeHeaderSection > table { #mail-display.et2_container { min-height: initial; } - /*Make Font size readable in mobile theme*/ - #mail-compose .mailComposeHeaders span, - #mail-compose .mailComposeHeadersSection span, - div.mailDisplayHeaders > span:first-child, - div.mailComposeHeaders > span:first-child, - div.mailComposeBody, - div.mailPreviewHeaders > * { - font-size: small !important; - } .mailDisplayHeaders, .mailDisplayAttachments > * { font-size: large !important; } + /*compose dialog*/ + body #popupMainDiv { + padding: 8px 8px 0 0; + background: none; + } + body #mail-compose .cke_chrome { + border: none; + box-shadow: none; + } + body #mail-compose span#cke_1_top { + display: none; + } + body #mail-compose .mailComposeHeaderSection > table { + padding: 0; + } + body #mail-compose .mailComposeHeaderSection > table tr.mailComposeHeaders.subjectContainer td:first-child::after { + content: ''; + } + body #mail-compose .mailComposeHeaderSection > table tr.mailComposeHeaders { + border-bottom: 1px solid silver; + } + body #mail-compose .mailComposeHeaderSection > table tr.mailComposeHeaders span { + font-size: 10pt; + } + body #mail-compose .mailComposeHeaderSection > table tr.mailComposeHeaders .subjectContainer:first-child::after { + content: ':'; + } + body #mail-compose .mailComposeHeaderSection > table tr.mailComposeHeaders:first-child { + border-top: 1px solid silver; + } + body #mail-compose .mailComposeHeaderSection > table tr.mailComposeHeaders span#mail-compose_cc_expander, + body #mail-compose .mailComposeHeaderSection > table tr.mailComposeHeaders span#mail-compose_cc_expander, + body #mail-compose .mailComposeHeaderSection > table tr.mailComposeHeaders span#mail-compose_bcc_expander, + body #mail-compose .mailComposeHeaderSection > table tr.mailComposeHeaders span#mail-compose_bcc_expander, + body #mail-compose .mailComposeHeaderSection > table tr.mailComposeHeaders span#mail-compose_folder_expander, + body #mail-compose .mailComposeHeaderSection > table tr.mailComposeHeaders span#mail-compose_folder_expander, + body #mail-compose .mailComposeHeaderSection > table tr.mailComposeHeaders span#mail-compose_replyto_expander, + body #mail-compose .mailComposeHeaderSection > table tr.mailComposeHeaders span#mail-compose_replyto_expander { + background: transparent; + border: none; + color: #26537c; + text-decoration: underline; + font-size: 10pt; + width: 65px; + } + body #mail-compose .mailComposeHeaderSection > table div.et2_taglist > *, + body #mail-compose .mailComposeHeaderSection > table #mail-compose_subject, + body #mail-compose .mailComposeHeaderSection > table #mail-compose_mailaccount { + border: none; + box-shadow: none; + font-size: 10pt; + } + body #mail-compose .mailComposeHeaderSection > table #mail-compose_subject:focus { + outline-color: transparent; + } #mail-index table.egwGridView_outer tbody span.et2_date_ro.et2_label { font-size: 9px; } diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less index fd20c3564e..132e597d03 100755 --- a/mail/templates/pixelegg/app.less +++ b/mail/templates/pixelegg/app.less @@ -1750,15 +1750,63 @@ div.mailComposeHeaderSection > table { min-height: initial; } - - /*Make Font size readable in mobile theme*/ - #mail-compose .mailComposeHeaders span, #mail-compose .mailComposeHeadersSection span, - div.mailDisplayHeaders > span:first-child, div.mailComposeHeaders > span:first-child, div.mailComposeBody, div.mailPreviewHeaders > *{ - font-size: small !important; - } .mailDisplayHeaders, .mailDisplayAttachments > * { font-size: large !important; } + /*compose dialog*/ + body { + #popupMainDiv { + padding: 8px 8px 0 0; + background: none; + } + #mail-compose { + .cke_chrome { + border:none; + box-shadow: none; + } + span#cke_1_top { + display: none; + } + .mailComposeHeaderSection > table { + padding: 0; + tr.mailComposeHeaders.subjectContainer td:first-child::after { + content: ''; + } + tr.mailComposeHeaders { + span { + .mob-fontsize-n; + } + border-bottom: 1px solid silver; + .subjectContainer:first-child::after{ + content: ':'; + } + &:first-child { + border-top: 1px solid silver; + } + span#mail-compose_cc_expander, span#mail-compose_cc_expander, + span#mail-compose_bcc_expander, span#mail-compose_bcc_expander, + span#mail-compose_folder_expander, span#mail-compose_folder_expander, + span#mail-compose_replyto_expander, span#mail-compose_replyto_expander + { + background: transparent; + border: none; + color: #26537c; + text-decoration: underline; + .mob-fontsize-n; + width: 65px; + } + } + div.et2_taglist > *, #mail-compose_subject, #mail-compose_mailaccount { + border:none; + box-shadow: none; + .mob-fontsize-n; + } + #mail-compose_subject:focus { + outline-color: transparent; + } + } + } + } #mail-index { table.egwGridView_outer tbody {