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

diff --cc app/assets/stylesheets/common.scss
Simple merge

diff --cc app/views/dashboards/_contact.html.erb
index cf1866cc9ca9e5619fd367f4c7abce27282202ff,dd78b1c86812750861ee9b69ad4f08402382cf7f..77363dbdb0a627b50f409eaa00fa69ab121b35af
--- 1/app/views/dashboards/_contact.html.erb
--- 2/app/views/dashboards/_contact.html.erb
+++ b/app/views/dashboards/_contact.html.erb
@@@ -4,9 -4,9 +4,9 @@@
       :icon => image_path(type == "friend" ? "marker-blue.png" : "marker-green.png"),
       :description => render(:partial => "popup", :object => contact, :locals => { :type => type })
     } %>
 -<%= tag.div :class => "contact-activity clearfix row", :data => { :user => user_data } do %>
 +<%= tag.div :class => "clearfix row", :data => { :user => user_data } do %>
    <div class="col-auto">
-     <%= user_thumbnail contact, :class => "user_thumbnail_no_margins" %>
+     <%= user_thumbnail contact %>
    </div>
    <div class="col">
      <p class='text-muted mb-0'>

diff --cc app/views/diary_entries/index.html.erb
index acab663bc991c6e75a779f025c0be8e4a14d4e7d,15a3b0692e7b846d2df00b3c3ba8a7f09f21f8e8..b08bf05a4261a27315d1c39ecf0910ba0adb8d0d
--- 1/app/views/diary_entries/index.html.erb
--- 2/app/views/diary_entries/index.html.erb
+++ b/app/views/diary_entries/index.html.erb
@@@ -1,26 -1,31 +1,31 @@@
 -<% content_for :head, tag(:meta, :name => :robots, :content => :noindex) %>
 +<% content_for :head, tag.meta(:name => :robots, :content => :noindex) %>
  <% content_for :heading do %>
-   <div <% if @user %> id="userinformation"<% end %>>
+   <div <% if @user %> id="userinformation"<% end %> class="row">
      <% if @user %>
-       <%= user_image @user %>
+         <div class="col-auto">
+           <%= user_image @user %>
+         </div>
      <% end %>
-     <h1><%= @title %></h1>
  
-     <nav class="secondary-actions">
-       <ul class="clearfix">
-         <% unless params[:friends] or params[:nearby] -%>
-           <li><%= rss_link_to :action => "rss", :language => params[:language] %></li>
-           <% end -%>
+     <div class="col">
+       <h1><%= @title %></h1>
  
-           <% if @user && @user == current_user || !@user && current_user %>
-             <li><%= link_to image_tag("new.png", :class => "small_icon") + t(".new"), new_diary_entry_path, :title => t(".new_title") %></li>
-           <% end %>
+       <nav class="secondary-actions">
+         <ul class="clearfix">
+           <% unless params[:friends] or params[:nearby] -%>
+             <li><%= rss_link_to :action => "rss", :language => params[:language] %></li>
+             <% end -%>
  
-           <% if !@user && current_user %>
-             <li><%= link_to t(".my_diary"), :controller => "diary_entries", :action => "index", :display_name => current_user.display_name %></li>
-           <% end %>
-       </ul>
-     </nav>
+             <% if @user && @user == current_user || !@user && current_user %>
+               <li><%= link_to image_tag("new.png", :class => "small_icon") + t(".new"), new_diary_entry_path, :title => t(".new_title") %></li>
+             <% end %>
+ 
+             <% if !@user && current_user %>
+               <li><%= link_to t(".my_diary"), :controller => "diary_entries", :action => "index", :display_name => current_user.display_name %></li>
+             <% end %>
+         </ul>
+       </nav>
+     </div>
    </div>
  <% end %>