Merge branch 'master' into glitch-soc/merge-upstream

2020-05-13 22:11:49 +02:00
parent 559214c33f 92f85bea52
commit 3baacf6993
28 changed files with 695 additions and 813 deletions
--- a/app/javascript/styles/mastodon/statuses.scss
+++ b/app/javascript/styles/mastodon/statuses.scss
@ -149,6 +149,11 @@
    &__avatar {
      left: 15px;
      top: 17px;
+
+      .account__avatar {
+        width: 48px;
+        height: 48px;
+      }
    }

    &__content {