From 2138f3e40fdd32a827aec4b36eef50ff138efda2 Mon Sep 17 00:00:00 2001 From: Emelia Smith Date: Tue, 2 Sep 2025 09:54:58 +0200 Subject: [PATCH] Move 'add more' inside table toolbar on reports (#35963) --- app/javascript/styles/mastodon/tables.scss | 4 ++++ app/views/admin/reports/show.html.haml | 7 +++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/javascript/styles/mastodon/tables.scss b/app/javascript/styles/mastodon/tables.scss index 3b92b23b6f8..3489d22e5d7 100644 --- a/app/javascript/styles/mastodon/tables.scss +++ b/app/javascript/styles/mastodon/tables.scss @@ -205,6 +205,10 @@ a.table-action-link { &__actions { text-align: end; padding-inline-end: 16px - 5px; + + .table-action-link { + padding: 0; + } } } diff --git a/app/views/admin/reports/show.html.haml b/app/views/admin/reports/show.html.haml index 516d2f5d2c7..86f87f197eb 100644 --- a/app/views/admin/reports/show.html.haml +++ b/app/views/admin/reports/show.html.haml @@ -40,10 +40,6 @@ %p = t 'admin.reports.statuses_description_html' - — - = link_to safe_join([material_symbol('add'), t('admin.reports.add_to_report')]), - admin_account_statuses_path(@report.target_account_id, report_id: @report.id), - class: 'table-action-link' = form_with model: @form, url: batch_admin_account_statuses_path(@report.target_account_id, report_id: @report.id) do |f| .batch-table @@ -51,6 +47,9 @@ %label.batch-table__toolbar__select.batch-checkbox-all = check_box_tag :batch_checkbox_all, nil, false .batch-table__toolbar__actions + = link_to safe_join([material_symbol('add'), t('admin.reports.add_to_report')]), + admin_account_statuses_path(@report.target_account_id, report_id: @report.id), + class: 'table-action-link' - if !@statuses.empty? && @report.unresolved? = f.button safe_join([material_symbol('close'), t('admin.statuses.batch.remove_from_report')]), name: :remove_from_report, class: 'table-action-link', type: :submit .batch-table__body