diff options
author | Marcin Aman <maman@virtuslab.com> | 2020-05-13 16:20:44 +0200 |
---|---|---|
committer | Paweł Marks <Kordyjan@users.noreply.github.com> | 2020-05-14 11:33:06 +0200 |
commit | a440f0cb8756019131a2c15389e747aea3c585e7 (patch) | |
tree | 1c2e2b25464d540b8ce68fe8f14cd105c5268b27 /core/src | |
parent | d6bfd213a2f363f0581bdc85a68e11c170c93071 (diff) | |
download | dokka-a440f0cb8756019131a2c15389e747aea3c585e7.tar.gz dokka-a440f0cb8756019131a2c15389e747aea3c585e7.tar.bz2 dokka-a440f0cb8756019131a2c15389e747aea3c585e7.zip |
Platform dependant comments
Diffstat (limited to 'core/src')
-rw-r--r-- | core/src/main/kotlin/pages/ContentNodes.kt | 6 | ||||
-rw-r--r-- | core/src/main/resources/dokka/styles/style.css | 55 |
2 files changed, 26 insertions, 35 deletions
diff --git a/core/src/main/kotlin/pages/ContentNodes.kt b/core/src/main/kotlin/pages/ContentNodes.kt index 4127796c..26bcdf77 100644 --- a/core/src/main/kotlin/pages/ContentNodes.kt +++ b/core/src/main/kotlin/pages/ContentNodes.kt @@ -171,7 +171,7 @@ interface Kind enum class ContentKind : Kind { Comment, Constructors, Functions, Parameters, Properties, Classlikes, Packages, Symbol, Sample, Main, BriefComment, - Empty, Source, TypeAliases, Cover, Inheritors; + Empty, Source, TypeAliases, Cover, Inheritors, PlatformDependantHint; companion object { private val platformTagged = @@ -185,6 +185,10 @@ enum class TextStyle : Style { Bold, Italic, Strong, Strikethrough, Paragraph, Block, Monospace, Indented } +enum class ContentStyle : Style { + KeyValue +} + object CommentTable: Style fun ContentNode.dfs(predicate: (ContentNode) -> Boolean): ContentNode? = if (predicate(this)) { diff --git a/core/src/main/resources/dokka/styles/style.css b/core/src/main/resources/dokka/styles/style.css index 687a14e1..da9e7d01 100644 --- a/core/src/main/resources/dokka/styles/style.css +++ b/core/src/main/resources/dokka/styles/style.css @@ -89,6 +89,7 @@ box-sizing: border-box; font-weight: bold; white-space: pre; + flex-wrap: wrap; } #nav-submenu > .sideMenuPart { @@ -214,10 +215,9 @@ td:first-child { } .brief { - width: 40vw; - white-space: nowrap; + white-space: pre-wrap; overflow: hidden; - text-overflow: ellipsis; + padding-top: 24px; } h1, h2, h3, h4, h5, h6 { @@ -424,6 +424,7 @@ footer { flex-direction: row; align-items: flex-start; justify-content: flex-end; + height: 24px; } .platform-tags > .platform-tag { @@ -462,7 +463,7 @@ td.content { flex-direction: column; } -.title > a { +.title-row > a { text-decoration: none; font-style: normal; font-weight: 600; @@ -470,7 +471,7 @@ td.content { color: #282E34; } -.title > a:hover { +.title-row > a:hover { color: #5B5DEF; } @@ -536,7 +537,6 @@ td.content { .table { display: flex; flex-direction: column; - flex-direction: column; } .table-row { @@ -547,42 +547,29 @@ td.content { padding: 16px 24px 16px 24px; } -.table-row > .main-subrow { - height: 24px; +.platform-dependant-row { display: grid; - grid-template-columns: 310px auto auto; + padding-top: 8px; } -.table-row > .signature-subrow { +.title-row { display: grid; - grid-template-columns: 310px auto; -} - -.main-subrow > .title { - order: 1; -} - -.main-subrow > .brief { - order: 2; -} - -.main-subrow > .platform-tags { - grid-column-start: 3; + grid-template-columns: auto auto 7em; + width: 100%; } -.main-subrow > * { - order: 4; +.keyValue { + display: grid; } -.signature-subrow > .signatures { - grid-column-start: 2; - display: flex; - flex-direction: column; - margin-top: 5px; -} +@media print, screen and (min-width: 960px) { + .keyValue { + grid-template-columns: 20% auto; + } -.signature-subrow > * { - order: 4; + .title-row { + grid-template-columns: 20% auto 7em; + } } @media print, screen and (max-width: 960px) { @@ -640,7 +627,7 @@ td.content { @media print, screen and (max-width: 480px) { body { - padding: 15px; + padding-right: 15px; } header ul { |