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

Fixed margin property for blockquote inline replacement (use same as in css).

Browse source
This commit is contained in:
Martin Edenhofer 2016-06-09 15:00:11 +02:00
parent 9169b6fb88
commit 5577753be7
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/channel/email_build.rb
View file

@ -241,7 +241,7 @@ Add/change markup to display html in any mail client nice.
def self.html_mail_client_fixes(html) def self.html_mail_client_fixes(html)
# https://github.com/martini/zammad/issues/165 # https://github.com/martini/zammad/issues/165
new_html = html.gsub('<blockquote type="cite">', '<blockquote type="cite" style="border-left: 2px solid blue; margin: 0px; padding: 8px 12px 8px 12px;">') new_html = html.gsub('<blockquote type="cite">', '<blockquote type="cite" style="border-left: 2px solid blue; margin: 0 0 16px; padding: 8px 12px 8px 12px;">')
new_html.gsub!('<p>', '<p style="margin: 0;">') new_html.gsub!('<p>', '<p style="margin: 0;">')
new_html new_html
end end

4
test/unit/email_build_test.rb
View file

@ -177,13 +177,13 @@ text
html_with_fixes = Channel::EmailBuild.html_mail_client_fixes(html_raw) html_with_fixes = Channel::EmailBuild.html_mail_client_fixes(html_raw)
assert_not_equal(html_with_fixes, html_raw) assert_not_equal(html_with_fixes, html_raw)
html_should = '<blockquote type="cite" style="border-left: 2px solid blue; margin: 0px; padding: 8px 12px 8px 12px;">some html_should = '<blockquote type="cite" style="border-left: 2px solid blue; margin: 0 0 16px; padding: 8px 12px 8px 12px;">some
text text
</blockquote> </blockquote>
123 123
<blockquote type="cite" style="border-left: 2px solid blue; margin: 0px; padding: 8px 12px 8px 12px;">some <blockquote type="cite" style="border-left: 2px solid blue; margin: 0 0 16px; padding: 8px 12px 8px 12px;">some
text text
</blockquote>' </blockquote>'
assert_equal(html_should, html_with_fixes) assert_equal(html_should, html_with_fixes)