Merge branch 'scaladoc-fixes' into dynamic-loading-fixes

Author: Florian3k

scaladoc/resources/dotty_res/scripts/ux.js

@@ -1,14 +1,13 @@
 .documentableElement {
-  background-color: var(--action-primary-background-default-solid);
-  padding: calc(3 * var(--base-spacing));
-  border-radius: 4px;
-  margin-bottom: calc(3 * var(--base-spacing));
+  padding: 13px 0 12px;
   color: var(--text-primary);
   position: relative;
+  border-top: 1px solid var(--border-default);
 }
 
 .documentableElement:last-child {
   margin-bottom: 0;
+  border-top: 1px solid var(--border-default);
 }
 
 .documentableElement .signature {
@@ -24,6 +23,10 @@
   color: var(--text-secondary);
 }
 
+.documentableElement .documentableBrief > p {
+  margin: 4px 0 0;
+}
+
 .documentableElement .annotations {
   display: none;
 }
@@ -32,8 +35,17 @@
   display: none;
 }
 
+.documentableElement.expand {
+color: var(--text-secondary);
+}
+
 .documentableElement.expand > div .cover {
   display: block;
+
+}
+
+.documentableElement.expand > div .cover dd {
+  color: var(--text-primary);
 }
 
 .documentableElement.expand .annotations {
@@ -46,7 +58,6 @@
 
 .documentableElement .icon-button {
   position: absolute;
-  top: calc(3 * var(--base-spacing));
   right: calc(3 * var(--base-spacing));
   display: none;
 }
@@ -55,6 +66,10 @@
   display: block;
 }
 
+.documentableElement .attributes {
+  margin-bottom: 0;
+}
+
 [t="k"] {
   color: var(--code-method-highlighting-keyword);
 }

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

@@ -3,7 +3,6 @@
   overflow: hidden;
   padding: 0;
   margin: 0;
-  border-bottom: 1px solid var(--border-default);
   margin-bottom: calc(6 * var(--base-spacing));
 }
 
@@ -18,11 +17,8 @@
 .attributes > dt {
   float: left;
   width: 20%;
-  padding: 0;
-  margin: 0;
+  padding: 20px 0;
   border-top: 1px solid var(--border-default);
-  padding-top: calc(2.5 * var(--base-spacing));
-  padding-bottom: calc(2.5 * var(--base-spacing));
   text-align: right;
   color: var(--text-secondary);
 }
@@ -37,6 +33,11 @@
   padding-bottom: calc(2.5 * var(--base-spacing));
 }
 
+.attributes > dt:first-child,
+.attributes > dd:first-of-type {
+  border-top: none;
+}
+
 .attributes > dd > .attributes > dt {
   border: none;
   padding: 0;
@@ -51,6 +52,4 @@
   width: 80%;
 }
 
-.documentableElement .attributes {
-  margin-bottom: 0;
-}
+

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

@@ -15,6 +15,11 @@
 
 .snippet pre {
   margin: 0;
+  line-height: 20px;
+}
+
+dd .snippet {
+  margin: 0;
 }
 
 .snippet .hidden {

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

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

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

@@ -7,6 +7,8 @@
 
 #toc-container {
   width: 232px;
+  position: sticky;
+  top: calc(18 * var(--base-spacing))
 }
 
 #toc ul {
@@ -37,10 +39,6 @@
 @media (max-width: 1467px) {
   #toc {
     margin-left: calc(8.5 * var(--base-spacing));
-    margin-right: calc(8.5 * var(--base-spacing));
-  }
-  #toc-container {
-    margin-right: calc(8.5 * var(--base-spacing));
   }
 }
 

scaladoc/resources/dotty_res/styles/theme/components/table-of-content.css

@@ -5,15 +5,13 @@
 }
 
 .arrow-navigation > div {
-  width: 50%;
-}
-
-.arrow-navigation > div:first-child {
+  width: 100%;
   padding-right: 12px;
 }
 
-.arrow-navigation > div:last-child {
+.arrow-navigation > div:has(.arrow-navigation--next) {
   text-align: right;
+  padding-right: 0;
   padding-left: 12px;
 }
 

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

@@ -29,10 +29,13 @@
 
 @media (min-width: 1920px) {
   #content {
-    width: calc(90 * var(--base-spacing));
     padding-left: calc(36.75 * var(--base-spacing));
     padding-top: calc(18 * var(--base-spacing));
   }
+
+  #content > div:first-child {
+    width: calc(90 * var(--base-spacing));
+  }
 }
 
 @media (max-width: 1920px) {
@@ -172,6 +175,10 @@
   color: var(--text-primary);
 }
 
+#content li > ul {
+  padding-left: 32px;
+}
+
 /* content table */
 #content table {
   color: var(--text-primary);
@@ -415,6 +422,11 @@
   margin-bottom: 0;
 }
 
+#attributes > h2 {
+  margin-bottom: calc(3*var(--base-spacing));
+}
+
+
 .tab {
   position: relative;
 }
@@ -462,6 +474,8 @@
   display: block;
 }
 
+
+
 #content section {
   margin-top: calc(6 * var(--base-spacing));
 }

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

@@ -1,5 +1,6 @@
 * {
   text-rendering: geometricPrecision;
+  font-weight: initial;
 }
 
 @font-face {

scaladoc/resources/dotty_res/styles/theme/typography.css

@@ -156,7 +156,7 @@ class MemberRenderer(signatureRenderer: SignatureRenderer)(using DocContext) ext
 
     val signature: MemberSignature = signatureProvider.rawSignature(member)()
     Seq(
-      div(cls := "signature mono-small-inline")(
+      div(cls := "signature mono-medium")(
         span(cls := "modifiers")(signature.prefix.map(renderElement(_))),
         span(cls := "kind")(signature.kind.map(renderElement(_))),
         signature.name.map(renderElement(_, nameClasses*)),
@@ -404,7 +404,7 @@ class MemberRenderer(signatureRenderer: SignatureRenderer)(using DocContext) ext
 
       def signatureList(list: Seq[LinkToType], className: String = "", expandable: Boolean): Seq[AppliedTag] =
         if list.isEmpty then Nil
-         else Seq(div(cls := s"mono-small-inline $className")(
+         else Seq(div(cls := s"mono-medium $className")(
           if(expandable) then span(cls := "icon-button show-content") else span(),
          list.map(link =>
           div(link.kind.name," ", link.signature.map(renderElement(_)))
@@ -469,7 +469,7 @@ class MemberRenderer(signatureRenderer: SignatureRenderer)(using DocContext) ext
           )
         ) ++ companionBadge(m) ++
         Seq(
-          div(cls := "main-signature mono-medium")(
+          div(cls := "main-signature mono-small-block")(
             annotations(m).getOrElse(Nil),
             memberSignature(m)
           )
@@ -478,11 +478,13 @@ class MemberRenderer(signatureRenderer: SignatureRenderer)(using DocContext) ext
     val memberContent = div(
       intro,
       memberInfo(m, withAttributes = true),
-      section(id := "members-list")(
-        h2(cls := "h500")("Members list"),
-        buildDocumentableFilter,
-        buildMembers(m)
-      )
+      if m.members.length > 0 then
+        Seq(section(id := "members-list")(
+          h2(cls := "h500")("Members list"),
+          buildDocumentableFilter,
+          buildMembers(m)
+        ))
+      else Nil
     )
 
     val memberDocument = Jsoup.parse(memberContent.toString)