Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UX: Clarify user rejection modal (#11967)

This commit is contained in:
Kris 2021-02-04 15:20:07 -05:00 committed by GitHub
parent c307604d7f
commit 0fb1c122f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/discourse/app/templates/modal/reject-reason-reviewable.hbs
View File

@ -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>

2
app/assets/javascripts/discourse/tests/acceptance/review-test.js
View File

@ -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..."]`

6
app/assets/stylesheets/common/base/modal.scss
View File

@ -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);
}
}