Skip to content

hello Discord (bye bye Gitter) #2273

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 16, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions _includes/masthead-community.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ <h4><a href="{{forum.url}}">{{forum.title}}</a></h4>
{% endfor %}
</ul>
</div>
<div class="gitter">
<h3>Gitter</h3>
<span>Real-time (topic-specialized) chat</span>
<div class="discord">
<h3>Chat</h3>
<span>Real-time chat on Discord</span>
<ul>
{% for channel in site.data.chats-forums.gitterChannels %}
{% for server in site.data.chats-forums.discordServers %}
<li>
<a href="{{channel.url}}">
<img src="{{ site.baseurl }}/resources/img/frontpage/gitter-logo.png" alt="{{channel.name}}">
<h4>{{channel.name}}</h4>
<a href="{{server.url}}">
<img src="{{ site.baseurl }}/resources/img/frontpage/discord-logo.png" alt="{{server.name}}">
<h4>{{server.name}}</h4>
</a>
</li>
{% endfor %}
Expand All @@ -34,4 +34,4 @@ <h4>{{channel.name}}</h4>
</div>
</div>
</div>
</section>
</section>
18 changes: 9 additions & 9 deletions _layouts/frontpage.html
Original file line number Diff line number Diff line change
Expand Up @@ -299,24 +299,24 @@ <h4>{{forum.title}}</h4>
</a>
{% endfor %}
</div>
<div class="gitter">
<h3>Real-time (topic-specialized) chat</h3>
{% assign modLimit = site.data.chats-forums.gitterChannels.size | modulo: 2 %}
<div class="discord">
<h3>Real-time chat</h3>
{% assign modLimit = site.data.chats-forums.discordServers.size | modulo: 2 %}
{% capture channelLimit %}
{% if modLimit != 0 %}
{{site.data.chats-forums.gitterChannels.size | minus: 1}}
{{site.data.chats-forums.discordServers.size | minus: 1}}
{% else %}
{{site.data.chats-forums.gitterChannels.size}}
{{site.data.chats-forums.discordServers.size}}
{% endif %}
{% endcapture %}
{% for channel in site.data.chats-forums.gitterChannels limit: channelLimit %}
{% for server in site.data.chats-forums.discordServers limit: channelLimit %}
{% if forloop.first %}
<ul class="first">
{% endif %}
<li>
<a href="{{channel.url}}">
<img src="{{ site.baseurl }}/resources/img/frontpage/gitter-logo.png" alt="">
<span>{{channel.name}}</span>
<a href="{{server.url}}">
<img src="{{ site.baseurl }}/resources/img/frontpage/discord-logo.png" alt="">
<span>{{server.name}}</span>
</a>
</li>

Expand Down
8 changes: 4 additions & 4 deletions _overviews/FAQ/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ especially popular, well-known books.
We don't have a list of all the Scala books that
are out there; there are many.

You can go on the [Scala room on
Gitter](https://gitter.im/scala/scala) or another community forum and
You can go on the \#scala-users room [on
Discord](https://discord.com/invite/scala) or another community forum and
ask for book recommendations. You'll get more helpful
answers if you provide some information about your background and your
reasons for wanting to learn Scala.
Expand All @@ -55,8 +55,8 @@ way. In time, there will be more and more Scala 3 jobs as well.

This is addressed on our [Community page](https://scala-lang.org/community/#scala-jobs).

In short, the only officially sanctioned place is the [scala/job-board
room on Gitter](https://gitter.im/scala/job-board).
In short, the only officially sanctioned place is the \#jobs channel
[on Discord](https://discord.com/invite/scala).

### Who's behind Scala?

Expand Down
2 changes: 1 addition & 1 deletion _overviews/scala3-scaladoc/settings.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ A mapping is of the form '\<regex>::\[scaladoc3|scaladoc|javadoc]::\<path>'. You

Links to social sites. For example:

`-social-links:github::https://github.com/lampepfl/dotty,gitter::https://gitter.im/scala/scala,twitter::https://twitter.com/scala_lang`
`-social-links:github::https://github.com/lampepfl/dotty,discord::https://discord.com/invite/scala,twitter::https://twitter.com/scala_lang`

Valid values are of the form: '\[github|twitter|gitter|discord]::link'. Scaladoc also supports 'custom::link::white_icon_name::black_icon_name'. In this case icons must be present in 'images/' directory.

Expand Down
4 changes: 2 additions & 2 deletions _sass/layout/table-of-content.scss
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
@include clearfix;
padding-bottom: $padding-small;
.discourse,
.gitter {
.discord {
h3 {
margin-top: 0;
}
Expand Down Expand Up @@ -168,7 +168,7 @@
}
}

.gitter {
.discord {
ul {
li {
@include span-columns(3 of 6);
Expand Down
4 changes: 2 additions & 2 deletions _sass/layout/talk-to-us.scss
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
}

.discourse,
.gitter {
.discord {
margin-bottom: 50px;
@include clearfix;
}
Expand Down Expand Up @@ -76,7 +76,7 @@
}
}

.gitter {
.discord {
ul.first {
@include shift(2);

Expand Down
2 changes: 0 additions & 2 deletions _sips/sip-template.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,8 @@ process anyway so it's better to get them out up front.
2. [API Documentation][2]
3. [Academic/Research papers/supporting material][3]
4. [Alternative Libraries/Implementations][4]
5. [Discussion forum/post/gitter/IRC][5]

[1]: https://github.com "GitHub"
[2]: https://www.scala-lang.org/api/ "Scaladoc"
[3]: https://en.wikipedia.org/wiki/Academic_publishing "Academic/Research"
[4]: https://github.com/dogescript/dogescript "Alternatives"
[5]: https://gitter.im "Gitter"
2 changes: 1 addition & 1 deletion contribute.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ The goal of this documentation repository is to be tighter and more organized th
- **be polished** it must be thorough, complete, correct, organized, and "article-like" (personal programming notes don't quite fit.)
- **be maintained** if the document might require revisions from time to time, it should come with an owner

If you have something you're thinking about contributing, or that you're thinking about writing in order to contribute-- we'd love to consider it! Please don't hesitate to use GitHub issues and pull requests and the [scala/contributors room](https://gitter.im/scala/contributors) on Gitter for any questions, concerns, clarifications, etc.
If you have something you're thinking about contributing, or that you're thinking about writing in order to contribute-- we'd love to consider it! Please don't hesitate to use GitHub issues and pull requests and the \#scala-contributors room [on Discord](https://discord.com/invite/scala) for any questions, concerns, clarifications, etc.

## Document Templates

Expand Down
Binary file added resources/img/frontpage/discord-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed resources/img/frontpage/gitter-logo.png
Binary file not shown.
2 changes: 1 addition & 1 deletion scala3/scaladoc.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Blog posts are a specific type of static sites. In the Scaladoc manual you can f

### Social links

Furthermore, Scaladoc provides an easy way to configure your [social media links][social-links] e.g. Twitter or Gitter.
Furthermore, Scaladoc provides an easy way to configure your [social media links][social-links] e.g. Twitter or Discord.

![](../resources/images/scala3/scaladoc/social-links.png){: style="width: 180px"}

Expand Down