Skip to content

Commit 2f65aae

Browse files
TheElectronWillTheElectronWill
committed
Simplify the front page
- simpler, shorter and cleaner CSS - cleaner HTML with header, sections, etc. - no more annoying gitter sidecar - improved spacing and font sizing - improved text contrast
1 parent 75c4014 commit 2f65aae

File tree

9 files changed

+215
-637
lines changed

9 files changed

+215
-637
lines changed

‎doc-tool/resources/_layouts/base.html

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,5 @@
3030
<script src="{{ site.baseurl }}/{{ js }}"></script>
3131
{% endfor %}
3232
<script src="{{ site.baseurl }}/js/dottydoc.js"></script>
33-
<script>
34-
((window.gitter = {}).chat = {}).options = {
35-
room: 'lampepfl/dotty'
36-
};
37-
</script>
38-
<script src="https://sidecar.gitter.im/dist/sidecar.v1.js" async defer></script>
3933
</body>
4034
</html>

‎doc-tool/resources/_layouts/main.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,9 @@
1212
<div id="content-wrapper">
1313
{{ content }}
1414
</div>
15+
<script>
16+
((window.gitter = {}).chat = {}).options = {
17+
room: 'lampepfl/dotty'
18+
};
19+
</script>
20+
<script src="https://sidecar.gitter.im/dist/sidecar.v1.js" async defer></script>

‎docs/_includes/features.html

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<div class="page teal">
2-
<div class="centered questions">
1+
<section class="page bg-teal bg-dark">
2+
<div class="container">
33
<h1 id="so-features">So, features?</h1>
44
<div class="centered-table">
55
<table>
@@ -101,7 +101,7 @@ <h1 id="so-features">So, features?</h1>
101101
<td>Considered</td>
102102
</tr>
103103
<tr>
104-
<td>and many more, check the <a href="https://dotty.epfl.ch/docs/reference/overview.html">overview page</a> for a comprehensive list</td>
104+
<td>…and many more, check the <a href="https://dotty.epfl.ch/docs/reference/overview.html">overview page</a> for a comprehensive list</td>
105105
<td></td>
106106
</tr>
107107
</tbody>
@@ -115,10 +115,9 @@ <h1 id="talks-on-dotty">Talks on Dotty?</h1>
115115
<li><a href="https://dotty.epfl.ch/docs/resources/talks.html">Deep Dive with Dotty</a></li>
116116
</ul>
117117
<h1 id="i-have-more-questions">I have more questions!</h1>
118-
<div class="centered-text">
118+
<div class="text-center">
119119
<p>That’s great! We have more details on the <a href="{{ site.baseurl }}/docs">docs</a> and please join our <a href="https://gitter.im/lampepfl/dotty">Gitter channel</a>!</p>
120120
</div>
121121
<br/>
122122
</div>
123-
</div>
124-
123+
</section>

‎docs/_includes/getting-started.html

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
1-
<div class="page blue">
2-
<div class="centered questions">
1+
<section class="page bg-blue bg-dark">
2+
<div class="container">
33

44
<h1 id="getting-started">Try Dotty</h1>
55
<p>If you are a Mac user, you can install Dotty with <a href="https://brew.sh/">brew</a>:</p>
6-
<pre class="sourceCode bright"><code>brew install lampepfl/brew/dotty</code></pre>
6+
<pre><code>brew install lampepfl/brew/dotty</code></pre>
77

88
<p>If you are a Linux or Windows user, download the <a href="https://github.com/lampepfl/dotty/releases">latest release</a>. Optionally add path of the folder <code>bin/</code> to the system environment variable <code>PATH</code>. </p>
99

10-
<p>Now you can compile Scala source code:<p>
11-
<pre class="sourceCode bright"><code>dotc hello.scala</code></pre>
10+
<p>Now you can compile Scala source code:</p>
11+
<pre><code>dotc hello.scala</code></pre>
1212

13-
<p>To start the REPL, run: <code>dotr</code>.<p>
13+
<p>To start the REPL, run: <code>dotr</code>.</p>
1414

1515
<p>Or, you can try Dotty in your browser with <a href="https://scastie.scala-lang.org/?target=dotty">Scastie</a>.</p>
1616

1717
<h1 id="getting-started-with-a-project">Create a Dotty Project</h1>
1818
<p>The fastest way to create a new project in Dotty is using <a href="http://www.scala-sbt.org/">sbt (1.1.4+)</a>.</p>
1919

2020
<p>Create a Dotty project:</p>
21-
<pre class="sourceCode bright"><code>sbt new <a href="https://github.com/lampepfl/dotty.g8">lampepfl/dotty.g8</a></code></pre>
21+
<pre><code>sbt new <a href="https://github.com/lampepfl/dotty.g8">lampepfl/dotty.g8</a></code></pre>
2222

2323
<p>Or a Dotty project that cross compiles with Scala 2:</p>
24-
<pre class="sourceCode bright"><code>sbt new <a href="https://github.com/lampepfl/dotty-cross.g8">lampepfl/dotty-cross.g8</a></code></pre>
24+
<pre><code>sbt new <a href="https://github.com/lampepfl/dotty-cross.g8">lampepfl/dotty-cross.g8</a></code></pre>
2525

2626
<p>For documentation see the <a href="https://github.com/lampepfl/dotty-example-project">Dotty Example Project</a>.</p>
2727
</div>
28-
</div>
28+
</section>

‎docs/_includes/logo-page.html

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="page red exactly-one-page">
1+
<section class="page bg-red bg-dark">
22
<header>
33
<nav class="navbar navbar-expand-md navbar-dark">
44
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarContent">
@@ -30,12 +30,14 @@
3030
</div>
3131
</nav>
3232
</header>
33-
<div class="scala-logo-container">
34-
<p><img src="{{ site.baseurl }}/images/dotty-logo-white.svg" alt="image" /></p>
35-
<div class="centered-subtitle">
36-
<h1 id="dotty">Dotty</h1>
37-
<p>A next generation compiler for Scala</p>
38-
<p>(scroll down for more info)</p>
33+
<div class="container">
34+
<div class="scala-logo-container">
35+
<img src="{{ site.baseurl }}/images/dotty-logo-white.svg" alt="logo" />
36+
<div class="subtitle text-center">
37+
<h1 id="dotty" class="above-byline">Dotty</h1>
38+
<p>A next-generation compiler for Scala</p>
39+
<p>(scroll down for more info)</p>
40+
</div>
3941
</div>
4042
</div>
41-
</div>
43+
</section>

‎docs/_includes/table-of-contents.html

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<ul>
2-
{% for item in titles %}
3-
<li>
4-
{% if item.url %}
5-
<a href="{{ site.baseurl }}/{{ item.url }}">{{ item.title }}</a>
6-
{% else %}
7-
{{ item.title }}
8-
{% endif %}
9-
{% if item.subsection %}
10-
{% assign titles = item.subsection %}
11-
{% include "table-of-contents" %}
12-
{% endif %}
13-
</li>
14-
{% endfor %}
2+
{% for item in titles %}
3+
<li>
4+
{% if item.url %}
5+
<a href="{{ site.baseurl }}/{{ item.url }}">{{ item.title }}</a>
6+
{% else %}
7+
{{ item.title }}
8+
{% endif %}
9+
{% if item.subsection %}
10+
{% assign titles = item.subsection %}
11+
{% include "table-of-contents" %}
12+
{% endif %}
13+
</li>
14+
{% endfor %}
1515
</ul>

0 commit comments

Comments
 (0)