summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2020-11-20 20:32:56 (GMT)
committerGitHub <noreply@github.com>2020-11-20 20:32:56 (GMT)
commitee3c650df832eb7d7eb5a64423ee799d96404741 (patch)
treeb59c403b2e7732e2babde3b86afc13f261af11b7
parent18dd1ccc15ab38f450c6b83cdcfcb7d79b64dd07 (diff)
parent1525b66e12ed8dba34e12786500422a74387cd29 (diff)
downloadDoxygen-ee3c650df832eb7d7eb5a64423ee799d96404741.zip
Doxygen-ee3c650df832eb7d7eb5a64423ee799d96404741.tar.gz
Doxygen-ee3c650df832eb7d7eb5a64423ee799d96404741.tar.bz2
Merge pull request #8176 from albert-github/feature/issue_8169_2
XHTML: div tag not possible as part of a p tag.
-rw-r--r--src/htmldocvisitor.cpp2
-rw-r--r--templates/html/doxygen.css2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/htmldocvisitor.cpp b/src/htmldocvisitor.cpp
index f577acb..a60a291 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 << "<div class=\"emoji\">"<<res<<"</div>";
+ m_t << "<span class=\"emoji\">"<<res<<"</span>";
}
else
{
diff --git a/templates/html/doxygen.css b/templates/html/doxygen.css
index 0b09da4..d54f714 100644
--- a/templates/html/doxygen.css
+++ b/templates/html/doxygen.css
@@ -1426,7 +1426,7 @@ div.toc li.level4 {
margin-left: 45px;
}
-div.emoji {
+span.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;
*/