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

diff --combined app/assets/stylesheets/common.scss
index 255e04511b0eff0f228e141a40189822067f6b9d,bd6e97691cd03c9f6a89f7c7ec5e8ab91e869619..f2afdcf7a9446f8d29c369ffe0eecec6becbe13a
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -370,6 -370,8 +370,6 @@@ body.compact-nav 
      }
  
      h3, h4 {
 -      margin-top: $lineheight;
 -      margin-bottom: $lineheight/2;
        font-size: 1.25rem;
      }
  
@@@ -811,6 -813,7 +811,6 @@@ tr.turn:hover 
      border-bottom: 1px solid $grey;
  
      h4:first-child {
 -      margin-top: 0;
        word-wrap: break-word;
      }
    }
@@@ -855,7 -858,6 +855,7 @@@
      border-collapse: separate;
      border-spacing: 0;
      width: 100%;
 +    margin-bottom: $spacer;
  
      th, td {
        border-bottom: 1px solid $grey;
@@@ -908,7 -910,7 +908,7 @@@
  
    .subscribe-buttons {
      float: left;
 -    margin: 18px 10px 10px;
 +    margin: 0 10px;
      min-width: 80px;
    }
  
@@@ -964,7 -966,7 +964,7 @@@
    }
  
    .export_area_inputs {
 -    margin-bottom: $lineheight/2;
 +    margin-bottom: $spacer;
      input[type="text"] {
        width: 100px;
        text-align: center;
@@@ -1092,6 -1094,13 +1092,6 @@@
    }
  }
  
 -/* Rules for the user profile page */
 -
 -.contact-activity {
 -  margin-top: $lineheight;
 -  width: 100%;
 -}
 -
  /* Rules for the user map */
  
  .content_map .leaflet-popup-content {
@@@ -1108,16 -1117,26 +1108,12 @@@
      margin-top: 0 0 0 60px;
      font-size: 12px;
    }
-   img.user_thumbnail {
-     float: left;
-     margin: 0 $lineheight/2 0 0;
-   }
  }
  
  /* Rules for the user list */
  
  #user_list {
    width: 100%;
 -
 -  tr {
 -    vertical-align: middle;
 -  }
 -
 -  p {
 -    margin-top: 0px;
 -    margin-bottom: 0px;
 -  }
 -}
 -
 -#user_list_actions {
 -  float: right;
 -  margin-top: $lineheight/2;
  }
  
  /* Rules for the diary list page */
@@@ -1402,28 -1421,12 +1398,12 @@@ img.user_image 
    max-width: 100px;
    max-height: 100px;
    border: 1px solid $grey;
-   margin-bottom: $lineheight;
-   float: left;
-   margin-right: $lineheight;
- }
- 
- img.user_image_no_margins {
-   max-width: 100px;
-   max-height: 100px;
-   border: 1px solid $grey;
  }
  
  img.user_thumbnail {
    max-width: 50px;
    max-height: 50px;
    border: 1px solid $grey;
-   margin-right: $lineheight;
- }
- 
- img.user_thumbnail_no_margins {
-   max-width: 50px;
-   max-height: 50px;
-   border: 1px solid $grey;
  }
  
  img.user_thumbnail_tiny {
@@@ -1589,10 -1592,6 +1569,6 @@@ dl.dl-inline 
    }
  }
  
- .comments .richtext {
-   margin-left: 70px;
- }
- 
  /* Rules for the user notes list */
  
  .note_list {

diff --combined 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 --combined 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 %>