From 8aeb68fe731601d6c1e40cedd66987cb663f9efb Mon Sep 17 00:00:00 2001
From: ishikawa999 <remember929@gmail.com>
Date: Tue, 4 Jan 2022 01:53:20 +0000
Subject: [PATCH 2/2] Separate delete link and edit link columns

---
 app/views/projects/settings/_members.html.erb | 7 +++++--
 public/stylesheets/application.css            | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/views/projects/settings/_members.html.erb b/app/views/projects/settings/_members.html.erb
index 743e7947e9..3040083b56 100644
--- a/app/views/projects/settings/_members.html.erb
+++ b/app/views/projects/settings/_members.html.erb
@@ -11,7 +11,8 @@
     <tr>
       <th><%= l(:label_user) %> / <%= l(:label_group) %></th>
       <th><%= l(:label_role_plural) %></th>
-      <th style="width:15%"></th>
+      <th class="fit-content-width"></th>
+      <th class="fit-content-width"></th>
       <%= call_hook(:view_projects_settings_members_table_header, :project => @project) %>
     </tr>
   </thead>
@@ -24,11 +25,13 @@
     <span id="member-<%= member.id %>-roles"><%= member.roles.sort.collect(&:to_s).join(', ') %></span>
     <div id="member-<%= member.id %>-form"></div>
   </td>
-  <td class="buttons">
+  <td class="buttons edit-button">
       <%= link_to l(:button_edit),
                   edit_membership_path(member),
                   :remote => true,
                   :class => 'icon icon-edit' %>
+  </td>
+  <td class="buttons delete-button">
       <%= delete_link membership_path(member),
                       :remote => true,
                       :data => {:confirm => (!User.current.admin? && member.include?(User.current) ? l(:text_own_membership_delete_confirmation) : l(:text_are_you_sure))} if member.deletable? %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 1cae2e6e07..6b1469a969 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -322,6 +322,7 @@ table.files tr.file td.filename { text-align: left; padding-left: 24px; }
 table.files tr.file td.digest { font-size: 80%; }
 
 table.members td.roles, table.memberships td.roles { width: 45%; }
+table.members th.fit-content-width { width: 1px; white-space: nowrap; }
 
 table.messages td.last_message {text-align:left;}
 tr.message { height: 2.6em; }
-- 
2.30.2