From 7346fc21749c54ffc0a84c7af990a9d6b29e1a67 Mon Sep 17 00:00:00 2001
From: Go MAEDA <maeda@farend.jp>
Date: Tue, 28 Jan 2025 07:58:59 +0000
Subject: [PATCH] Merged r23461 and r23462 from trunk to 6.0-stable (#42126).

git-svn-id: https://svn.redmine.org/redmine/branches/6.0-stable@23468 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/assets/stylesheets/application.css        | 2 +-
 app/views/projects/settings/_members.html.erb | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 4e019d834..d57324397 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -434,7 +434,7 @@ tr.version.closed, tr.version.closed a { color: #999; }
 tr.version:not(.shared) td.name { padding-left: 20px; }
 tr.version td.date, tr.version td.status, tr.version td.sharing { text-align: center; white-space:nowrap; }
 
-tr.member td.icon-user, #principals_for_new_member .icon-user {background:transparent;}
+#principals_for_new_member .icon-user {background:transparent;}
 #principals_for_new_member svg, #principals_for_new_member img {margin-right: 4px;}
 
 tr.user td {width:13%;white-space: nowrap;}
diff --git a/app/views/projects/settings/_members.html.erb b/app/views/projects/settings/_members.html.erb
index 6e13808b6..abe4ed996 100644
--- a/app/views/projects/settings/_members.html.erb
+++ b/app/views/projects/settings/_members.html.erb
@@ -19,9 +19,11 @@
   <% members.each do |member| %>
   <% next if member.new_record? %>
   <tr id="member-<%= member.id %>" class="member">
-  <td class="name icon icon-<%= member.principal.class.name.downcase %>">
-    <%= principal_icon(member.principal) %>
-    <%= link_to_user member.principal %>
+  <td class="name">
+    <span class="icon">
+      <%= principal_icon(member.principal) %>
+      <%= link_to_user member.principal %>
+    </span>
   </td>
   <td class="roles">
     <span id="member-<%= member.id %>-roles"><%= member.roles.sort.collect(&:to_s).join(', ') %></span>