about summary refs log tree commit diff
path: root/app/javascript
diff options
context:
space:
mode:
authorJenkins <jenkins@jenkins.ninjawedding.org>2018-04-19 22:17:23 +0000
committerJenkins <jenkins@jenkins.ninjawedding.org>2018-04-19 22:17:23 +0000
commited17e173d6ca915f19bce84a12222b89ab116243 (patch)
tree7c19d25fa7d6e672f60e9dbc6a6d5207ce5067e1 /app/javascript
parent40006bcd0350d06e393c9d8116ce916dd90127c2 (diff)
parentca2cbe8f0f6eb1efb095817f1dba26f89f1b4a54 (diff)
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/javascript')
-rw-r--r--app/javascript/styles/mastodon/reset.scss5
1 files changed, 5 insertions, 0 deletions
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;