diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index 87374c910..a9dde2f3c 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -3076,10 +3076,19 @@ footer { overflow-wrap: break-word; } + /* email css reset */ .text-bubble p { margin: 0; } + .text-bubble blockquote, + .text-bubble pre + { + margin: 0px; + padding: 8px 12px 8px 12px; + } + + .ticket-article-item.state--folde-out .text-bubble { border-color: hsl(0,0%,90%); } diff --git a/app/models/channel/email_build.rb b/app/models/channel/email_build.rb index dca41feb3..1e3e4f993 100644 --- a/app/models/channel/email_build.rb +++ b/app/models/channel/email_build.rb @@ -136,14 +136,19 @@ module Channel::EmailBuild border-collapse: collapse; } table { - border-collapse:collapse; mso-table-lspace:0pt; mso-table-rspace:0pt; - } - p { - margin: 0; + border-collapse: collapse; mso-table-lspace:0pt; mso-table-rspace:0pt; } p, table, div, td { max-width: 600px; } + p { + margin: 0; + } + blockquote, pre { + margin: 0px; + padding: 8px 12px 8px 12px; + } + #{html}