From 0fb1c122f4254f8dfa5d5ad3905564534c69cfe6 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Thu, 4 Feb 2021 15:20:07 -0500
Subject: [PATCH] UX: Clarify user rejection modal (#11967)

---
 .../app/templates/modal/reject-reason-reviewable.hbs        | 6 ++----
 .../javascripts/discourse/tests/acceptance/review-test.js   | 2 +-
 app/assets/stylesheets/common/base/modal.scss               | 6 +++---
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/templates/modal/reject-reason-reviewable.hbs b/app/assets/javascripts/discourse/app/templates/modal/reject-reason-reviewable.hbs
index c5f5c6334f5..ca82a2f7cc5 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/reject-reason-reviewable.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/reject-reason-reviewable.hbs
@@ -12,8 +12,6 @@
 {{/d-modal-body}}
 
 <div class="modal-footer">
-  {{d-button action=(route-action "closeModal") label="close"}}
-  <div class="pull-right">
-    {{d-button icon="trash-alt" class="btn-danger" action=(action "perform")}}
-  </div>
+  {{d-button icon="trash-alt" class="btn-danger" action=(action "perform") label="admin.user.delete"}}
+  {{d-button action=(route-action "closeModal") label="cancel"}}
 </div>
diff --git a/app/assets/javascripts/discourse/tests/acceptance/review-test.js b/app/assets/javascripts/discourse/tests/acceptance/review-test.js
index 8a205de0b53..ad7041a207d 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/review-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/review-test.js
@@ -49,7 +49,7 @@ acceptance("Review", function (needs) {
       "it opens reject reason modal when user is rejected"
     );
 
-    await click(".modal-footer button[aria-label='Close']");
+    await click(".modal-footer button[aria-label='cancel']");
 
     await click(
       `${user} .reviewable-actions button[data-name="Delete User..."]`
diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss
index 432f2a4070c..34b2aef3f53 100644
--- a/app/assets/stylesheets/common/base/modal.scss
+++ b/app/assets/stylesheets/common/base/modal.scss
@@ -167,16 +167,16 @@
   align-items: center;
   padding: 14px 15px 10px;
   border-top: 1px solid var(--primary-low);
+  --btn-bottom-margin: 0.3em;
   .btn {
-    margin: 0 0.3em 0 0;
+    margin: 0 0.75em var(--btn-bottom-margin) 0;
     &[href] {
       min-height: unset;
     }
   }
 
-  .btn,
   a {
-    margin-bottom: 0.3em;
+    margin-bottom: var(--btn-bottom-margin);
   }
 }