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

FIX: Github commit oneboxing formatting in emails

This commit is contained in:
Robin Ward 2014-05-14 16:40:54 -04:00
parent 93b2af8a6e
commit ab319de4f9
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/email/_post.html.erb
View File

@ -6,7 +6,7 @@
</td>
<td>
<a class="username" href="<%=Discourse.base_url%>/users/<%= post.user.username_lower%>" target="_blank"><%= post.user.username %></a><br>
<span class='date'><%= l post.created_at, format: :short_no_year %></span>
<span class='notification-date'><%= l post.created_at, format: :short_no_year %></span>
</td>
</tr>
<tr>

9
lib/email/styles.rb
View File

@ -28,7 +28,7 @@ module Email
img['width'] = 20
img['height'] = 20
else
add_styles(img, 'max-width: 694px;')
add_styles(img, 'max-width: 694px;') if img['style'] !~ /max-width/
end
# ensure all urls are absolute
@ -45,7 +45,7 @@ module Email
def format_notification
style('.previous-discussion', 'font-size: 17px; color: #444;')
style('.date', "text-align:right;color:#999999;padding-right:5px;font-family:'lucida grande',tahoma,verdana,arial,sans-serif;font-size:11px")
style('.notification-date', "text-align:right;color:#999999;padding-right:5px;font-family:'lucida grande',tahoma,verdana,arial,sans-serif;font-size:11px")
style('.username', "font-size:13px;font-family:'lucida grande',tahoma,verdana,arial,sans-serif;color:#3b5998;text-decoration:none;font-weight:bold")
style('.post-wrapper', "margin-bottom:25px;max-width:761px")
style('.user-avatar', 'vertical-align:top;width:55px;')
@ -69,15 +69,14 @@ module Email
# Oneboxes
style('aside.onebox', "padding: 12px 25px 2px 12px; border-left: 5px solid #bebebe; background: #eee; margin-bottom: 10px;")
style('aside.onebox img', "max-height: 80%; max-width: 25%; height: auto; float: left; margin-right: 10px;")
style('aside.onebox img', "max-height: 80%; max-width: 25%; height: auto; float: left; margin-right: 10px; margin-bottom: 10px")
style('aside.onebox h3', "border-bottom: 0")
style('aside.onebox .source', "margin-bottom: 8px")
style('aside.onebox .source a[href]', "color: #333; font-weight: normal")
style('aside.clearfix', "clear: both")
# Finally, convert all `aside` tags to `div`s
@fragment.css('aside').each do |n|
@fragment.css('aside, article, header').each do |n|
n.name = "div"
end
end