diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-11-19 19:55:02 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-19 19:55:02 +0100 |
commit | 3ba7c85ec9bd5dcf75b30b00ed634b3b31a029af (patch) | |
tree | 6e0cd84a36280b314df2e1654e42f3dc05ee56e1 /app/javascript | |
parent | f2b376e9d82577dc630757a2b927d02f8bfcf4b0 (diff) | |
parent | 189cf652e6b3c6ee1d303282ca93823965f89f24 (diff) |
Merge pull request #1634 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript')
-rw-r--r-- | app/javascript/flavours/glitch/styles/admin.scss | 1 | ||||
-rw-r--r-- | app/javascript/styles/mastodon/admin.scss | 1 | ||||
-rw-r--r-- | app/javascript/styles/mastodon/emoji_picker.scss | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/styles/admin.scss b/app/javascript/flavours/glitch/styles/admin.scss index bfb09aa0a..8fd556c73 100644 --- a/app/javascript/flavours/glitch/styles/admin.scss +++ b/app/javascript/flavours/glitch/styles/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/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; |