Merge branch 'patch-2' into 'develop'

fix wide2x emojis within nicknames See merge request pleroma/pleroma!2737
2020-07-09 09:50:08 +00:00 · 2020-07-09 09:50:08 +00:00 · 34d6009d82
parent 393a588265 ab773fa5c9
commit 34d6009d82
1 changed files with 1 additions and 0 deletions
--- a/priv/static/static-fe/static-fe.css
+++ b/priv/static/static-fe/static-fe.css
@ -80,6 +80,7 @@ .display-name {
 /* keep emoji from being hilariously huge */
 .display-name img {
    max-height: 1em;
+    max-width: 1em;
 }

 .display-name .nickname {