basic content layout

Author: fanixus96

scaladoc/resources/dotty_res/styles/scalastyle.css

@@ -54,10 +54,10 @@ input {
   flex-direction: column;
   align-items: center;
 }
-#content {
+/* #content {
   max-width: 1100px;
   width: 100%;
-}
+} */
 
 /* Text */
 h1,
@@ -801,11 +801,11 @@ footer .mode {
   position: relative;
 }
 
-.cover-header {
+/* .cover-header {
   display: flex;
   flex-direction: row;
   padding-top: 1em;
-}
+} */
 
 .micon {
   box-sizing: content-box;
@@ -930,6 +930,7 @@ footer .socials {
 }
 
 #toc {
+  display: inline;
   position: fixed;
   right: 0px;
   top: 0px;
@@ -1095,7 +1096,7 @@ footer .socials {
 
 /* Breadcrumbs */
 
-.breadcrumbs a {
+/* .breadcrumbs a {
   margin: 0 8px;
 }
 
@@ -1105,7 +1106,7 @@ footer .socials {
 
 .breadcrumbs {
   align-self: flex-start;
-}
+} */
 
 /* Header from docs.scala-lang */
 

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

@@ -0,0 +1,20 @@
+#content {
+  height: 100%;
+  width: calc(100% - calc(39 * var(--base-spacing)));
+  float: right;
+  overflow: scroll;
+  margin-top: var(--header-height);
+  display: flex;
+}
+
+#content-wrapper {
+
+}
+
+#content h1 {
+  color: var(--text-primary);
+}
+
+.breadcrumbs {
+  position: absolute;
+}

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

@@ -208,7 +208,7 @@ class HtmlRenderer(rootPackage: Member, members: Map[DRI, Member])(using ctx: Do
         )
       }
 
-    div(id := "container")(
+    div(id := "")(
       div(id := "header", cls := "body-small")(
         div(cls := "header-container-left")(
           projectLogoElem.toSeq,
@@ -322,16 +322,17 @@ class HtmlRenderer(rootPackage: Member, members: Map[DRI, Member])(using ctx: Do
           "© 2002-2021 · LAMP/EPFL"
         )
       ),
+      div(id := "scaladoc-searchBar"),
       div(id := "main")(
-        div (id := "leftToggler")(
-          span(cls := "icon-toggler")
+        parentsHtml,
+        div(id := "content")(
+          content.content,
+          renderTableOfContents(content.toc).fold(Nil) { toc =>
+            div(id := "toc")(
+            span(cls := "toc-title")("In this article"),
+            toc
+          )
+          }
         ),
-        div(id := "scaladoc-searchBar"),
       ),
-      renderTableOfContents(content.toc).fold(Nil) { toc =>
-        div(id := "toc")(
-          span(cls := "toc-title")("In this article"),
-          toc
-        )
-      }
     )

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

@@ -30,7 +30,7 @@ class MemberRenderer(signatureRenderer: SignatureRenderer)(using DocContext) ext
 
   def inheritedFrom(m: Member) = m.inheritedFrom match
     case Some(InheritedFrom(name, dri, isSourceSuperclassHidden)) =>
-      val hiddenNameSuffix = if isSourceSuperclassHidden then " (hidden)" else "" 
+      val hiddenNameSuffix = if isSourceSuperclassHidden then " (hidden)" else ""
       tableRow("Inherited from:", signatureRenderer.renderLink(name + hiddenNameSuffix, dri))
     case _ => Nil
 
@@ -396,7 +396,7 @@ class MemberRenderer(signatureRenderer: SignatureRenderer)(using DocContext) ext
         Seq(
           div(cls := "cover-header")(
             memberIcon(m),
-            h1(m.name)
+            h1(cls := "h600")(m.name)
           ),
           div(cls := "signature monospace")(
             annotations(m),

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

@@ -111,6 +111,7 @@ trait Resources(using ctx: DocContext) extends Locations, Writer:
       "styles/theme/layout/floatingButton.css",
       "styles/theme/layout/mobileMenu.css",
       "styles/theme/layout/footer.css",
+      "styles/theme/layout/content.css",
 
       // components
       "styles/theme/components/switcher.css",