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

[rails.git] / app / views / diary_entries / show.html.erb

diff --git a/app/views/diary_entries/show.html.erb b/app/views/diary_entries/show.html.erb
index e5dcbbdda3f6cfa31175082182e7b7d507321899..5bfdfa17b3205dfd49648ace8b04d78ab388b81b 100644 (file)
--- a/app/views/diary_entries/show.html.erb
+++ b/app/views/diary_entries/show.html.erb
@@ -1,10 +1,10 @@
 <% content_for :heading do %>
 <% content_for :heading do %>

-  <div id="userinformation" class="row">
+  <div class="row">

     <div class="col-sm-auto">
     <div class="col-sm-auto">

-      <%= user_image @entry.user, :class => "user_image_no_margins" %>
+      <%= user_image @entry.user %>

     </div>
     <div class="col">
     </div>
     <div class="col">

-      <h2><%= link_to t(".user_title", :user => @entry.user.display_name), :action => :index %></h2>
+      <h1><%= link_to t(".user_title", :user => @entry.user.display_name), :action => :index %></h1>

       <p><%= rss_link_to :action => :rss, :display_name => @entry.user.display_name %></p>
     </div>
   </div>
       <p><%= rss_link_to :action => :rss, :display_name => @entry.user.display_name %></p>
     </div>
   </div>


@@ -12,8 +12,7 @@
 
 <%= render @entry %>
 
 
 <%= render @entry %>
 

-<a id="comments"></a>
-<div class='comments'>
+<div id="comments" class="comments">

 <%= render :partial => "diary_comment", :collection => @comments %>
 </div>
 
 <%= render :partial => "diary_comment", :collection => @comments %>
 </div>