Merge branch 'scaladoc-fixes' into dynamic-page-reload

Author: Florian3k

scaladoc/resources/dotty_res/scripts/ux.js

@@ -161,7 +161,7 @@ sideMenuToggler.addEventListener('click', _e => {
   document.getElementById("leftColumn").classList.toggle("show")
   document.getElementById("content").classList.toggle("sidebar-shown")
   const toc = document.getElementById("toc");
-  if (toc) {
+  if (toc && toc.childElementCount > 0) {
     toc.classList.toggle("sidebar-shown")
   }
   sideMenuToggler.classList.toggle("menu-shown")

scaladoc/resources/dotty_res/styles/theme/components/code-snippet.css

@@ -257,13 +257,15 @@
   background-color: var(--code-syntax-highlighting-scrollbar);
   opacity: 0.75;
   border-radius: 100px;
+  border: 3px solid var(--action-primary-background-default-solid);
 }
 
 .snippet::-webkit-scrollbar-thumb:hover {
   background-color: var(--code-syntax-highlighting-scrollbar-hover);
+   border: 3px solid var(--action-primary-background-hover);;
 }
 
 .snippet::-webkit-scrollbar {
-  width: 8px;
-  height: 8px;
+  width: 12px;
+  height: 12px;
 }

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

@@ -77,6 +77,15 @@
   max-width: calc(19 * var(--base-spacing));
 }
 
+.n5 > .nh > .ar {
+  left: calc(16.5 * var(--base-spacing));
+}
+
+.n5 > .nh > a {
+  left: calc(19.5 * var(--base-spacing));
+  max-width: calc(16 * var(--base-spacing));
+}
+
 .nh:hover {
   background: var(--action-primary-background-hover);
   cursor: pointer;

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

@@ -43,6 +43,7 @@
 .pill .filter-name {
   color: var(--text-secondary);
   margin-right: calc(0.5 * var(--base-spacing));
+  padding-bottom: 1px;
 }
 
 .pill > .close {

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

@@ -10,6 +10,10 @@
   color: var(--text-primary);
 }
 
+#content > div:first-child {
+  overflow: clip;
+}
+
 
 #content.sidebar-shown {
   -webkit-transition: width 0.3s ease-in-out;
@@ -188,7 +192,7 @@
   color: var(--code-props-content);
   font-family: "FiraCode-Regular";
   border: 1px solid var(--code-props-border);
-  padding: 3px 6px;
+  padding: 2px 5px;
   border-radius: 4px;
   background-color: var(--code-props-background);
   line-height: 24px;

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

@@ -93,6 +93,8 @@
   border-radius: 4px;
   margin-top: calc(1.5 * var(--base-spacing));
   border: 1px solid var(--border-default);
+  max-height: calc(100vh - calc(19.5 * var(--base-spacing)));
+  overflow: scroll;
 }
 
 .searchbar-hints {
@@ -215,10 +217,8 @@
 }
 
 .scaladoc-searchbar-row .micon {
-  margin: calc(0.5 * var(--base-spacing)) calc(1 * var(--base-spacing)) 0px 0px;
+  margin-right: calc(1 * var(--base-spacing));
   color: var(--text-secondary);
-  position: relative;
-  top: -2px;
 }
 
 .scaladoc-searchbar-location {

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

@@ -213,6 +213,9 @@ class HtmlRenderer(rootPackage: Member, members: Map[DRI, Member])(using ctx: Do
       div(cls := "breadcrumbs container")(innerTags:_*)
 
     val (apiNavOpt, docsNavOpt): (Option[(Boolean, Seq[AppliedTag])], Option[(Boolean, Seq[AppliedTag])]) = buildNavigation(link)
+    val isDocs = docsNavOpt match
+      case Some(true, _) => true
+      case _ => false
 
     def textFooter: String | AppliedTag =
       args.projectFooter.fold("") { f =>
@@ -303,14 +306,16 @@ class HtmlRenderer(rootPackage: Member, members: Map[DRI, Member])(using ctx: Do
         parentsHtml,
         div(id := "content", cls := "body-medium")(
           div(content),
-          renderTableOfContents(toc).fold(Nil) { toc =>
+          if isDocs then
             div(id := "toc", cls:="body-small")(
-            div(id := "toc-container") (
-              span(cls := "toc-title h200")("In this article"),
-              toc
-            ),
-          )
-          },
+              renderTableOfContents(toc).fold(Nil) { toc =>
+                div(id := "toc-container")(
+                  span(cls := "toc-title h200")("In this article"),
+                  toc,
+                )
+              },
+            )
+          else Nil
         ),
         div(id := "footer", cls := "body-small mobile-footer")(
           div(cls := "left-container")(