From b9c35785e2513ff5ea33c1247eb18e48aa70fc5f Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Thu, 19 Apr 2018 15:39:54 +0200
Subject: [PATCH 1/2] Reports: Merge contents and comment columns (#7189)

---
 app/views/admin/reports/_report.html.haml | 22 +++++++++++-----------
 app/views/admin/reports/index.html.haml   |  1 -
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/app/views/admin/reports/_report.html.haml b/app/views/admin/reports/_report.html.haml
index d266f4840..84db00ad5 100644
--- a/app/views/admin/reports/_report.html.haml
+++ b/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
-    %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?
       \-
diff --git a/app/views/admin/reports/index.html.haml b/app/views/admin/reports/index.html.haml
index 3b127c4fc..c3baaf6be 100644
--- a/app/views/admin/reports/index.html.haml
+++ b/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

From ca2cbe8f0f6eb1efb095817f1dba26f89f1b4a54 Mon Sep 17 00:00:00 2001
From: beatrix <beatrix.bitrot@gmail.com>
Date: Thu, 19 Apr 2018 17:35:47 -0400
Subject: [PATCH 2/2] Fix webkit scrollbars (#7191)

* Revert "Make scroll bars wider (#7060)"

This reverts commit 11715454d033784bf6176b75a954e5c28b5d79e5.

* for real make webkit scrollbar wider
---
 app/javascript/styles/mastodon/reset.scss | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/javascript/styles/mastodon/reset.scss b/app/javascript/styles/mastodon/reset.scss
index 58d4de35f..ff3b2c022 100644
--- a/app/javascript/styles/mastodon/reset.scss
+++ b/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;