diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2019-03-10 10:56:57 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <doxygen@gmail.com> | 2019-03-10 10:56:57 (GMT) |
| commit | 3be582506ac7d11142417128a8f60f4532680618 (patch) | |
| tree | b7febc387bc7efa34abea2ea952d978a54921465 | |
| parent | 8f614d75fe9b1fdcb91384a1296c76514a06d70b (diff) | |
| parent | a0d28243a470d82af83fdf77ceb7cba122d6d716 (diff) | |
| download | Doxygen-3be582506ac7d11142417128a8f60f4532680618.zip Doxygen-3be582506ac7d11142417128a8f60f4532680618.tar.gz Doxygen-3be582506ac7d11142417128a8f60f4532680618.tar.bz2 | |
Merge branch 'master' of github.com:doxygen/doxygen
| -rw-r--r-- | doc/doxygen_manual.css | 4 | ||||
| -rw-r--r-- | src/htmldocvisitor.cpp | 4 | ||||
| -rw-r--r-- | templates/html/doxygen.css | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/doc/doxygen_manual.css b/doc/doxygen_manual.css index 87d560c..1c42e1b 100644 --- a/doc/doxygen_manual.css +++ b/doc/doxygen_manual.css @@ -49,11 +49,13 @@ dt { font-weight: bold; } -div.multicol { +ul.multicol { -moz-column-gap: 1em; -webkit-column-gap: 1em; + column-gap: 1em; -moz-column-count: 3; -webkit-column-count: 3; + column-count: 3; } p.startli, p.startdd { diff --git a/src/htmldocvisitor.cpp b/src/htmldocvisitor.cpp index f405591..9bd0b4f 100644 --- a/src/htmldocvisitor.cpp +++ b/src/htmldocvisitor.cpp @@ -1880,8 +1880,8 @@ void HtmlDocVisitor::visitPre(DocSecRefList *s) { if (m_hide) return; forceEndParagraph(s); - m_t << "<div class=\"multicol\">" << endl; - m_t << "<ul>" << endl; + m_t << "<div>" << endl; + m_t << "<ul class=\"multicol\">" << endl; } void HtmlDocVisitor::visitPost(DocSecRefList *s) diff --git a/templates/html/doxygen.css b/templates/html/doxygen.css index 92a662a..09b7aad 100644 --- a/templates/html/doxygen.css +++ b/templates/html/doxygen.css @@ -53,11 +53,13 @@ dt { font-weight: bold; } -div.multicol { +ul.multicol { -moz-column-gap: 1em; -webkit-column-gap: 1em; + column-gap: 1em; -moz-column-count: 3; -webkit-column-count: 3; + column-count: 3; } p.startli, p.startdd { |