Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Shouldn't overwrite styles in emails that we explicitly set, like category 

colors.
This commit is contained in:
Robin Ward 2014-11-07 16:42:57 -05:00
parent 5defaca197
commit 872cfff49b
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/email/styles.rb
View File

@ -18,7 +18,8 @@ module Email
def add_styles(node, new_styles) def add_styles(node, new_styles)
existing = node['style'] existing = node['style']
if existing.present? if existing.present?
node['style'] = "#{existing}; #{new_styles}" # merge styles
node['style'] = "#{new_styles}; #{existing}"
else else
node['style'] = new_styles node['style'] = new_styles
end end