Use flexbox to position user thumbnails on the dashboard
This fixes a poor interaction involving lots of margins and the secondary-actions list
This commit is contained in:
parent
99abdeb683
commit
9aa17258fc
2 changed files with 13 additions and 17 deletions
|
@ -4,10 +4,12 @@
|
|||
: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", :data => { :user => user_data } do %>
|
||||
<%= user_thumbnail contact %>
|
||||
<div class='activity-details'>
|
||||
<p class='text-muted'>
|
||||
<%= tag.div :class => "contact-activity clearfix row", :data => { :user => user_data } do %>
|
||||
<div class="col-auto">
|
||||
<%= user_thumbnail contact, :class => "user_thumbnail_no_margins" %>
|
||||
</div>
|
||||
<div class="col">
|
||||
<p class='text-muted mb-0'>
|
||||
<%= link_to contact.display_name, user_path(contact) %>
|
||||
<% if @user.home_lon and @user.home_lat and contact.home_lon and contact.home_lat %>
|
||||
<% distance = @user.distance(contact) %>
|
||||
|
@ -18,7 +20,7 @@
|
|||
<% end %>
|
||||
<% end %>
|
||||
</p>
|
||||
<p>
|
||||
<p class="mb-0">
|
||||
<% changeset = contact.changesets.first %>
|
||||
<% if changeset %>
|
||||
<%= t("users.show.latest edit", :ago => time_ago_in_words(changeset.created_at, :scope => :"datetime.distance_in_words_ago")) %>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue