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

app/javascript/styles/mastodon/reset.scss

@@ -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;

app/views/admin/reports/_report.html.haml

@@ -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
+  %td
-    %span{ title: report.comment }
+    %div{ title: report.comment }
       = 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
     - if report.assigned_account.nil?
       \-

app/views/admin/reports/index.html.haml

@@ -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