summaryrefslogtreecommitdiff
path: root/priv
diff options
context:
space:
mode:
authorIvan Tashkinov <ivantashkinov@gmail.com>2020-03-23 14:34:58 +0300
committerIvan Tashkinov <ivantashkinov@gmail.com>2020-03-23 14:34:58 +0300
commit86f2fbc81e5f3df6c16e05127e9e39c8fca0cde9 (patch)
tree28bb939da52986ac9799e81020ed4d668ee114c6 /priv
parent3c78e5f3275494b3dc4546e65f19eb3a3c97033a (diff)
parentd931a59072de0861e889c6349eacc3d7f1f41fd9 (diff)
downloadpleroma-86f2fbc81e5f3df6c16e05127e9e39c8fca0cde9.tar.gz
pleroma-86f2fbc81e5f3df6c16e05127e9e39c8fca0cde9.zip
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
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;
+}