monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

This commit is contained in:
Jenkins 2018-04-19 22:17:23 +00:00
parent 40006bcd03 ca2cbe8f0f
commit ed17e173d6
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/javascript/styles/mastodon/reset.scss
View File

@ -53,6 +53,11 @@ table {
border-spacing: 0; border-spacing: 0;
} }
::-webkit-scrollbar {
width: 12px;
height: 12px;
}
::-webkit-scrollbar-thumb { ::-webkit-scrollbar-thumb {
background: lighten($ui-base-color, 4%); background: lighten($ui-base-color, 4%);
border: 0px none $base-border-color; border: 0px none $base-border-color;

22
app/views/admin/reports/_report.html.haml
View File

@ -5,18 +5,18 @@
= link_to report.target_account.acct, admin_account_path(report.target_account.id) = link_to report.target_account.acct, admin_account_path(report.target_account.id)
%td.reporter %td.reporter
= link_to report.account.acct, admin_account_path(report.account.id) = link_to report.account.acct, admin_account_path(report.account.id)
%td.comment %td
%span{ title: report.comment } %div{ title: report.comment }
= truncate(report.comment, length: 30, separator: ' ') = truncate(report.comment, length: 30, separator: ' ')
%td.stats %div
- unless report.statuses.empty? - unless report.statuses.empty?
%span{ title: t('admin.accounts.statuses') } %span{ title: t('admin.accounts.statuses') }
= fa_icon('comment') = fa_icon('comment')
= report.statuses.count = report.statuses.count
- unless report.media_attachments.empty? - unless report.media_attachments.empty?
%span{ title: t('admin.accounts.media_attachments') } %span{ title: t('admin.accounts.media_attachments') }
= fa_icon('camera') = fa_icon('camera')
= report.media_attachments.count = report.media_attachments.count
%td %td
- if report.assigned_account.nil? - if report.assigned_account.nil?
\- \-

1
app/views/admin/reports/index.html.haml
View File

@ -18,7 +18,6 @@
%th= t('admin.reports.id') %th= t('admin.reports.id')
%th= t('admin.reports.target') %th= t('admin.reports.target')
%th= t('admin.reports.reported_by') %th= t('admin.reports.reported_by')
%th= t('admin.reports.comment.label')
%th= t('admin.reports.report_contents') %th= t('admin.reports.report_contents')
%th= t('admin.reports.assigned') %th= t('admin.reports.assigned')
%th %th