API members styles refinement

Author: jdudrak

scaladoc/resources/dotty_res/styles/theme/components/api-member.css

@@ -15,16 +15,27 @@
   line-height: 1.5;
 }
 
-.documentableElement:hover {
+.documentableElement:not(.expand):hover,
+.documentableElement-expander {
   cursor: pointer;
 }
 
 .documentableElement .documentableBrief {
   color: var(--text-secondary);
 }
 
-.documentableElement .documentableBrief > p {
-  margin: 4px 0 0;
+.documentableElement .documentableBrief p:first-of-type,
+.documentableElement.expand > div .cover .doc p:first-of-type {
+  margin-block: calc(.5 * var(--base-spacing)) 0;
+}
+
+.documentableElement .doc p,
+.documentableElement .doc .snippet  {
+  margin-block: calc(2 * var(--base-spacing));
+}
+
+.documentableElement.expand .doc > :last-child {
+  margin-block-end: 0;
 }
 
 .documentableElement .annotations {
@@ -41,7 +52,18 @@ color: var(--text-secondary);
 
 .documentableElement.expand > div .cover {
   display: block;
+}
 
+.attributes.attributes-small > dt {
+  padding-block: calc(1.5 * var(--base-spacing));
+}
+
+.attributes.attributes-small > dd {
+  padding-block: calc(1 * var(--base-spacing));
+}
+
+.documentableElement.expand {
+  padding-block-end: calc(4 * var(--base-spacing));
 }
 
 .documentableElement.expand > div .cover dd {
@@ -62,7 +84,8 @@ color: var(--text-secondary);
 
 .documentableElement .icon-button {
   position: absolute;
-  left: -28px
+  left: calc(3.5 * var(--base-spacing) / -1);
+  top: calc(2 * var(--base-spacing));
 }
 
 .documentableElement:hover .icon-button {

scaladoc/resources/dotty_res/styles/theme/components/attributes.css

@@ -12,7 +12,23 @@
 }
 
 .attributes p {
-  margin: 0;
+  margin-block: calc(3 * var(--base-spacing));
+}
+
+.attributes p:has(span:empty) {
+  display: none;
+}
+
+.membersList .attributes p {
+  margin-block: calc(1 * var(--base-spacing));
+}
+
+.attributes p:first-child {
+  margin-block-start: 0;
+}
+
+.attributes p:last-child {
+  margin-block-end: 0;
 }
 
 .attributes > dt {

scaladoc/resources/dotty_res/styles/theme/layout/container.css

@@ -7,8 +7,7 @@ body {
 }
 
 p {
-  margin-block-start: calc(3 * var(--base-spacing));
-  margin-block-end: calc(3 * var(--base-spacing));
+  margin-block: calc(3 * var(--base-spacing));
 }
 
 [id] {

scaladoc/src/dotty/tools/scaladoc/renderers/DocRenderer.scala

@@ -57,12 +57,12 @@ class DocRender(signatureRenderer: SignatureRenderer)(using DocContext):
     case Title(text, level) =>
       val content = renderElement(text)
       level match
-          case 1 => h1(cls := "h500")(content)
-          case 2 => h2(cls := "h300")(content)
-          case 3 => h3(cls := "h200")(content)
-          case 4 => h4(cls := "h100")(content)
-          case 5 => h5(cls := "h50")(content)
-          case 6 => h6(cls := "h50")(content)
+          case 1 => h1(cls := "h600")(content)
+          case 2 => h2(cls := "h500")(content)
+          case 3 => h3(cls := "h400")(content)
+          case 4 => h4(cls := "h300")(content)
+          case 5 => h5(cls := "h200")(content)
+          case 6 => h6(cls := "h100")(content)
     case Paragraph(text) => p(renderElement(text))
     case Code(data: String) => raw(SnippetRenderer.renderSnippet(data))
     case HorizontalRule => hr

scaladoc/src/dotty/tools/scaladoc/renderers/MemberRenderer.scala

@@ -53,26 +53,26 @@ class MemberRenderer(signatureRenderer: SignatureRenderer)(using DocContext) ext
     def authors(authors: List[DocPart]) = if summon[DocContext].args.includeAuthors then list("Authors:", authors) else Nil
 
     m.docs.fold(Nil)(d =>
-      opt("Returns:", d.result) ++
-      list("Throws:", d.throws) ++
-      opt("Constructor:", d.constructor) ++
+      opt("Returns", d.result) ++
+      list("Throws", d.throws) ++
+      opt("Constructor", d.constructor) ++
       authors(d.authors) ++
-      list("See also:", d.see) ++
-      opt("Version:", d.version) ++
-      opt("Since:", d.since) ++
-      list("Todo:", d.todo) ++
-      list("Note:", d.note) ++
-      list("Example:", d.example)
+      list("See also", d.see) ++
+      opt("Version", d.version) ++
+      opt("Since", d.since) ++
+      list("Todo", d.todo) ++
+      list("Note", d.note) ++
+      list("Example", d.example)
     )
 
   def companion(m: Member): Seq[AppliedTag] = m.companion.fold(Nil){ (kind, dri) =>
     val kindName = kind.name
-    tableRow("Companion:", signatureRenderer.renderLink(kindName, dri))
+    tableRow("Companion", signatureRenderer.renderLink(kindName, dri))
   }
 
   def source(m: Member): Seq[AppliedTag] =
     summon[DocContext].sourceLinks.pathTo(m).fold(Nil){ link =>
-      tableRow("Source:", a(href := link)(m.sources.fold("(source)")(_.path.getFileName().toString())))
+      tableRow("Source", a(href := link)(m.sources.fold("(source)")(_.path.getFileName().toString())))
     }
 
   def deprecation(m: Member): Seq[AppliedTag] = m.deprecated.fold(Nil){ a =>
@@ -176,7 +176,7 @@ class MemberRenderer(signatureRenderer: SignatureRenderer)(using DocContext) ext
 
     val signature: MemberSignature = signatureProvider.rawSignature(member)()
     Seq(
-      div(cls := "signature mono-small-block")(
+      div(cls := "signature")(
         span(cls := "modifiers")(signature.prefix.map(renderElement(_))),
         span(cls := "kind")(signature.kind.map(renderElement(_))),
         signature.name.map(renderElement(_, nameClasses*)),
@@ -216,7 +216,7 @@ class MemberRenderer(signatureRenderer: SignatureRenderer)(using DocContext) ext
       div(cls := "documentableElement-expander")(
         Option.when(annots.nonEmpty || originInf.nonEmpty || memberInf.nonEmpty)(button(cls := "icon-button ar show-content")).toList,
         annots.map(div(_)).toList,
-        div(cls := "header monospace")(memberSignature(member)),
+        div(cls := "header monospace mono-medium")(memberSignature(member)),
       ),
       Option.when(originInf.nonEmpty || memberInf.nonEmpty)(
         div(cls := "docs")(
@@ -232,7 +232,7 @@ class MemberRenderer(signatureRenderer: SignatureRenderer)(using DocContext) ext
   private case class MGroup(header: AppliedTag, members: Seq[Member], groupName: String)
 
   private def makeSubgroupHeader(name: String): AppliedTag =
-    h4(cls := "groupHeader h300")(name)
+    h4(cls := "groupHeader h200")(name)
 
   private def actualGroup(name: String, members: Seq[Member | MGroup], headerConstructor: String => AppliedTag = makeSubgroupHeader, wrapInSection: Boolean = true): Seq[AppliedTag] =
     if members.isEmpty then Nil else