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

2021-05-22 13:11:31 +02:00
parent 03952c7d49 92a9fcf0e1
commit 5f334807d2
55 changed files with 646 additions and 418 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@ -3611,7 +3611,6 @@ a.status-card.compact:hover {
  span {
    display: block;
    float: left;
-    margin-left: 50%;
    transform: translateX(-50%);
    margin: 82px 0 0 50%;
    white-space: nowrap;