From dd5d4ba7d80b0880489cf74bb11549ff836fc41f Mon Sep 17 00:00:00 2001 From: Filip ZybaƂa Date: Wed, 27 May 2020 13:03:32 +0200 Subject: Fixed table rendering for markdown. --- .../src/main/kotlin/renderers/html/HtmlRenderer.kt | 43 ++++++++++++++++++++-- .../base/src/main/resources/dokka/styles/style.css | 6 +-- 2 files changed, 42 insertions(+), 7 deletions(-) (limited to 'plugins/base/src') 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? ) { - 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? + ) { + 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 { -- cgit