Skip to content

Commit 2dca1bf

Browse files
committed
move Java Link from index to getting-started
1 parent d32aabf commit 2dca1bf

File tree

6 files changed

+32
-15
lines changed

6 files changed

+32
-15
lines changed

_getting-started/index.md

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,19 @@ partof: getting-started
55
languages: [fr, ja, uk]
66
includeTOC: true
77

8+
newcomer_resources:
9+
- title: "Resources For Newcomers"
10+
links:
11+
- title: "Scala for Java Programmers"
12+
description: "An effective approach to learning Scala as a programmer with a Java background."
13+
icon: "fa fa-coffee"
14+
link: /scala3/newcomers/java.html
15+
- title: Scala in the Browser
16+
description: >
17+
To start experimenting with Scala right away, use "Scastie" in your browser.
18+
icon: "fa fa-arrow-right"
19+
link: https://scastie.scala-lang.org/pEBYc5VMT02wAGaDrfLnyw
20+
821
redirect_from:
922
- /getting-started.html
1023
- /scala3/getting-started.html # we deleted the scala 3 version of this page
@@ -19,14 +32,7 @@ The instructions below cover both Scala 2 and Scala 3.
1932
{% endaltDetails %}
2033
</div>
2134

22-
## Try Scala without installing anything
23-
24-
To start experimenting with Scala right away, use <a href="https://scastie.scala-lang.org/pEBYc5VMT02wAGaDrfLnyw" target="_blank">“Scastie” in your browser</a>.
25-
_Scastie_ is an online “playground” where you can experiment with Scala examples to see how things work, with access to all Scala compilers and published libraries.
26-
27-
> Scastie supports both Scala 2 and Scala 3, but it defaults
28-
> to Scala 3. If you are looking for a Scala 2 snippet to play with,
29-
> [click here](https://scastie.scala-lang.org/MHc7C9iiTbGfeSAvg8CKAA).
35+
{% include documentation-sections.html sections=page.newcomer_resources %}
3036

3137
## Install Scala on your computer
3238

_includes/documentation-sections.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<div class="section">
44
<h2 class="frontpage">{{ section.title }}</h2>
55
{% for link in section.links %}
6-
<a href="{% if link.link contains '://' %}{{link.link}}{% else %}{{site.baseurl}}{{link.link}}{% endif %}" class="doc-item">
6+
<a href="{% if link.link contains '://' %}{{link.link}}{% else %}{{site.baseurl}}{{link.link}}{% endif %}" class="doc-item doc-item-card">
77
<div class="doc-item-header">
88
<i class="{{link.icon}}"></i>
99
<h5>{{link.title}}</h5>

_sass/base/helper.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@
1616
.inline-sticky-top {
1717
position: sticky;
1818
top: 15px;
19+
margin-bottom: 25px;
1920
background: #fff;
2021
-webkit-box-shadow: 0 0 18px 20px #fff;
2122
-moz-box-shadow: 0 0 18px 20px #fff;
22-
box-shadow: 0 0 18px 20px #fff;
23+
box-shadow: 0 7px 15px 5px #fff;
2324
z-index: 5;
2425
}
2526

_sass/layout/inner-main.scss

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,20 @@
5454
.content-primary {
5555
.documentation,
5656
.tools {
57+
.doc-item.doc-item-card {
58+
@include omega(3n);
59+
&:nth-child(3n) {
60+
clear: none;
61+
}
62+
float: left;
63+
margin-right: 0;
64+
&:active,
65+
&:focus,
66+
&:hover {
67+
text-decoration: none;
68+
background: $gray-lighter;
69+
}
70+
}
5771
.doc-item,
5872
.tool-item {
5973
margin-bottom: 0;

_sass/layout/table-of-content.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
}
4949

5050

51-
.doc-item {
51+
.doc-item.doc-item-card {
5252
@include span-columns(4);
5353
@include omega;
5454
// margin-bottom: $padding-medium;

index.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@ sections:
2525
description: "Learn Scala by reading a series of short lessons."
2626
icon: "fa fa-book-open"
2727
link: /scala3/book/introduction.html
28-
- title: "Scala for Java Programmers"
29-
description: "An effective approach to learning Scala as a programmer with the Java background."
30-
icon: "fa fa-coffee"
31-
link: /scala3/newcomers/java.html
3228
- title: Online Courses
3329
description: "MOOCs to learn Scala, for beginners and experienced programmers."
3430
icon: "fa fa-cloud"

0 commit comments

Comments
 (0)