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

diff --combined app/assets/stylesheets/common.scss
index 8be986db5ff4909faa57b13e0837c4b3c2b661c1,2f7c959c0fbc90c76ce32769988427a148631aab..260504ac3314ebfda02d7384a153d3ad063cf3c8
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -30,6 -30,11 +30,6 @@@ small, aside 
  
  #container { position: relative; }
  
 -.column-1 {
 -  width: 50%;
 -  margin: 0 0 $lineheight/2 0;
 -}
 -
  .small_icon {
    vertical-align: middle;
    margin-right: $lineheight/4;
@@@ -96,6 -101,10 +96,10 @@@ a 
    }
  }
  
+ .text-muted a {
+   color: $blue;
+ }
+ 
  /* Rules for the header */
  
  #menu-icon {
@@@ -1266,15 -1275,12 +1270,15 @@@ tr.turn:hover 
  /* Rules for small maps in content areas */
  
  .content_map {
 -  position: relative;
 -  width: 45%;
 -  height: 400px;
 +  height: 200px;
    border: 1px solid $grey;
    margin-bottom: $lineheight;
 -  float: right;
 +}
 +
 +@include media-breakpoint-up(md) {
 +  .content_map {
 +    height: 400px;
 +  }
  }
  
  /* Rules for the new trace form */
@@@ -1327,6 -1333,16 +1331,6 @@@
    margin-right: $lineheight;
  }
  
 -.activity-block {
 -  clear: left;
 -  border-bottom: 1px solid $grey;
 -  padding-bottom: $lineheight;
 -  float: left;
 -  h3 {
 -    margin-bottom: $lineheight/2;
 -  }
 -}
 -
  .contact-activity {
    margin-top: $lineheight;
    width: 100%;
@@@ -1405,7 -1421,7 +1409,7 @@@
      margin-top: $lineheight/2;
    }
  
-   &.deemphasize {
+   &.deleted {
      background-color: #fee;
    }
  
@@@ -1460,7 -1476,7 +1464,7 @@@
        padding-top: $lineheight;
        border-top: 1px solid $grey;
      }
-     &.deemphasize {
+     &.deleted {
        background-color: #fee;
      }
      p {
@@@ -1555,6 -1571,11 +1559,6 @@@
    display: inline !important;
  }
  
 -.content_map.settings_map {
 -  width: 50%;
 -  float: none;
 -}
 -
  /* Rules for the oauth settings page */
  
  .oauth_clients .buttons .oauth-edit {

diff --combined app/assets/stylesheets/small.scss
index 0b62256a941686ab623e7740e36079cabe79ca08,ed3eb306477bdc0eb0627e44fc460d685417f7b1..4b741baaed981cb65afe892ce39b866145fe1146
--- 1/app/assets/stylesheets/small.scss
--- 2/app/assets/stylesheets/small.scss
+++ b/app/assets/stylesheets/small.scss
@@@ -9,6 -9,10 +9,6 @@@ body.small 
      -webkit-appearance: none;
    }
  
 -  .column-1 {
 -    width: 100%;
 -  }
 -
    #menu-icon {
      display: inline-block !important;
    }
@@@ -101,6 -105,15 +101,6 @@@
      top: 10px !important;
    }
  
 -  .content_map {
 -    width: 100%;
 -    border: none;
 -    float: none;
 -    height: 200px;
 -    max-height: none;
 -    min-height: auto;
 -  }
 -
    /* Rules for the login form */
  
    #login_login input#user_email {
@@@ -129,13 -142,6 +129,6 @@@
      height: 300px !important;
    }
  
-   #userinformation .deemphasize {
-     position: relative;
-     right: auto; left: auto;
-     margin-top: 10px;
-     top: auto;
-   }
- 
    &.site-about #content .attr h1 {
      font-size: 28px;
    }

diff --combined app/views/users/show.html.erb
index 4e48ee983ea4bee5fcbc62d1d7a2fca3f4d986ce,1bd5f8fa5ba531c50225568472ed27a901f80b2b..440d68874ff9e323b38e63f3f8a9f86086f2d5b7
--- 1/app/views/users/show.html.erb
--- 2/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@@ -11,7 -11,7 +11,7 @@@
              <span class='count-number'><%= number_with_delimiter(current_user.changesets.size) %></span>
            </li>
            <li>
 -            <%= link_to t(".my notes"), :controller => "notes", :action => "mine" %>
 +            <%= link_to t(".my notes"), user_notes_path(@user) %>
            </li>
            <li>
              <%= link_to t(".my traces"), :controller => "traces", :action => "mine" %>
@@@ -53,7 -53,7 +53,7 @@@
              <span class='count-number'><%= number_with_delimiter(@user.changesets.size) %></span>
            </li>
            <li>
 -            <%= link_to t(".notes"), :controller => "notes", :action => "mine" %>
 +            <%= link_to t(".notes"), user_notes_path(@user) %>
            </li>
            <li>
              <%= link_to t(".traces"), :controller => "traces", :action => "index", :display_name => @user.display_name %>
@@@ -147,7 -147,7 +147,7 @@@
  
          <% end %>
  
-       <p class='deemphasize'>
+       <p class='text-muted'>
          <small>
            <%= t ".mapper since" %> <%= l @user.creation_time.to_date, :format => :long %>
            <% unless @user.terms_agreed %>
@@@ -168,7 -168,7 +168,7 @@@
    </div>
  
    <% if current_user and current_user.administrator? -%>
-     <div class='admin-user-info deemphasize'>
+     <div class='admin-user-info text-muted'>
        <small><b><%= t ".email address" %></b> <%= @user.email %></small>
        <% unless @user.creation_ip.nil? -%>
          <small><b><%= t ".created from" %></b> <%= @user.creation_ip %></small>
@@@ -180,60 -180,56 +180,60 @@@
  
  <% end %>
  
 +<div class="row">
    <% if current_user and @user.id == current_user.id %>
 -    <% if @user.home_lat.nil? or @user.home_lon.nil? %>
 -      <div id="map" class="content_map">
 -        <p id="no_home_location"><%= t(".if_set_location_html", :settings_link => (link_to t(".settings_link_text"), :controller => "users", :action => "account", :display_name => current_user.display_name)) %></p>
 -      </div>
 -    <% else %>
 -      <% content_for :head do %>
 -        <%= javascript_include_tag "user" %>
 +    <div class="col-md order-md-last">
 +      <% if @user.home_lat.nil? or @user.home_lon.nil? %>
 +        <div id="map" class="content_map">
 +          <p id="no_home_location"><%= t(".if_set_location_html", :settings_link => (link_to t(".settings_link_text"), :controller => "users", :action => "account", :display_name => current_user.display_name)) %></p>
 +        </div>
 +      <% else %>
 +        <% content_for :head do %>
 +          <%= javascript_include_tag "user" %>
 +        <% end %>
 +        <% user_data = {
 +             :lon => current_user.home_lon,
 +             :lat => current_user.home_lat,
 +             :icon => image_path("marker-red.png"),
 +             :description => render(:partial => "popup", :object => current_user, :locals => { :type => "your location" })
 +           } %>
 +        <%= tag.div "", :id => "map", :class => "content_map", :data => { :user => user_data } %>
        <% end %>
 -      <% user_data = {
 -           :lon => current_user.home_lon,
 -           :lat => current_user.home_lat,
 -           :icon => image_path("marker-red.png"),
 -           :description => render(:partial => "popup", :object => current_user, :locals => { :type => "your location" })
 -         } %>
 -      <%= tag.div "", :id => "map", :class => "content_map", :data => { :user => user_data } %>
 -    <% end %>
 -
 -    <% friends = @user.friends %>
 -    <% nearby = @user.nearby - friends %>
 -
 -  <div class="activity-block column-1">
 -    <h3><%= t ".my friends" %></h3>
 -
 -    <% if friends.empty? %>
 -      <%= t ".no friends" %>
 -    <% else %>
 -      <ul class='secondary-actions clearfix'>
 -        <li><%= link_to t(".friends_changesets"), friend_changesets_path %></li>
 -        <li><%= link_to t(".friends_diaries"), friends_diary_entries_path %></li>
 -      </ul>
 -      <div id="friends-container">
 -        <%= render :partial => "contact", :collection => friends, :locals => { :type => "friend" } %>
 -      </div>
 -    <% end %>
 -  </div>
  
 -  <div class="activity-block column-1">
 -    <h3><%= t ".nearby users" %></h3>
 -
 -    <% if nearby.empty? %>
 -      <%= t ".no nearby users" %>
 -    <% else %>
 -      <ul class='secondary-actions clearfix'>
 -        <li><%= link_to t(".nearby_changesets"), nearby_changesets_path %></li>
 -        <li><%= link_to t(".nearby_diaries"), nearby_diary_entries_path %></li>
 -      </ul>
 -      <div id="nearbyusers">
 -        <%= render :partial => "contact", :collection => nearby, :locals => { :type => "nearby mapper" } %>
 -      </div>
 -    <% end %>
 -  </div>
 -<% end %>
 +      <% friends = @user.friends %>
 +      <% nearby = @user.nearby - friends %>
 +    </div>
 +
 +    <div class="col-md">
 +      <h3><%= t ".my friends" %></h3>
 +
 +      <% if friends.empty? %>
 +        <%= t ".no friends" %>
 +      <% else %>
 +        <ul class='secondary-actions clearfix'>
 +          <li><%= link_to t(".friends_changesets"), friend_changesets_path %></li>
 +          <li><%= link_to t(".friends_diaries"), friends_diary_entries_path %></li>
 +        </ul>
 +        <div id="friends-container">
 +          <%= render :partial => "contact", :collection => friends, :locals => { :type => "friend" } %>
 +        </div>
 +      <% end %>
 +
 +      <hr>
 +
 +      <h3><%= t ".nearby users" %></h3>
 +
 +      <% if nearby.empty? %>
 +        <%= t ".no nearby users" %>
 +      <% else %>
 +        <ul class='secondary-actions clearfix'>
 +          <li><%= link_to t(".nearby_changesets"), nearby_changesets_path %></li>
 +          <li><%= link_to t(".nearby_diaries"), nearby_diary_entries_path %></li>
 +        </ul>
 +        <div id="nearbyusers">
 +          <%= render :partial => "contact", :collection => nearby, :locals => { :type => "nearby mapper" } %>
 +        </div>
 +      <% end %>
 +    </div>
 +  <% end %>
 +</div>