github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-06 13:06:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix some broken styles

Browse Source
This commit is contained in:
Neil Lalonde
2019-07-30 16:46:20 -04:00
parent 9656a21fdb
commit 43365a2bf1
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/user_notifications/digest.html.erb
View File

@ -401,7 +401,7 @@
<%= digest_custom_html("above_footer") %> <%= digest_custom_html("above_footer") %>
<div dir="<%= rtl? ? 'rtl' : 'ltr' %>" class='footer'> <div dir="<%= rtl? ? 'rtl' : 'ltr' %>" class='summary-footer'>
<%=raw(t 'user_notifications.digest.unsubscribe', <%=raw(t 'user_notifications.digest.unsubscribe',
site_link: html_site_link(@anchor_color), site_link: html_site_link(@anchor_color),
email_preferences_link: link_to(t('user_notifications.digest.your_email_settings'), Discourse.base_url + '/my/preferences/emails'), email_preferences_link: link_to(t('user_notifications.digest.your_email_settings'), Discourse.base_url + '/my/preferences/emails'),

11
lib/email/styles.rb
View File

@ -162,6 +162,11 @@ module Email
end end
def format_html def format_html
correct_first_body_margin
correct_footer_style
correct_footer_style_hilight_first
reset_tables
html_lang = SiteSetting.default_locale.sub("_", "-") html_lang = SiteSetting.default_locale.sub("_", "-")
style('html', nil, lang: html_lang, 'xml:lang' => html_lang) style('html', nil, lang: html_lang, 'xml:lang' => html_lang)
style('body', "text-align:#{ Rtl.new(nil).enabled? ? 'right' : 'left' };") style('body', "text-align:#{ Rtl.new(nil).enabled? ? 'right' : 'left' };")
@ -179,7 +184,7 @@ module Email
style('a', "text-decoration: none; font-weight: bold; color: #{SiteSetting.email_link_color};") style('a', "text-decoration: none; font-weight: bold; color: #{SiteSetting.email_link_color};")
style('ul', 'margin: 0 0 0 10px; padding: 0 0 0 20px;') style('ul', 'margin: 0 0 0 10px; padding: 0 0 0 20px;')
style('li', 'padding-bottom: 10px') style('li', 'padding-bottom: 10px')
style('div.footer', 'color:#666; font-size:95%; text-align:center; padding-top:15px;') style('div.summary-footer', 'color:#666; font-size:95%; text-align:center; padding-top:15px;')
style('span.post-count', 'margin: 0 5px; color: #777;') style('span.post-count', 'margin: 0 5px; color: #777;')
style('pre', 'word-wrap: break-word; max-width: 694px;') style('pre', 'word-wrap: break-word; max-width: 694px;')
style('code', 'background-color: #f1f1ff; padding: 2px 5px;') style('code', 'background-color: #f1f1ff; padding: 2px 5px;')
@ -200,11 +205,7 @@ module Email
style('div.body', 'padding-top:5px;') style('div.body', 'padding-top:5px;')
style('.whisper div.body', 'font-style: italic; color: #9c9c9c;') style('.whisper div.body', 'font-style: italic; color: #9c9c9c;')
style('.lightbox-wrapper .meta', 'display: none') style('.lightbox-wrapper .meta', 'display: none')
correct_first_body_margin
correct_footer_style
style('div.undecorated-link-footer a', "font-weight: normal;") style('div.undecorated-link-footer a', "font-weight: normal;")
correct_footer_style_hilight_first
reset_tables
onebox_styles onebox_styles
plugin_styles plugin_styles