summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2020-11-14 18:18:28 (GMT)
committerDimitri van Heesch <doxygen@gmail.com>2020-11-14 18:18:28 (GMT)
commit9e0a10a0adc86d2953e974cd4df13321c7f5c541 (patch)
tree0a244f004818c7a39c22830713f234ad47de7943
parente537baa390d6e759cc2b25014222c4d6b478b5b1 (diff)
parent8bc0c44016da8b272ba60110c8683a5d24e77268 (diff)
downloadDoxygen-9e0a10a0adc86d2953e974cd4df13321c7f5c541.zip
Doxygen-9e0a10a0adc86d2953e974cd4df13321c7f5c541.tar.gz
Doxygen-9e0a10a0adc86d2953e974cd4df13321c7f5c541.tar.bz2
Merge branch 'master' of github.com:doxygen/doxygen
-rw-r--r--src/htmldocvisitor.cpp2
-rw-r--r--templates/html/doxygen.css6
2 files changed, 7 insertions, 1 deletions
diff --git a/src/htmldocvisitor.cpp b/src/htmldocvisitor.cpp
index 6f740ba..f577acb 100644
--- a/src/htmldocvisitor.cpp
+++ b/src/htmldocvisitor.cpp
@@ -338,7 +338,7 @@ void HtmlDocVisitor::visit(DocEmoji *s)
const char *res = EmojiEntityMapper::instance()->unicode(s->index());
if (res)
{
- m_t << res;
+ m_t << "<div class=\"emoji\">"<<res<<"</div>";
}
else
{
diff --git a/templates/html/doxygen.css b/templates/html/doxygen.css
index 141d418..0b09da4 100644
--- a/templates/html/doxygen.css
+++ b/templates/html/doxygen.css
@@ -1426,6 +1426,12 @@ div.toc li.level4 {
margin-left: 45px;
}
+div.emoji {
+ /* font family used at the site: https://unicode.org/emoji/charts/full-emoji-list.html
+ * font-family: "Noto Color Emoji", "Apple Color Emoji", "Segoe UI Emoji", Times, Symbola, Aegyptus, Code2000, Code2001, Code2002, Musica, serif, LastResort;
+ */
+}
+
.PageDocRTL-title div.toc li.level1 {
margin-left: 0 !important;
margin-right: 0;