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

2022-05-08 21:00:49 +02:00
parent d7eae4229c f17e73da09
commit 22080786df
138 changed files with 4394 additions and 1134 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@ -2469,6 +2469,10 @@ a.account__display-name {
  .columns-area__panels__pane--compositional {
    display: none;
  }
+
+  .with-fab .scrollable .item-list:last-child {
+    padding-bottom: 5.25rem;
+  }
 }

@media screen and (min-width: 600px + (285px * 1) + (10px * 1)) {