Mobile header font size #1475

Kotlin · Sep 17, 2020 · af9f246 · af9f246
1 parent 803402b
commit af9f246
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 6 deletions.
diff --git a/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt b/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt
@@ -633,7 +633,7 @@ open class HtmlRenderer(
                 consumer.onTagContentEntity(Entities.nbsp)
                 text(textNode.text)
             }
-            textNode.hasStyle(TextStyle.Cover) -> buildBreakableDotSeparatedHtml(textNode.text)
+            textNode.hasStyle(TextStyle.Cover) -> buildBreakableText(textNode.text)
             else -> text(textNode.text)
         }
 

diff --git a/plugins/base/src/main/kotlin/renderers/html/NavigationPage.kt b/plugins/base/src/main/kotlin/renderers/html/NavigationPage.kt
@@ -26,7 +26,7 @@ class NavigationPage(val root: NavigationNode) : RendererSpecificPage {
                 id = navId
                 attributes["pageId"] = node.dri.toString()
                 div("overview") {
-                    buildLink(node.dri, node.sourceSets.toList()) { buildBreakableDotSeparatedHtml(node.name) }
+                    buildLink(node.dri, node.sourceSets.toList()) { buildBreakableText(node.name) }
                     if (node.children.isNotEmpty()) {
                         span("navButton pull-right") {
                             onClick = """document.getElementById("$navId").classList.toggle("hidden");"""

diff --git a/plugins/base/src/main/kotlin/renderers/html/htmlFormatingUtils.kt b/plugins/base/src/main/kotlin/renderers/html/htmlFormatingUtils.kt
@@ -3,15 +3,41 @@ package org.jetbrains.dokka.base.renderers.html
 import kotlinx.html.FlowContent
 import kotlinx.html.span
 
+fun FlowContent.buildTextBreakableAfterCapitalLetters(name: String) {
+    if (name.contains(" ")) {
+        val withOutSpaces = name.split(" ")
+        withOutSpaces.dropLast(1).forEach {
+            buildBreakableText(it)
+            +" "
+        }
+        buildBreakableText(withOutSpaces.last())
+    } else {
+        val content = name.replace(Regex("(?!^)([A-Z])"), " $1").split(" ")
+        joinToHtml(content){
+            it
+        }
+    }
+}
+
 fun FlowContent.buildBreakableDotSeparatedHtml(name: String) {
     val phrases = name.split(".")
-    phrases.dropLast(1).forEach {
+    joinToHtml(phrases){
+        "$it."
+    }
+}
+
+private fun FlowContent.joinToHtml(elements: List<String>, onEach: (String) -> String) {
+    elements.dropLast(1).forEach {
         span {
-            +"$it."
+            +onEach(it)
         }
         wbr { }
     }
     span {
-        +phrases.last()
+        +elements.last()
     }
-}
+}
+
+fun FlowContent.buildBreakableText(name: String) =
+    if (name.contains(".")) buildBreakableDotSeparatedHtml(name)
+    else buildTextBreakableAfterCapitalLetters(name)
diff --git a/plugins/base/src/main/resources/dokka/styles/style.css b/plugins/base/src/main/resources/dokka/styles/style.css
@@ -19,6 +19,8 @@
 .breadcrumbs {
     padding: 24px 0;
     color: var(--breadcrumb-font-color);
+    max-width: calc(100% - 32px);
+    overflow-wrap: break-word;
 }
 
 .breadcrumbs a {
@@ -1073,6 +1075,11 @@ div.runnablesample {
     .filter-section {
         position: unset;
     }
+    h1.cover {
+        font-size: 48px;
+        line-height: 48px;
+        padding-bottom: 8px;
+    }
 }
 
 @media screen and (max-width: 759px) {
@@ -1131,4 +1138,8 @@ div.runnablesample {
         padding-bottom: 16px;
         overflow: auto;
     }
+    h1.cover {
+        font-size: 32px;
+        line-height: 32px;
+    }
 }