aboutsummaryrefslogtreecommitdiff
path: root/doc-tool/src/dotty/tools/dottydoc/staticsite
diff options
context:
space:
mode:
authorFelix Mulder <felix.mulder@gmail.com>2017-01-12 14:40:51 +0100
committerFelix Mulder <felix.mulder@gmail.com>2017-01-31 14:31:07 +0100
commit3e16bfd9c32d965820121abc0083e8db94537821 (patch)
treee8a1c6f4208fb71aba521cb945d0c0a02ce262f7 /doc-tool/src/dotty/tools/dottydoc/staticsite
parent3cee0b5e38f05bd70bec9d2bb392acdbd4fe8052 (diff)
downloaddotty-3e16bfd9c32d965820121abc0083e8db94537821.tar.gz
dotty-3e16bfd9c32d965820121abc0083e8db94537821.tar.bz2
dotty-3e16bfd9c32d965820121abc0083e8db94537821.zip
Add scala-logo svg
Diffstat (limited to 'doc-tool/src/dotty/tools/dottydoc/staticsite')
-rw-r--r--doc-tool/src/dotty/tools/dottydoc/staticsite/LiquidTemplate.scala2
-rw-r--r--doc-tool/src/dotty/tools/dottydoc/staticsite/Site.scala1
2 files changed, 2 insertions, 1 deletions
diff --git a/doc-tool/src/dotty/tools/dottydoc/staticsite/LiquidTemplate.scala b/doc-tool/src/dotty/tools/dottydoc/staticsite/LiquidTemplate.scala
index eaf1c6bef..6d1ee146a 100644
--- a/doc-tool/src/dotty/tools/dottydoc/staticsite/LiquidTemplate.scala
+++ b/doc-tool/src/dotty/tools/dottydoc/staticsite/LiquidTemplate.scala
@@ -52,7 +52,7 @@ case class LiquidTemplate(contents: String) extends ResourceFinder {
if (nodes.length > 1) params + (origInclude -> nodes(1).render(ctx))
else params
- Template.parse(template, JEKYLL).render(toJavaMap(additionalParams))
+ LiquidTemplate(template).render(additionalParams, includes)
}
.getOrElse {
/*dottydoc.*/println(s"couldn't find include file '$origInclude'")
diff --git a/doc-tool/src/dotty/tools/dottydoc/staticsite/Site.scala b/doc-tool/src/dotty/tools/dottydoc/staticsite/Site.scala
index 4b85f2a2c..7c9dc00fe 100644
--- a/doc-tool/src/dotty/tools/dottydoc/staticsite/Site.scala
+++ b/doc-tool/src/dotty/tools/dottydoc/staticsite/Site.scala
@@ -259,6 +259,7 @@ case class Site(val root: JFile, val docs: JList[_]) extends ResourceFinder {
val defaultIncludes: Map[String, String] = Map(
"header.html" -> "/_includes/header.html",
+ "scala-logo.html" -> "/_includes/scala-logo.html",
"toc.html" -> "/_includes/toc.html"
).mapValues(getResource)