From: Tom Hughes <tom@compton.nu>
Date: Tue, 3 Dec 2024 18:36:23 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/5372'
X-Git-Tag: live~526
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/572d1adaae6a8f7100c829ce9d3da4dbf07bb7fd?hp=10bd646d4036d9358625f6f848e263260cc6fc71

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index b179ec5ad..cf63c8f8c 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -932,8 +932,9 @@ div.secondary-actions {
   }
 }
 
-/* Rules for block pages */
+/* Rules for tables with usernames */
 
+.messages-table .username,
 #block_list .username {
   max-width: 20em;
 }
diff --git a/app/views/messages/_message_summary.html.erb b/app/views/messages/_message_summary.html.erb
index a181e96e1..7213cf80d 100644
--- a/app/views/messages/_message_summary.html.erb
+++ b/app/views/messages/_message_summary.html.erb
@@ -1,5 +1,5 @@
 <%= tag.tr(:id => "inbox-#{message.id}", :class => { "table-success" => !message.message_read? }) do %>
-  <td><%= link_to message.sender.display_name, user_path(message.sender) %></td>
+  <td><%= link_to message.sender.display_name, user_path(message.sender), :class => "username d-inline-block text-truncate text-wrap align-bottom", :dir => "auto" %></td>
   <td><%= link_to message.title, message_path(message) %></td>
   <td class="text-nowrap"><%= l message.sent_on, :format => :friendly %></td>
   <td class="text-nowrap">
diff --git a/app/views/messages/_sent_message_summary.html.erb b/app/views/messages/_sent_message_summary.html.erb
index cf10cd462..f744d028a 100644
--- a/app/views/messages/_sent_message_summary.html.erb
+++ b/app/views/messages/_sent_message_summary.html.erb
@@ -1,5 +1,5 @@
 <%= tag.tr(:id => "outbox-#{message.id}") do %>
-  <td><%= link_to message.recipient.display_name, user_path(message.recipient) %></td>
+  <td><%= link_to message.recipient.display_name, user_path(message.recipient), :class => "username d-inline-block text-truncate text-wrap align-bottom", :dir => "auto" %></td>
   <td><%= link_to message.title, message_path(message) %></td>
   <td class="text-nowrap"><%= l message.sent_on, :format => :friendly %></td>
   <td class="text-nowrap">