summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>2020-07-09 09:50:08 +0000
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>2020-07-09 09:50:08 +0000
commit34d6009d82ef8949d689ed1f7c4ec2c2fad254c7 (patch)
tree834f2d8946697f7c4b3474062ed2f4cb8e9ed9b4
parent393a588265d6e272c22ce92f338ab8853814316f (diff)
parentab773fa5c946f74b0f42106ba2e72c092566743a (diff)
downloadpleroma-34d6009d82ef8949d689ed1f7c4ec2c2fad254c7.tar.gz
pleroma-34d6009d82ef8949d689ed1f7c4ec2c2fad254c7.zip
Merge branch 'patch-2' into 'develop'
fix wide2x emojis within nicknames See merge request pleroma/pleroma!2737
-rw-r--r--priv/static/static-fe/static-fe.css1
1 files changed, 1 insertions, 0 deletions
diff --git a/priv/static/static-fe/static-fe.css b/priv/static/static-fe/static-fe.css
index db61ff266..89e9f4877 100644
--- a/priv/static/static-fe/static-fe.css
+++ b/priv/static/static-fe/static-fe.css
@@ -80,6 +80,7 @@ header a:hover, .h-card a:hover {
/* keep emoji from being hilariously huge */
.display-name img {
max-height: 1em;
+ max-width: 1em;
}
.display-name .nickname {