Download as
Browse Code »

Commit edcafdf93be6d369b4792979bdb773c878b4f865

Authored by Victor Costa
2 parents 91aa12b4 de40b2b7
Exists in theme-brasil-digital-from-staging and in 9 other branches angular_poc, api-article-archived, backup-7-jan-2016, captcha_serpro_plugin, login-captcha, production, resend_confirmation_email, staging, staging_rails3

Merge branch 'fix_person_notifier' into stable 

Conflicts:
	app/views/person_notifier/mailer/content_summary.html.erb
Showing 1 changed file with 2 additions and 2 deletions   Show diff stats
app/views/person_notifier/mailer/content_summary.html.erb
  Diff comments   View file @edcafdf
@@ -3,9 +3,9 @@ @@ -3,9 +3,9 @@
3 <div style="display: table; background-color: white; margin: 26px 0;"> 3 <div style="display: table; background-color: white; margin: 26px 0;">
4 <div style="padding: 25px 20px 20px 20px;text-align: left;"> 4 <div style="padding: 25px 20px 20px 20px;text-align: left;">
5 <%= link_to @url, :style => "text-decoration: none;" do %> 5 <%= link_to @url, :style => "text-decoration: none;" do %>
6 - <span style="font-weight:bold;font-size: 30px;margin: 0;color: white;background-color: #AAAAAA;padding: 5px;"><%= @environment %></span> 6 + <span style="font-weight:bold;font-size: 28px;margin: 0;color: white;background-color: #AAAAAA;padding: 5px;"><%= @environment %></span>
7 <% end %> 7 <% end %>
8 - <span style="font-weight:bold;color: #333;font-size:20px;margin-left: 8px;"><%= _("%s's network activity") % @profile.name %></h3> 8 + <span style="font-weight:bold;color: #333;font-size:19px;margin-left: 8px;"><%= _("%s's network activity") % @profile.name %></h3>
9 </div> 9 </div>
10 <div style="margin: 0 20px 20px 20px;border-top:2px solid #e2e2e2;"> 10 <div style="margin: 0 20px 20px 20px;border-top:2px solid #e2e2e2;">
11 <% @notifications.each do |activity| %> 11 <% @notifications.each do |activity| %>