summaryrefslogtreecommitdiff
path: root/priv
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2020-03-23 10:43:20 +0000
committerrinpatch <rinpatch@sdf.org>2020-03-23 10:43:20 +0000
commitd931a59072de0861e889c6349eacc3d7f1f41fd9 (patch)
tree37b86cea0a18a6d286901480e101c451098bc85e /priv
parent7dbf1ffa868e4f5fece298b9ea161e1e11a2ffde (diff)
parent5a34dca8eda46479a3459b60c623d6fa94fc662b (diff)
downloadpleroma-d931a59072de0861e889c6349eacc3d7f1f41fd9.tar.gz
pleroma-d931a59072de0861e889c6349eacc3d7f1f41fd9.zip
Merge branch 'support-emoji-staticfe' into 'develop'
Add emoji support in statuses in staticfe Closes #1453 See merge request pleroma/pleroma!2324
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;
+}