Skip to content

Commit ce4967b

Browse files
committed
Drop the links to Scala 2 and Scala 3 pages and integrate on landing page
The links were not visible enough and made it difficult to discover the additional content. Instead all content is now presented on the landing page and can simply be discovered by scrolling. This made the Scala 2 page obsolete (at least for now). I keep the Scala 3 page since we want to be able to link to the "Scala 3" documentation.
1 parent 3c56556 commit ce4967b

File tree

4 files changed

+61
-83
lines changed

4 files changed

+61
-83
lines changed

_layouts/documentation.html

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,11 @@ <h1>Scala 2</h1>
3333
<div class="inner-box">
3434
{% include documentation-sections.html sections=page.scala2-sections %}
3535
</div>
36-
<div class="language-footer">
37-
<a class="go-btn" href="/scala2"><i class="fa fa-arrow-right" aria-hidden="true"></i> Continue to the <strong>Scala 2</strong> Documentation</a>
38-
</div>
3936
</div>
4037

4138
<div class="wrap scala3">
4239
<div class="language-header">
43-
<h1>Scala 3 (Pre-Release Preview)</h1>
40+
<h1>Scala 3 (Preview)</h1>
4441
</div>
4542
<div class="inner-box">
4643
<blockquote>
@@ -49,9 +46,6 @@ <h1>Scala 3 (Pre-Release Preview)</h1>
4946
</blockquote>
5047
{% include documentation-sections.html sections=page.scala3-sections %}
5148
</div>
52-
<div class="language-footer">
53-
<a class="go-btn" href="/scala3"><i class="fa fa-arrow-right" aria-hidden="true"></i> Continue to the <strong>Scala 3</strong> Documentation</a>
54-
</div>
5549
</div>
5650
</section>
5751

index.md

Lines changed: 53 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@ layout: documentation
33
title: Documentation
44
namespace: root
55
partof: documentation
6+
more-resources-label: More Resources
67

78
scala3-sections:
8-
- links:
9+
- title: "First steps"
10+
links:
911
- title: "New in Scala 3"
1012
description: "An overview of the exciting new features in Scala 3."
1113
icon: "fa fa-star"
@@ -18,9 +20,28 @@ scala3-sections:
1820
description: "An online book introducing the main language features."
1921
icon: "fa fa-book"
2022
link: /scala3/book/introduction.html
23+
- title: "More detailed information"
24+
links:
25+
- title: "Migration Guide"
26+
description: "A guide to help you migrate from Scala 2 to Scala 3."
27+
icon: "fa fa-suitcase"
28+
link: https://scalacenter.github.io/scala-3-migration-guide/
29+
- title: "Guides"
30+
description: "Detailed guides about particular aspects of the language."
31+
icon: "fa fa-map"
32+
link: /scala3/guides
33+
- title: "API"
34+
description: "API documentation for every version of Scala 3."
35+
icon: "fa fa-file-text"
36+
link: https://dotty.epfl.ch/api/index.html
37+
- title: "Language Reference"
38+
description: "The Scala 3 language reference."
39+
icon: "fa fa-book"
40+
link: https://dotty.epfl.ch/docs/reference/overview.html
2141

2242
scala2-sections:
23-
- links:
43+
- title: "First Steps..."
44+
links:
2445
- title: "Getting Started"
2546
description: "Install Scala on your computer and start writing some Scala code!"
2647
icon: "fa fa-rocket"
@@ -33,7 +54,14 @@ scala2-sections:
3354
description: "An online book introducing the main language features."
3455
icon: "fa fa-book"
3556
link: /overviews/scala-book/introduction.html
57+
more-resources:
58+
- title: Online Courses, Exercises, & Blogs
59+
url: /learn.html
60+
- title: Books
61+
url: /books.html
3662

63+
- title: "Returning Users"
64+
links:
3765
- title: "API"
3866
description: "API documentation for every version of Scala."
3967
icon: "fa fa-file-text"
@@ -42,8 +70,31 @@ scala2-sections:
4270
description: "In-depth documentation covering many of Scala's features."
4371
icon: "fa fa-database"
4472
link: /overviews/index.html
73+
- title: "Style Guide"
74+
description: "An in-depth guide on how to write idiomatic Scala code."
75+
icon: "fa fa-bookmark"
76+
link: /style/index.html
77+
- title: "Cheatsheet"
78+
description: "A handy cheatsheet covering the basics of Scala's syntax."
79+
icon: "fa fa-list"
80+
link: /cheatsheets/index.html
81+
- title: "Scala FAQs"
82+
description: "A list of frequently-asked questions about Scala language features and their answers."
83+
icon: "fa fa-question-circle"
84+
link: /tutorials/FAQ/index.html
4585
- title: "Language Spec"
4686
description: "Scala's formal language specification."
4787
icon: "fa fa-book"
4888
link: https://scala-lang.org/files/archive/spec/2.13/
89+
90+
- title: "Scala Evolution"
91+
links:
92+
- title: "SIPs"
93+
description: "The Scala Improvement Process. Language & compiler evolution."
94+
icon: "fa fa-cogs"
95+
link: /sips/index.html
96+
- title: "SPP"
97+
description: "The Scala Platform Process. Community-driven library evolution."
98+
icon: "fa fa-users"
99+
link: https://platform.scala-lang.org
49100
---

scala2.md

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

scala3/index.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,12 @@ discourse: true
88
more-resources-label: More Resources
99
sections:
1010

11-
- title: "Scala 3 (Preview)"
11+
- title: "First Steps"
1212
links:
13+
- title: "New in Scala 3"
14+
description: "An overview of the exciting new features in Scala 3."
15+
icon: "fa fa-star"
16+
link: /scala3/new-in-scala3.html
1317
- title: "Getting Started"
1418
description: "Install Scala 3 on your computer and start writing some Scala code!"
1519
icon: "fa fa-rocket"
@@ -18,14 +22,12 @@ sections:
1822
description: "An online book introducing the main language features."
1923
icon: "fa fa-book"
2024
link: /scala3/book/introduction.html
25+
- title: "More Detailed Information"
26+
links:
2127
- title: "Migration Guide"
2228
description: "A guide to help you migrate from Scala 2 to Scala 3."
2329
icon: "fa fa-suitcase"
2430
link: https://scalacenter.github.io/scala-3-migration-guide/
25-
- title: "New in Scala 3"
26-
description: "An overview of the exciting new features in Scala 3."
27-
icon: "fa fa-star"
28-
link: /scala3/new-in-scala3.html
2931
- title: "Guides"
3032
description: "Detailed guides about particular aspects of the language."
3133
icon: "fa fa-map"

0 commit comments

Comments
 (0)