Skip to content

Commit 458507e

Browse files
committed
move Java Link from index to getting-started
update fontawesome
1 parent 59866e3 commit 458507e

File tree

8 files changed

+43
-26
lines changed

8 files changed

+43
-26
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: Are You Coming From Java?
12+
description: What you should know to get to speed with Scala after your initial setup.
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-cloud"
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 inner-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-link">
77
<div class="doc-item-header">
88
<i class="{{link.icon}}"></i>
99
<h5>{{link.title}}</h5>

_includes/headertop.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<meta name="msapplication-TileColor" content="#15a9ce">
4747
<meta name="theme-color" content="#ffffff">
4848

49-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css" integrity="sha512-1ycn6IcaQQ40/MKBW2W4Rhis/DbILU74C1vSrLJxCq57o941Ym01SwNsOMqvEBFlcgUa6xLiPY/NS5R+E6ztJQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
49+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.1.2/css/all.min.css" integrity="sha512-1sCRPdkRXhBV2PBLUdRb4tMg1w2YPf37qatUFeS7zlBy7jJI8Lf4VHwWfZZfpXtYSLy85pkm9GaYVYMfw5BC1A==" crossorigin="anonymous" referrerpolicy="no-referrer" />
5050

5151
<!-- Custom stylesheet -->
5252
<link href="{{ site.baseurl }}/resources/css/unslider-dots.css" rel="stylesheet" type="text/css">
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{% comment %}
2+
Layouts using this include should pass an include variable called 'collection' referencing a collection carrying the data (i.e.: contribute_community_tickets, contribute_resources...)
3+
{% endcomment %}
4+
5+
{% for section in include.sections %}
6+
<h2 class="frontpage">{{ section.title }}</h2>
7+
<div class="documentation">
8+
{% for link in section.links %}
9+
<a href="{% if link.link contains '://' %}{{link.link}}{% else %}{{site.baseurl}}{{link.link}}{% endif %}" class="doc-item doc-item-link">
10+
<div class="doc-item-header">
11+
<i class="{{link.icon}}"></i>
12+
<h4>{{link.title}}</h4>
13+
</div>
14+
<div class="doc-item-main">
15+
<p>{{link.description}}</p>
16+
</div>
17+
</a>
18+
{% endfor %}
19+
</div>
20+
{% endfor %}

_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: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,6 @@
7777
&:nth-child(2n) {
7878
clear: none;
7979
}
80-
81-
&:active,
82-
&:focus,
83-
&:hover {
84-
text-decoration: none;
85-
background: none;
86-
}
8780
}
8881
}
8982
}

_sass/layout/table-of-content.scss

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@
6565
@include justify-content(flex-start);
6666
margin-bottom: 10px;
6767

68-
.fa {
68+
.fa,
69+
.fa-brands {
6970
font-size: 1.563rem;
7071
margin-right: 14px;
7172
color: $brand-primary;
@@ -92,9 +93,9 @@
9293
}
9394
}
9495

95-
&:active,
96-
&:focus,
97-
&:hover {
96+
&.doc-item-link:active,
97+
&.doc-item-link:focus,
98+
&.doc-item-link:hover {
9899
text-decoration: none;
99100
background: $gray-lighter;
100101
}

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)