Skip to content

Commit 5f6a24c

Browse files
smartersmarter
authored
Merge pull request #1563 from felixmulder/topic/fix-nonworking-jekyll
Remove relative links for markdown plugin
2 parents 0426fe7 + 5e90bca commit 5f6a24c

File tree

5 files changed

+27
-288
lines changed

5 files changed

+27
-288
lines changed

‎docs/_config.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
title: Dotty Documentation
22
baseurl: "/"
3-
markdown: JekyllMarkdownLinkConverter
43
theme: minima
54
gems:
65
- jekyll-toc

‎docs/_includes/toc.html

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,34 +3,34 @@
33
{% include scala-logo.html %}
44
</div>
55
<ul id="categories">
6-
<li><ul><li><a href="/blog">Blog</a></li></ul></li>
7-
<li><ul><li><a href="/">Dotty Docs</a></li></ul></li>
6+
<li><ul><li><a href="{{ site.baseurl }}/blog">Blog</a></li></ul></li>
7+
<li><ul><li><a href="{{ site.baseurl }}/">Dotty Docs</a></li></ul></li>
88
<li>
99
Usage
1010
<ul>
11-
<li><a href="/usage/migrating.html">Migrating from Scala 2</a></li>
12-
<li><a href="/usage/sbt-projects.html">Using Dotty with sbt</a></li>
11+
<li><a href="{{ site.baseurl }}/usage/migrating.html">Migrating from Scala 2</a></li>
12+
<li><a href="{{ site.baseurl }}/usage/sbt-projects.html">Using Dotty with sbt</a></li>
1313
</ul>
1414
</li>
1515
<li>
1616
Contributing
1717
<ul>
18-
<li><a href="/contributing/getting-started.html">Getting Started</a></li>
19-
<li><a href="/contributing/workflow.html">Workflow</a></li>
20-
<li><a href="/contributing/eclipse.html">Eclipse</a></li>
21-
<li><a href="/contributing/intellij-idea.html">Intellij-IDEA</a></li>
18+
<li><a href="{{ site.baseurl }}/contributing/getting-started.html">Getting Started</a></li>
19+
<li><a href="{{ site.baseurl }}/contributing/workflow.html">Workflow</a></li>
20+
<li><a href="{{ site.baseurl }}/contributing/eclipse.html">Eclipse</a></li>
21+
<li><a href="{{ site.baseurl }}/contributing/intellij-idea.html">Intellij-IDEA</a></li>
2222
</ul>
2323
</li>
2424
<li>
2525
Internals
2626
<ul>
27-
<li><a href="/internals/backend.html">Backend</a></li>
28-
<li><a href="/internals/contexts.html">Contexts</a></li>
29-
<li><a href="/internals/higher-kinded-v2.html">Higher Kinded Type Scheme</a></li>
30-
<li><a href="/internals/overall-structure.html">Project Structure</a></li>
31-
<li><a href="/internals/periods.html">Periods</a></li>
32-
<li><a href="/internals/type-system.html">Type System</a></li>
33-
<li><a href="/internals/dotc-scalac.html">Dotty vs Scala2</a></li>
27+
<li><a href="{{ site.baseurl }}/internals/backend.html">Backend</a></li>
28+
<li><a href="{{ site.baseurl }}/internals/contexts.html">Contexts</a></li>
29+
<li><a href="{{ site.baseurl }}/internals/higher-kinded-v2.html">Higher Kinded Type Scheme</a></li>
30+
<li><a href="{{ site.baseurl }}/internals/overall-structure.html">Project Structure</a></li>
31+
<li><a href="{{ site.baseurl }}/internals/periods.html">Periods</a></li>
32+
<li><a href="{{ site.baseurl }}/internals/type-system.html">Type System</a></li>
33+
<li><a href="{{ site.baseurl }}/internals/dotc-scalac.html">Dotty vs Scala2</a></li>
3434
</ul>
3535
</li>
3636
</ul>

‎docs/_layouts/default.html

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<html>
22
<head>
33
<title>Dotty - {{ page.title }}</title>
4-
<link rel="shortcut icon" type="image/png" href="/images/favicon.png"/>
4+
<link rel="shortcut icon" type="image/png" href="{{ site.baseurl}}/images/favicon.png"/>
55
<link rel="stylesheet" href="http://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/styles/github.min.css">
6-
<link rel="stylesheet" href="/css/main.css">
6+
<link rel="stylesheet" href="{{ site.baseurl }}/css/main.css">
77
</head>
88
<body>
99
<div id="container">
@@ -18,6 +18,14 @@
1818
</div>
1919
</div>
2020
</body>
21-
<script src="/js/highlight.pack.js"></script>
22-
<script>hljs.initHighlightingOnLoad();</script>
21+
<script src="{{ site.baseurl }}/js/highlight.pack.js"></script>
22+
<script language="javascript">
23+
hljs.initHighlightingOnLoad();
24+
var x = document.links.length;
25+
for (i = 0; i < x; i++) {
26+
var thisHREF = document.links[i].href;
27+
if (thisHREF.indexOf(window.location.hostname) > -1) thisHREF = thisHREF.replace(".md",".html")
28+
document.links[i].setAttribute('href', thisHREF);
29+
}
30+
</script>
2331
</html>

‎docs/_plugins/JekyllMarkdownLinkConverter/LICENSE

Lines changed: 0 additions & 202 deletions
This file was deleted.

‎docs/_plugins/JekyllMarkdownLinkConverter/converter.rb

Lines changed: 0 additions & 66 deletions
This file was deleted.

0 commit comments

Comments
 (0)