diff --git a/app/assets/javascripts/admin/addon/templates/modal/admin-penalize-user.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-penalize-user.hbs index 1303d01d808..ea8ae78a8f2 100644 --- a/app/assets/javascripts/admin/addon/templates/modal/admin-penalize-user.hbs +++ b/app/assets/javascripts/admin/addon/templates/modal/admin-penalize-user.hbs @@ -57,7 +57,6 @@ /> {{/if}} -
{{html-safe this.penaltyHistory}}
{{else}} {{#if (eq this.penaltyType "suspend")}}
{{i18n "admin.user.cant_suspend"}}
@@ -65,6 +64,7 @@
{{i18n "admin.user.cant_silence"}}
{{/if}} {{/if}} +
{{html-safe this.penaltyHistory}}
diff --git a/app/assets/stylesheets/common/admin/penalty.scss b/app/assets/stylesheets/common/admin/penalty.scss index 6e846748c7a..4505a89a4ce 100644 --- a/app/assets/stylesheets/common/admin/penalty.scss +++ b/app/assets/stylesheets/common/admin/penalty.scss @@ -1,5 +1,8 @@ .silence-user-modal, .suspend-user-modal { + .modal-body { + padding-bottom: 0em; + } .penalty-duration, .penalty-suspend-forever, .suspend-reason-title, @@ -87,4 +90,24 @@ } } } + .penalty-history { + position: sticky; + bottom: 0; + background-color: var(--secondary); + padding: 0.5em 0 1em 0; + } + .penalty-history::before { + position: absolute; + content: ""; + display: block; + height: 1.5em; + top: -1.5em; + width: 100%; + pointer-events: none; + background: linear-gradient( + to bottom, + rgba(var(--secondary-rgb), 0), + rgba(var(--secondary-rgb), 1) + ); + } }