diff options
author | Filip Zybała <fzybala@virtuslab.com> | 2020-05-27 13:03:32 +0200 |
---|---|---|
committer | Paweł Marks <Kordyjan@users.noreply.github.com> | 2020-05-27 13:12:51 +0200 |
commit | dd5d4ba7d80b0880489cf74bb11549ff836fc41f (patch) | |
tree | 60886094f7e3128858cbf66e9ee41261830bfb37 /plugins | |
parent | 4d5a0ebc3045b51385056e57e9a0ce4108729072 (diff) | |
download | dokka-dd5d4ba7d80b0880489cf74bb11549ff836fc41f.tar.gz dokka-dd5d4ba7d80b0880489cf74bb11549ff836fc41f.tar.bz2 dokka-dd5d4ba7d80b0880489cf74bb11549ff836fc41f.zip |
Fixed table rendering for markdown.
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt | 43 | ||||
-rw-r--r-- | plugins/base/src/main/resources/dokka/styles/style.css | 6 |
2 files changed, 42 insertions, 7 deletions
diff --git a/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt b/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt index 792eb1dc..52f7024a 100644 --- a/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt +++ b/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt @@ -302,10 +302,45 @@ open class HtmlRenderer( pageContext: ContentPage, sourceSetRestriction: Set<SourceSetData>? ) { - div(classes = "table") { - node.extra.extraHtmlAttributes().forEach { attributes[it.extraKey] = it.extraValue } - node.children.forEach { - buildRow(it, pageContext, sourceSetRestriction) + when(node.dci.kind){ + ContentKind.Comment -> buildDefaultTable(node, pageContext, sourceSetRestriction) + else -> div(classes = "table") { + node.extra.extraHtmlAttributes().forEach { attributes[it.extraKey] = it.extraValue } + node.children.forEach { + buildRow(it, pageContext, sourceSetRestriction) + } + } + } + + } + + fun FlowContent.buildDefaultTable( + node: ContentTable, + pageContext: ContentPage, + sourceSetRestriction: Set<SourceSetData>? + ) { + table { + thead { + node.header.forEach { + tr { + it.children.forEach { + th { + it.build(this@table, pageContext, sourceSetRestriction) + } + } + } + } + } + tbody { + node.children.forEach { + tr { + it.children.forEach { + td { + it.build(this, pageContext, sourceSetRestriction) + } + } + } + } } } } diff --git a/plugins/base/src/main/resources/dokka/styles/style.css b/plugins/base/src/main/resources/dokka/styles/style.css index 6ba41db4..671dfe8a 100644 --- a/plugins/base/src/main/resources/dokka/styles/style.css +++ b/plugins/base/src/main/resources/dokka/styles/style.css @@ -326,14 +326,14 @@ h3, h4, h5, h6 { } a { - color: #258aaf; + color: #5B5DEF; font-weight: 400; text-decoration: none; } a:hover { - color: #282E34; - text-decoration: none; + color: #5B5DEF; + text-decoration: underline; } a small { |