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

2021-03-31 10:34:29 +02:00
parent a2a85d5ae0 f5bcc6bc65
commit 15efa32cca
12 changed files with 382 additions and 325 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@ -4472,6 +4472,7 @@ a.status-card.compact:hover {
  right: 0;
  bottom: 0;
  background: rgba($base-overlay-background, 0.7);
+  transition: background 0.5s;
 }

 .modal-root__container {