From 3e16bfd9c32d965820121abc0083e8db94537821 Mon Sep 17 00:00:00 2001
From: Felix Mulder <felix.mulder@gmail.com>
Date: Thu, 12 Jan 2017 14:40:51 +0100
Subject: Add scala-logo svg

---
 doc-tool/resources/_includes/scala-logo.html       | 19 +++++++++++++++
 doc-tool/resources/_includes/toc.html              |  8 +++++++
 doc-tool/resources/_layouts/doc.html               |  4 ++--
 doc-tool/resources/css/dottydoc.css                | 27 ++++++++++++++++++----
 .../tools/dottydoc/staticsite/LiquidTemplate.scala |  2 +-
 .../src/dotty/tools/dottydoc/staticsite/Site.scala |  1 +
 6 files changed, 53 insertions(+), 8 deletions(-)
 create mode 100644 doc-tool/resources/_includes/scala-logo.html

(limited to 'doc-tool')

diff --git a/doc-tool/resources/_includes/scala-logo.html b/doc-tool/resources/_includes/scala-logo.html
new file mode 100644
index 000000000..bfabf88f7
--- /dev/null
+++ b/doc-tool/resources/_includes/scala-logo.html
@@ -0,0 +1,19 @@
+<svg width="64" height="110" xmlns="http://www.w3.org/2000/svg">
+    <g>
+        <title>background</title>
+        <rect x="-1" y="-1" width="9.664668" height="15.173648" id="canvas_background" fill="none"/>
+    </g>
+
+    <g>
+        <title>Layer 1</title>
+        <g id="logo">
+            <g opacity="0.61" id="svg_1">
+                <path fill="#FFFFFF" d="m0.5,41.9c0,0 62.9,6.3 62.9,16.8l0,-25.2c0,0 0,-10.5 -62.9,-16.8l0,9.8l0,15.4z" id="svg_2"/>
+                <path fill="#FFFFFF" d="m0.5,75.5c0,0 62.9,6.3 62.9,16.8l0,-25.2c0,0 0,-10.5 -62.9,-16.8l0,25.2z" id="svg_3"/>
+            </g>
+            <path fill="#FFFFFF" d="m63.5,0l0,25.2c0,0 0,10.5 -62.9,16.8l0,-25.3c-0.1,0 62.9,-6.2 62.9,-16.7" id="svg_4"/>
+            <path fill="#FFFFFF" d="m0.5,50.3c0,0 62.9,-6.3 62.9,-16.8l0,25.2c0,0 0,10.5 -62.9,16.8l0,-25.2z" id="svg_5"/>
+            <path fill="#FFFFFF" d="m0.5,109l0,-25.2c0,0 62.9,-6.3 62.9,-16.8l0,25.2c0.1,0.1 0.1,10.5 -62.9,16.8" id="svg_6"/>
+        </g>
+    </g>
+</svg>
diff --git a/doc-tool/resources/_includes/toc.html b/doc-tool/resources/_includes/toc.html
index 88113d2f0..8f3b1e222 100644
--- a/doc-tool/resources/_includes/toc.html
+++ b/doc-tool/resources/_includes/toc.html
@@ -1,8 +1,16 @@
 {% assign parent = page.path | first %}
 <ul class="toc">
+    <li>
+        <a id="home-button" href="{{ site.baseurl }}/index.html">
+            {% include "scala-logo.html" %}
+        </a>
+    </li>
     <li>
         <a href="{{ site.baseurl }}/blog/index.html">Blog</a>
     </li>
+    <li class="toc-title">
+        <a href="{{ site.baseurl }}/docs/index.html">Docs</a>
+    </li>
     <li>
         <a class="toggle-children" onclick="tocToggleChild('usage')">Usage</a>
         <ul id="usage" class="{% if parent == "usage" %} show {% else %} hide {% endif %}">
diff --git a/doc-tool/resources/_layouts/doc.html b/doc-tool/resources/_layouts/doc.html
index 4c31d1e88..78fc2b116 100644
--- a/doc-tool/resources/_layouts/doc.html
+++ b/doc-tool/resources/_layouts/doc.html
@@ -7,8 +7,8 @@ layout: main
         {% include "toc" %}
         <ul class="index-entities">
         {% if docs.size > 0 %}
-        <li class="index-entity">
-            <a class="title" href="#">API</a>
+        <li class="index-title">
+            <a href="{{ site.baseurl }}/api/index.html">API</a>
         </li>
         {% endif %}
         {% for pkg in docs %}
diff --git a/doc-tool/resources/css/dottydoc.css b/doc-tool/resources/css/dottydoc.css
index 2dd9bf618..a40ee6a4d 100644
--- a/doc-tool/resources/css/dottydoc.css
+++ b/doc-tool/resources/css/dottydoc.css
@@ -56,18 +56,33 @@ ul.toc {
     padding-left: 0;
 }
 
+ul.toc > li.toc-title > a {
+    font-size: 16px;
+    font-weight: bold;
+}
+
+ul.toc > li > a#home-button,
+ul.toc > li > a#home-button:hover {
+    text-align: center;
+    background: transparent;
+}
+
+ul.toc > li > a#home-button svg path {
+    fill: #423e3e;
+}
+
 ul.toc > li,
-ul.index-entities > li.index-entity {
+ul.index-entities > li {
     line-height: 40px;
 }
 
 li.index-entity.entity-package > a {
   color: #ff4081;
-  text-decoration: underline;
+  text-decoration: none;
 }
 
 ul.toc > li > a,
-li.index-entity > a {
+ul.index-entities > li > a {
     font-size: 13px;
     display: block;
     padding: 0 24px;
@@ -86,15 +101,17 @@ ul.toc > li > ul.hide {
     display: none;
 }
 
-li.index-entity > a.title {
-    font-size: 17px;
+ul.index-entities > li.index-title > a {
+    font-size: 16px;
     font-weight: bold;
+    color: rgba(0,0,0,.87)
 }
 
 li.index-entity > a:focus {
     text-decoration: none;
 }
 
+ul.index-entities > li > a:hover,
 ul.toc > li > a:hover {
     text-decoration: none;
     background-color: rgba(0, 0, 0, 0.2);
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)
 
-- 
cgit v1.2.3