summaryrefslogtreecommitdiff
path: root/web
diff options
context:
space:
mode:
authorLibravatar Blackle Morisanchetto <isabelle@blackle-mori.com>2022-09-02 05:54:32 -0400
committerLibravatar GitHub <noreply@github.com>2022-09-02 11:54:32 +0200
commit1e1cdee06a3bd5aaa0f97ad3c0d25aa505e723ef (patch)
tree85be3b04d0737980082c5f78c52b51759aa0bb5b /web
parent[bugfix] Fix occasional federatingdb test fail (#792) (diff)
downloadgotosocial-1e1cdee06a3bd5aaa0f97ad3c0d25aa505e723ef.tar.xz
[feature] Emojify spoiler and content in web templates (#785)
* Emojify spoiler and content in web templates * Use more performance emojify code (thanks NyaaaWhatsUpDoc!)
Diffstat (limited to 'web')
-rw-r--r--web/source/css/base.css8
-rw-r--r--web/template/status.tmpl4
2 files changed, 10 insertions, 2 deletions
diff --git a/web/source/css/base.css b/web/source/css/base.css
index ba9fef606..3cdf19fe8 100644
--- a/web/source/css/base.css
+++ b/web/source/css/base.css
@@ -323,3 +323,11 @@ footer {
grid-template-columns: 1fr;
}
}
+
+.emoji {
+ width: 2.5ex;
+ height: 2.5ex;
+ margin: -0.5ex 0 0;
+ object-fit: contain;
+ vertical-align: middle;
+} \ No newline at end of file
diff --git a/web/template/status.tmpl b/web/template/status.tmpl
index decad4764..56d98d89b 100644
--- a/web/template/status.tmpl
+++ b/web/template/status.tmpl
@@ -6,12 +6,12 @@
{{if .SpoilerText}}
<input class="spoiler" id="hideSpoiler-{{.ID}}" type="checkbox" style="display: none" aria-hidden="true" checked="true" />
<div class="spoiler">
- <span class="spoiler-text">{{.SpoilerText}}</span>
+ <span class="spoiler-text">{{emojify .Emojis (escape .SpoilerText)}}</span>
<label class="button spoiler-label" for="hideSpoiler-{{.ID}}" tabindex="0">Toggle visibility</label>
</div>
{{end}}
<div class="content">
- {{.Content |noescape}}
+ {{emojify .Emojis (noescape .Content)}}
</div>
</div>
{{with .MediaAttachments}}