Helium: add CSS for custom content on landing page (#581)

typelevel · Feb 7, 2024 · 3964bb1 · 3964bb1
1 parent 38e4408
commit 3964bb1
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 11 deletions.
diff --git a/io/src/main/resources/laika/helium/css/landing.css b/io/src/main/resources/laika/helium/css/landing.css
@@ -63,7 +63,7 @@ p {
   margin: 0;
   padding: 0;
 }
-ul {
+#header ul {
   list-style: none;
   display: block;
   margin: 0;
@@ -82,7 +82,7 @@ ul {
   background-color: var(--subtle-highlight);
   margin-bottom: 5px;
 }
-li {
+#header li {
   padding: 0 10px 0 10px;
   display: block;
   font-size: 16px;
@@ -307,3 +307,28 @@ li {
   right: 0;
   margin: auto;
 }
+
+/* content from landing-page.md =================================================== */
+
+main {
+  width: 100%;
+  margin-right: auto;
+  margin-left: auto;
+  margin-bottom: 70px;
+  padding: 15px;
+}
+
+@media (min-width: 1020px) {
+  main {
+    max-width: var(--content-width);
+    padding: 15px 30px;
+  }
+}
+
+h1.title {
+  padding-top: 30px;
+}
+
+main p {
+  margin: 0 0 var(--block-spacing);
+}
diff --git a/io/src/main/resources/laika/helium/templates/landing.template.html b/io/src/main/resources/laika/helium/templates/landing.template.html
@@ -68,7 +68,11 @@ <h2>${_.title}</h2>
         @:@
       </div>
     @:@
-    ${cursor.currentDocument.content}
+    @:if(helium.site.landingPage.hasCustomContent)
+    <main>
+      ${cursor.currentDocument.content}
+    </main>
+    @:@
 
   </body>
 </html>
diff --git a/io/src/main/scala/laika/helium/internal/generate/LandingPageGenerator.scala b/io/src/main/scala/laika/helium/internal/generate/LandingPageGenerator.scala
@@ -19,7 +19,7 @@ package laika.helium.internal.generate
 import cats.data.Kleisli
 import cats.syntax.all.*
 import cats.effect.Sync
-import laika.api.config.ConfigBuilder
+import laika.api.config.{ Config, ConfigBuilder }
 import laika.ast.Path.Root
 import laika.ast.{ Document, Element, RootElement }
 import laika.config.LaikaKeys
@@ -35,26 +35,26 @@ private[helium] object LandingPageGenerator {
         (d.content, d.fragments, d.config)
     }.getOrElse((RootElement.empty, Map.empty[String, Element], tree.root.config))
 
+    def createConfig(base: Config): Config = base
+      .withValue(LaikaKeys.versioned, false).build
+      .withValue("helium.site.landingPage.hasCustomContent", landingPageContent.content.nonEmpty)
+      .build
+
     val titleDocument = tree.root.titleDocument.fold(
       TitleDocumentConfig.inputName(tree.root.config).map { inputName =>
         Document(
           path = Root / inputName,
           content = landingPageContent
         )
           .withFragments(fragments)
-          .withConfig(landingPageConfig.withValue(LaikaKeys.versioned, false).build)
+          .withConfig(createConfig(landingPageConfig))
       }
     ) { titleDoc =>
-      val config =
-        landingPageConfig.withFallback(titleDoc.config).withValue(
-          LaikaKeys.versioned,
-          false
-        ).build
       Right(
         titleDoc
           .appendContent(landingPageContent.content)
           .addFragments(fragments)
-          .withConfig(config)
+          .withConfig(createConfig(landingPageConfig.withFallback(titleDoc.config)))
       )
     }
 

diff --git a/io/src/test/scala/laika/helium/HeliumLandingPageSpec.scala b/io/src/test/scala/laika/helium/HeliumLandingPageSpec.scala
@@ -232,7 +232,9 @@ class HeliumLandingPageSpec extends CatsEffectSuite with InputBuilder with Resul
          |</div>
          |<p class="header">Some <em>Header</em></p>
          |$teaserHTML
+         |<main>
          |<p>Some <em>markup</em> here.</p>
+         |</main>
          |</body>""".stripMargin
     val imagePath          = Root / "home.png"
     val helium             = Helium.defaults