gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-09-05 17:31:12 +00:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

Move 'add more' inside table toolbar on reports (#35963)

Browse Source
This commit is contained in:
Emelia Smith 2025-09-02 09:54:58 +02:00 committed by GitHub
parent fb736eaed5
commit 2138f3e40f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/styles/mastodon/tables.scss
View File

@ -205,6 +205,10 @@ a.table-action-link {
&__actions { &__actions {
text-align: end; text-align: end;
padding-inline-end: 16px - 5px; padding-inline-end: 16px - 5px;
.table-action-link {
padding: 0;
}
} }
} }

7
app/views/admin/reports/show.html.haml
View File

@ -40,10 +40,6 @@
%p %p
= t 'admin.reports.statuses_description_html' = 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| = form_with model: @form, url: batch_admin_account_statuses_path(@report.target_account_id, report_id: @report.id) do |f|
.batch-table .batch-table
@ -51,6 +47,9 @@
%label.batch-table__toolbar__select.batch-checkbox-all %label.batch-table__toolbar__select.batch-checkbox-all
= check_box_tag :batch_checkbox_all, nil, false = check_box_tag :batch_checkbox_all, nil, false
.batch-table__toolbar__actions .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? - 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 = 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 .batch-table__body