aboutsummaryrefslogtreecommitdiff
path: root/priv
diff options
context:
space:
mode:
authorHaelwenn (lanodan) Monnier <contact@hacktivis.me>2020-03-24 20:32:49 +0100
committerHaelwenn (lanodan) Monnier <contact@hacktivis.me>2020-03-24 20:32:49 +0100
commit212c31c63796a21233e8decf7ce46853383286fd (patch)
tree0cc01fbf91ddb5037d67b39f0af80737aeec51ad /priv
parent64165d1df95bc3a22260dafa4584471427685864 (diff)
parent8eebc75c152ee339bac347350266e3bc6536016b (diff)
downloadpleroma-212c31c63796a21233e8decf7ce46853383286fd.tar.gz
Merge remote-tracking branch 'pleroma/develop' into featureflag/emoji_reactions
Diffstat (limited to 'priv')
-rw-r--r--priv/static/static/static-fe.css7
1 files changed, 7 insertions, 0 deletions
diff --git a/priv/static/static/static-fe.css b/priv/static/static/static-fe.css
index 19c56387b..db61ff266 100644
--- a/priv/static/static/static-fe.css
+++ b/priv/static/static/static-fe.css
@@ -174,3 +174,10 @@ button {
font-weight: 500;
font-size: 16px;
}
+
+img.emoji {
+ width: 32px;
+ height: 32px;
+ padding: 0;
+ vertical-align: middle;
+}