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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index b179ec5ada7638a3d27ce482820b9d06af26d301..cf63c8f8c4600ef3026ceb4f08bcf5e58e8f020b 100644 (file)
--- 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 a181e96e1254b5178f18225ea7c21917adf295a4..7213cf80dcedb66c8a20c2ecf06d4671ba372fc5 100644 (file)
--- 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 cf10cd462ef52ef49079364ad8575d9f1aa9e01f..f744d028a6044e9478bfb1b83faca9c7cfa1346d 100644 (file)
--- 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">