diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-03-23 14:34:58 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-03-23 14:34:58 +0300 |
| commit | 86f2fbc81e5f3df6c16e05127e9e39c8fca0cde9 (patch) | |
| tree | 28bb939da52986ac9799e81020ed4d668ee114c6 | |
| parent | 3c78e5f3275494b3dc4546e65f19eb3a3c97033a (diff) | |
| parent | d931a59072de0861e889c6349eacc3d7f1f41fd9 (diff) | |
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
| -rw-r--r-- | lib/pleroma/web/static_fe/static_fe_controller.ex | 4 | ||||
| -rw-r--r-- | priv/static/static/static-fe.css | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/lib/pleroma/web/static_fe/static_fe_controller.ex b/lib/pleroma/web/static_fe/static_fe_controller.ex index 7f9464268..7a35238d7 100644 --- a/lib/pleroma/web/static_fe/static_fe_controller.ex +++ b/lib/pleroma/web/static_fe/static_fe_controller.ex @@ -60,7 +60,9 @@ defmodule Pleroma.Web.StaticFE.StaticFEController do content = if data["content"] do - Pleroma.HTML.filter_tags(data["content"]) + data["content"] + |> Pleroma.HTML.filter_tags() + |> Pleroma.Emoji.Formatter.emojify(Map.get(data, "emoji", %{})) else nil end 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; +} |