diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-11-19 18:51:41 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-11-19 18:51:41 +0100 |
| commit | 2b4c7beb733b809e8c9bec7492254ccf09d830b1 (patch) | |
| tree | 200fc89e67e2c51493a87c4b8745d9d0180699f9 /app/javascript/styles | |
| parent | f2b376e9d82577dc630757a2b927d02f8bfcf4b0 (diff) | |
| parent | db32835338e113f23a474d323e398916a999619f (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'app/javascript/styles')
| -rw-r--r-- | app/javascript/styles/mastodon/admin.scss | 1 | ||||
| -rw-r--r-- | app/javascript/styles/mastodon/emoji_picker.scss | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss index bfb09aa0a..8fd556c73 100644 --- 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, diff --git a/app/javascript/styles/mastodon/emoji_picker.scss b/app/javascript/styles/mastodon/emoji_picker.scss index adddd4533..e73057465 100644 --- 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; |