Revert style of top-level entries. Fix styling issues in side menu

Author: pikinier20

scaladoc/resources/dotty_res/styles/theme/components/navigation-item.css

@@ -14,7 +14,6 @@
 
 .nh {
   border-radius: 4px;
-  min-height: calc(4.5 * var(--base-spacing));
   position: relative;
   display: flex;
   flex-direction: row;
@@ -213,24 +212,30 @@ span.ar::before {
 }
 
 #api-nav .nh a {
-  position: absolute;
+  position: relative;
 }
 
 /* docs */
+
+/* Hardcode visibility of children of top-level entry */
+#docs-nav .ni.n0 > .ni {
+  display: block;
+}
+
 #docs-nav .n0 > .nh {
   padding-left: calc(1.5 * var(--base-spacing));
 }
 
 #docs-nav .n1 > .nh {
-  padding-left: calc(6.5 * var(--base-spacing));
+  padding-left: calc(1.5 * var(--base-spacing));
 }
 
 #docs-nav .n2 > .nh {
-  padding-left: calc(11.5 * var(--base-spacing));
+  padding-left: calc(6.5 * var(--base-spacing));
 }
 
 #docs-nav .n3 > .nh {
-  padding-left: calc(16.5 * var(--base-spacing));
+  padding-left: calc(11.5 * var(--base-spacing));
 }
 
 #docs-nav span.ar {

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

@@ -20,6 +20,8 @@
   color: var(--action-primary-content-default);
   cursor: pointer;
   border: none;
+
+  text-decoration: none;
 }
 
 .switcher:first-child {
@@ -35,6 +37,8 @@
 .switcher:hover {
   background: var(--action-primary-background-hover);
   color: var(--action-primary-content-hover);
+
+  text-decoration: none;
 }
 
 .switcher:active {

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

@@ -5,4 +5,5 @@ body {
 }
 
 #container {
+  --header-height: calc(8 * var(--base-spacing));
 }

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

@@ -1,12 +1,13 @@
 #header {
+  --header-height: calc(8 * var(--base-spacing));
   box-sizing: border-box;
   display: flex;
   flex-direction: row;
   justify-content: space-between;
   align-items: center;
   padding: calc(1.75 * var(--base-spacing)) calc(3 * var(--base-spacing));
   position: absolute;
-  height: calc(8 * var(--base-spacing));
+  height: var(--header-height);
   left: 0px;
   right: 0px;
   top: 0px;

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

@@ -5,7 +5,7 @@
   padding: calc(3 * var(--base-spacing)) 0px;
   position: absolute;
   width: calc(35 * var(--base-spacing));
-  height: 100%;
+  height: calc(100% - var(--header-height));
   left: 0px;
   top: calc(8 * var(--base-spacing));
   background: var(--background-default);

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

@@ -106,35 +106,40 @@ class HtmlRenderer(rootPackage: Member, members: Map[DRI, Member])(using ctx: Do
     }
 
     def renderNested(nav: Page, nestLevel: Int): (Boolean, AppliedTag) =
+      val isApi = nav.content.isInstanceOf[Member]
       val isSelected = nav.link.dri == pageLink.dri
       val isTopElement = nestLevel == 0
 
+      val isTopLevelDocs = !isApi && isTopElement
+
       def linkHtml(expanded: Boolean = false, withArrow: Boolean = false) =
         val attrs: Seq[String] = Seq(
-          Option.when(isSelected)("selected h100"),
-          Option.when(expanded)("expanded cs"),
-          Option.when(!nav.content.isInstanceOf[Member])("de")
+          Option.when((isSelected || expanded) && !isTopLevelDocs)("h100"),
+          Option.when(isSelected)("selected"),
+          Option.when(expanded || isTopLevelDocs)("expanded cs"),
+          Option.when(!isApi)("de"),
+          Option.when(isTopLevelDocs)("h200")
         ).flatten
         val icon = nav.content match {
           case m: Member => navigationIcon(m)
           case _ => Nil
         }
         Seq(
-          span(cls := s"nh ${if isTopElement then "h200 " else " "}" + attrs.mkString(" "))(
-            if withArrow && !isTopElement then Seq(span(cls := "ar")) else Nil,
+          span(cls := s"nh " + attrs.mkString(" "))(
+            if withArrow then Seq(span(cls := "ar")) else Nil,
             a(href := pathToPage(pageLink.dri, nav.link.dri))(icon, span(nav.link.name))
           )
         )
 
       nav.children.filterNot(_.hidden) match
-        case Nil => isSelected -> div(cls := s"ni n$nestLevel ${if isSelected || isTopElement then "expanded" else ""}")(linkHtml())
+        case Nil => isSelected -> div(cls := s"ni n$nestLevel ${if isSelected then "expanded" else ""}")(linkHtml())
         case children =>
           val nested = children.map(renderNested(_, nestLevel + 1))
-          val expanded = nested.exists(_._1) || isSelected
+          val expanded = nested.exists(_._1)
           val attr =
-            if expanded || isSelected || isTopElement then Seq(cls := s"ni n$nestLevel expanded") else Seq(cls := s"ni n$nestLevel")
+            if expanded || isSelected || isTopLevelDocs then Seq(cls := s"ni n$nestLevel expanded") else Seq(cls := s"ni n$nestLevel")
           (isSelected || expanded) -> div(attr)(
-            linkHtml(expanded, true),
+            linkHtml(expanded, !isTopLevelDocs),
             nested.map(_._2)
           )
 
@@ -244,11 +249,9 @@ class HtmlRenderer(rootPackage: Member, members: Map[DRI, Member])(using ctx: Do
           ),
           apiNavOpt
             .filter(_._1)
-            .fold(
-              nav(id := "docs-nav", cls := s"side-menu")(docsNavOpt.get._2)
-            )(
-              apiNav => nav(id := "api-nav", cls := s"side-menu")(apiNav._2)
-            )
+            .map(apiNav => nav(id := "api-nav", cls := s"side-menu")(apiNav._2))
+            .orElse(docsNavOpt.map(docsNav => nav(id := "docs-nav", cls := s"side-menu")(docsNav._2)))
+            .get
         )
       ),
       div(id := "main")(