Skip to content

Commit 4403a80

Browse files
nicolasstuckinicolasstucki
authored
Merge pull request #11032 from dotty-staging/docs/update-landing-page
Update dotty landing page
2 parents 758c146 + a40c45f commit 4403a80

File tree

2 files changed

+43
-12
lines changed

2 files changed

+43
-12
lines changed

‎scala3doc/scala3-docs/css/frontpage.css

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,12 @@ section.page {
6060
min-height: 100vh;
6161
width: 100%;
6262
padding: 0;
63+
padding-bottom: 2em;
64+
}
65+
66+
section.page strong {
67+
font-weight: bold;
68+
color: rgba(255,255,255,0.6);
6369
}
6470

6571
section .container {

‎scala3doc/scala3-docs/index.html

Lines changed: 37 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Dotty
2+
title: Scala 3
33
layout: main
44
hasFrame: false
55
extraCSS:
@@ -26,6 +26,11 @@
2626
</li>
2727
<li class="nav-item">
2828
<a class="nav-link" href="docs/index.html">
29+
Reference
30+
</a>
31+
</li>
32+
<li class="nav-item">
33+
<a class="nav-link" href="https://docs.scala-lang.org/scala3/">
2934
Docs
3035
</a>
3136
</li>
@@ -42,7 +47,7 @@
4247
<div class="scala-logo-container">
4348
<img src="images/dotty-logo-white.svg" alt="logo" />
4449
<div class="subtitle text-center">
45-
<h1 id="dotty" class="above-byline">Dotty</h1>
50+
<h1 id="dotty" class="above-byline">Scala 3</h1>
4651
<p>A next-generation compiler for Scala</p>
4752
<p>(scroll down for more info)</p>
4853
</div>
@@ -52,28 +57,48 @@ <h1 id="dotty" class="above-byline">Dotty</h1>
5257
<section class="page bg-blue bg-dark">
5358
<div class="container">
5459

55-
<h1 id="getting-started">Try Dotty</h1>
56-
<p>If you are a Mac user, you can install Dotty with <a href="https://brew.sh/">brew</a>:</p>
60+
<h1 id="getting-started">Try Scala 3</h1>
61+
<p>There are multiple ways of <a href="https://docs.scala-lang.org/scala3/getting-started.html">getting started</a> with Scala 3.</p>
62+
<ol>
63+
<li>You can try Scala 3 in your browser with <a href="https://scastie.scala-lang.org/?target=dotty">Scastie</a>.</li>
64+
<li>If you already have sbt installed, you can <a href="#getting-started-with-a-project">create a Scala 3 project</a> and sbt will take care of the rest.</li>
65+
<li>You can install all necessary dependencies with <a href="https://get-coursier.io/">coursier</a> by running <code>cs setup</code>. You can also run <code>cs install scala3-compiler</code> or <code>cs install scala3-repl</code> to install command-line commands for the compiler and repl, correspondingly.</li>
66+
<li>You can <a href="#install">manually install Scala 3</a> on your computer.</li>
67+
</ol>
68+
69+
<h1 id="install">Install Scala 3</h1>
70+
<p>If you are a <strong>Mac</strong> user, you can install Scala 3 with <a href="https://brew.sh/">brew</a>:</p>
5771
<pre><code>brew install lampepfl/brew/dotty</code></pre>
5872

59-
<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>
73+
<p>
74+
If you are a <strong>Linux</strong> or <strong>Windows</strong> user, as a prerequisite you need a JDK 8 or later properly installed on your system. The environment variable <code>JAVA_HOME</code> should point to your Java installation.<br/>
75+
For <strong>Windows</strong> users, we recommend using <a href="https://docs.microsoft.com/en-us/windows/wsl/install-win10">the Windows subsystem for linux</a> or some other bash shell like <a href="https://gitforwindows.org/">git bash</a>.<br/>
76+
Then download the <a href="https://github.com/lampepfl/dotty/releases">latest release</a>. Optionally add the path of the folder <code>bin/</code> to the system environment variable <code>PATH</code>.
77+
</p>
6078

6179
<p>Now you can compile Scala source code:</p>
6280
<pre><code>scalac hello.scala</code></pre>
6381

6482
<p>To start the REPL, run: <code>scala</code>.</p>
6583

66-
<p>Or, you can try Dotty in your browser with <a href="https://scastie.scala-lang.org/?target=dotty">Scastie</a>.</p>
67-
68-
<h1 id="getting-started-with-a-project">Create a Dotty Project</h1>
69-
<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>
84+
<h1 id="getting-started-with-a-project">Create a Scala 3 Project</h1>
85+
<p>The fastest way to create a new project in Scala 3 is using <a href="http://www.scala-sbt.org/">sbt (1.1.4+)</a>.</p>
7086

71-
<p>Create a Dotty project:</p>
87+
<p>Create a Scala 3 project:</p>
7288
<pre><code>sbt new <a href="https://github.com/lampepfl/dotty.g8">lampepfl/dotty.g8</a></code></pre>
7389

74-
<p>Or a Dotty project that cross compiles with Scala 2:</p>
90+
<p>Or a Scala 3 project that cross compiles with Scala 2:</p>
7591
<pre><code>sbt new <a href="https://github.com/lampepfl/dotty-cross.g8">lampepfl/dotty-cross.g8</a></code></pre>
7692

77-
<p>For documentation see the <a href="https://github.com/lampepfl/dotty-example-project">Dotty Example Project</a>.</p>
93+
<p>For documentation see the <a href="https://github.com/lampepfl/dotty-example-project">Scala 3 Example Project</a>.</p>
94+
95+
<h1 id="documentation">Learn more about Scala 3</h1>
96+
<p>You can find much more information about Scala 3 in ...</p>
97+
<ul>
98+
<li>... the <a href="https://docs.scala-lang.org/scala3/">Scala 3 documentation</a>,</li>
99+
<li>... the <a href="https://docs.scala-lang.org/scala3/scala3-book">Scala 3 book</a>,</li>
100+
<li>... the <a href="docs/index.html">Scala 3 reference docs</a>,</li>
101+
<li>... the <a href="https://docs.scala-lang.org/scala3/guides.html">Scala 3 guides</a>.</li>
102+
</ul>
78103
</div>
79104
</section>

0 commit comments

Comments
 (0)