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

2021-11-19 18:51:41 +01:00
parent f2b376e9d8 db32835338
commit 2b4c7beb73
28 changed files with 337 additions and 333 deletions
--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@@ -847,6 +847,7 @@ a.name-tag,
    padding: 0 5px;
    margin-bottom: 10px;
    flex: 1 0 50%;
+    max-width: 100%;
  }

  .account__header__fields,
--- a/app/javascript/styles/mastodon/emoji_picker.scss
+++ b/app/javascript/styles/mastodon/emoji_picker.scss
@@ -169,7 +169,7 @@
  }

  &:hover::before {
-    z-index: 0;
+    z-index: -1;
    content: "";
    position: absolute;
    top: 0;