Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'private-issue1089_email_border' into develop

Browse source
This commit is contained in:
Martin Edenhofer 2017-05-15 15:09:37 +02:00
parent c07faa1f11 f9591e49ae
commit 672159a2bf
2 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
config/initializers/html_email_style.rb
View file

@ -8,9 +8,6 @@ Rails.application.config.html_email_body = <<HERE
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<style type="text/css">
body {
width: 90% !important;
-webkit-text-size-adjust: 90%;
-ms-text-size-adjust: 90%;
#{Rails.application.config.html_email_css_font};
}
img {
@ -35,9 +32,6 @@ Rails.application.config.html_email_body = <<HERE
overflow: auto;
word-break: keep-all;
}
p, table, div, td {
max-width: 600px;
}
table,
pre,
blockquote {
@ -80,7 +74,7 @@ Rails.application.config.html_email_body = <<HERE
overflow: auto;
}
</style>
<head>
</head>
<body style="#{Rails.application.config.html_email_css_font}">###html###</body>
</html>
HERE

2
test/unit/email_build_test.rb
View file

@ -29,7 +29,7 @@ class EmailBuildTest < ActiveSupport::TestCase
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<head>
</head>
<body style="font-family:Geneva,Helvetica,Arial,sans-serif; font-size: 12px;">
<div>&gt; Welcome!</div><div>&gt;</div><div>&gt; Thank you for installing Zammad. äöüß</div><div>&gt;</div>
</body>