Merge remote-tracking branch 'upstream/pull/1820'

[rails.git] / app / views / notifier / signup_confirm.html.erb

diff --git a/app/views/notifier/signup_confirm.html.erb b/app/views/notifier/signup_confirm.html.erb
index 66528bd8345626b448044c51cfe622e93a758c3a..814deee9171220d93896643b05484d1bb9133076 100644 (file)
--- a/app/views/notifier/signup_confirm.html.erb
+++ b/app/views/notifier/signup_confirm.html.erb
@@ -1,11 +1,9 @@
-<% content_for :body do %>
-  <p style="margin: 0"><%= t("notifier.signup_confirm.greeting") %></p>
+<p><%= t("notifier.signup_confirm.greeting") %></p>
 
-  <p><%= t("notifier.signup_confirm.created", :site_url => SERVER_URL) %></p>
+<p><%= t("notifier.signup_confirm.created", :site_url => SERVER_URL) %></p>
 
-  <p><%= t("notifier.signup_confirm.confirm") %></p>
+<p><%= t("notifier.signup_confirm.confirm") %></p>
 
-  <p><%= link_to @url, @url, :style => "white-space: nowrap" %></nobr></p>
+<p><%= link_to @url, @url %></p>
 
-  <p><%= t("notifier.signup_confirm.welcome") %></p>
-<% end %>
+<p><%= t("notifier.signup_confirm.welcome") %></p>