From d41a74c5a5430c152da4f1257343fdbac9181c48 Mon Sep 17 00:00:00 2001 From: Filip ZybaƂa Date: Wed, 22 Apr 2020 09:32:19 +0200 Subject: Fixed alignment and colors of platform tags. Common tag is always #F4F4F4. Platform tags are now based on target instead of analysis platform --- core/src/main/resources/dokka/styles/style.css | 30 +++++++++++++++------- .../src/main/kotlin/renderers/html/HtmlRenderer.kt | 12 ++++++--- 2 files changed, 29 insertions(+), 13 deletions(-) diff --git a/core/src/main/resources/dokka/styles/style.css b/core/src/main/resources/dokka/styles/style.css index 9eda5f6e..a71651ca 100644 --- a/core/src/main/resources/dokka/styles/style.css +++ b/core/src/main/resources/dokka/styles/style.css @@ -439,9 +439,11 @@ footer { .platform-tagged { flex: auto; display: flex; - flex-direction: row-reverse; + flex-direction: row; padding: 0px; min-width: 230px; + align-items: flex-start; + justify-content: flex-end; } tr.platform-tagged { @@ -450,28 +452,34 @@ tr.platform-tagged { .platform-tagged > .platform-tag { align-self: center; + margin: 10px; } -.platform-tag.jvm { - background-color: crimson; +.platform-tag:nth-child(1) { + background-color: blue; color: white; } -.platform-tag.js { +.platform-tag:nth-child(2) { background-color: orange; color: white; } -.platform-tag.native { - background-color: blue; +.platform-tag:nth-child(3) { + background-color: crimson; color: white; } -.platform-tag.common { +.platform-tag.nth-child(4) { background-color: gray; color: white; } +.platform-tag.common { + background-color: #F4F4F4; + color: #637282; +} + td.content { padding-left: 24px; padding-top: 16px; @@ -514,7 +522,7 @@ td.content { } .platform-hinted > .platform-bookmarks-row > .platform-bookmark:nth-child(1):hover { - border-top: 2px solid gray; + border-top: 2px solid blue; } .platform-hinted > .platform-bookmarks-row > .platform-bookmark:nth-child(2):hover { @@ -526,7 +534,11 @@ td.content { } .platform-hinted > .platform-bookmarks-row > .platform-bookmark:nth-child(4):hover { - border-top: 2px solid blue; + border-top: 2px solid gray; +} + +.platform-hinted > .platform-bookmarks-row > .platform-bookmark[data-toggle='common']:hover { + border-top: 2px solid #F4F4F4; } .platform-hinted > .platform-bookmarks-row > .platform-bookmark[data-active=''] { diff --git a/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt b/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt index 65441909..48f1adb8 100644 --- a/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt +++ b/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt @@ -50,8 +50,10 @@ open class HtmlRenderer( ) { div("platform-tagged") { node.platforms.forEach { - div("platform-tag ${it.platformType.name}") { - text(it.platformType.key.toUpperCase()) + val targets = it.targets.joinToString(", ") + div("platform-tag") { + if( targets == "common" ) classes = classes + "common" + text(it.targets.joinToString(", ")) } } div("content") { @@ -151,8 +153,10 @@ open class HtmlRenderer( } td("platform-tagged") { it.platforms.forEach { - div(("platform-tag ${it.platformType.key}")) { - text(it.platformType.key.toUpperCase()) + div(("platform-tag")) { + val targets = it.targets.joinToString(", ") + if( targets == "common" ) classes = classes + "common" + text(it.targets.joinToString(", ")) } } } -- cgit