From d00711fa7a419ad019e7115aebba1341580e3bb8 Mon Sep 17 00:00:00 2001
From: Kalila L <somnilibertas@gmail.com>
Date: Sat, 3 Apr 2021 21:08:07 -0400
Subject: [PATCH 1/2] Update Pal.qml

Fix Pal ban buttons overlapping with width (maybe...) and add descriptions for new ban button.
---
 interface/resources/qml/hifi/Pal.qml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/interface/resources/qml/hifi/Pal.qml b/interface/resources/qml/hifi/Pal.qml
index 15425ec15c..d74d7cd88e 100644
--- a/interface/resources/qml/hifi/Pal.qml
+++ b/interface/resources/qml/hifi/Pal.qml
@@ -478,7 +478,7 @@ Rectangle {
                 visible: iAmAdmin;
                 role: "mute";
                 title: "SILENCE";
-                width: actionButtonWidth;
+                width: actionButtonWidth - 8;
                 movable: false;
                 resizable: false;
             }
@@ -608,7 +608,7 @@ Rectangle {
                     enabled: !nameCard.isReplicated;
                     anchors.verticalCenter: itemCell.verticalCenter;
                     anchors.left: parent.left;
-                    anchors.leftMargin: styleData.role === "kick" ? 4 : 18;
+                    anchors.leftMargin: styleData.role === "kick" ? 1 : 14;
                     width: 32;
                     height: 32;
                     onClicked: {
@@ -640,7 +640,7 @@ Rectangle {
                     enabled: !nameCard.isReplicated;
                     anchors.verticalCenter: itemCell.verticalCenter;
                     anchors.left: parent.left;
-                    anchors.leftMargin: actionButton.width + 14;
+                    anchors.leftMargin: actionButton.width + 3;
                     width: 32;
                     height: 32;
                     onClicked: {
@@ -755,7 +755,8 @@ Rectangle {
                 onClicked: letterbox(hifi.glyphs.question,
                                      "Admin Actions",
                                      "<b>Silence</b> mutes a user's microphone. Silenced users can unmute themselves by clicking &quot;UNMUTE&quot; on their toolbar.<br><br>" +
-                                     "<b>Ban</b> removes a user from this domain and prevents them from returning. Admins can un-ban users from the Sandbox Domain Settings page.");
+                                     "<b>Ban (left)</b> identifies a user by username (if applicable) and machine fingerprint, then removes them from this domain and prevents them from returning. Admins can un-ban users from the Server Domain Settings page.<br><br>" +
+                                     "<b>Hard Ban (right)</b> identifies a user by username (if applicable), machine fingerprint, and IP address, then removes them from this domain and prevents them from returning. Admins can un-ban users from the Sandbox Domain Settings page.");
                 onEntered: adminHelpText.color = "#94132e";
                 onExited: adminHelpText.color = hifi.colors.redHighlight;
             }

From 8c9291086192a8905af9cc1086f132a16e1666d4 Mon Sep 17 00:00:00 2001
From: Kalila <69767640+digisomni@users.noreply.github.com>
Date: Sat, 3 Apr 2021 22:49:56 -0400
Subject: [PATCH 2/2] Update interface/resources/qml/hifi/Pal.qml

Co-authored-by: David Rowe <david@ctrlaltstudio.com>
---
 interface/resources/qml/hifi/Pal.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/resources/qml/hifi/Pal.qml b/interface/resources/qml/hifi/Pal.qml
index d74d7cd88e..15fa8df93d 100644
--- a/interface/resources/qml/hifi/Pal.qml
+++ b/interface/resources/qml/hifi/Pal.qml
@@ -756,7 +756,7 @@ Rectangle {
                                      "Admin Actions",
                                      "<b>Silence</b> mutes a user's microphone. Silenced users can unmute themselves by clicking &quot;UNMUTE&quot; on their toolbar.<br><br>" +
                                      "<b>Ban (left)</b> identifies a user by username (if applicable) and machine fingerprint, then removes them from this domain and prevents them from returning. Admins can un-ban users from the Server Domain Settings page.<br><br>" +
-                                     "<b>Hard Ban (right)</b> identifies a user by username (if applicable), machine fingerprint, and IP address, then removes them from this domain and prevents them from returning. Admins can un-ban users from the Sandbox Domain Settings page.");
+                                     "<b>Hard Ban (right)</b> identifies a user by username (if applicable), machine fingerprint, and IP address, then removes them from this domain and prevents them from returning. Admins can un-ban users from the Server Domain Settings page.");
                 onEntered: adminHelpText.color = "#94132e";
                 onExited: adminHelpText.color = hifi.colors.redHighlight;
             }