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

2018-04-19 22:17:23 +00:00
parent 40006bcd03 ca2cbe8f0f
commit ed17e173d6
3 changed files with 16 additions and 12 deletions
--- 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;