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

remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
Jenkins 2018-04-19 22:17:23 +00:00
commit ed17e173d6
3 changed files with 16 additions and 12 deletions

View File

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

View File

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

View File

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