From f04ca31f5c87a3e5d54aaf733be7f0a75172022a Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Tue, 14 Dec 2021 20:37:48 -0800 Subject: [PATCH] hello Discord (bye bye Gitter) --- _includes/masthead-community.html | 16 ++++++++-------- _layouts/frontpage.html | 18 +++++++++--------- _overviews/FAQ/index.md | 8 ++++---- _overviews/scala3-scaladoc/settings.md | 2 +- _sass/layout/table-of-content.scss | 4 ++-- _sass/layout/talk-to-us.scss | 4 ++-- _sips/sip-template.md | 2 -- contribute.md | 2 +- resources/img/frontpage/discord-logo.png | Bin 0 -> 3674 bytes resources/img/frontpage/gitter-logo.png | Bin 523 -> 0 bytes scala3/scaladoc.md | 2 +- 11 files changed, 28 insertions(+), 30 deletions(-) create mode 100644 resources/img/frontpage/discord-logo.png delete mode 100644 resources/img/frontpage/gitter-logo.png diff --git a/_includes/masthead-community.html b/_includes/masthead-community.html index 1d5f4912a7..9b76636212 100644 --- a/_includes/masthead-community.html +++ b/_includes/masthead-community.html @@ -17,15 +17,15 @@

{{forum.title}}

{% endfor %} -
-

Gitter

- Real-time (topic-specialized) chat +
+

Chat

+ Real-time chat on Discord
- \ No newline at end of file + diff --git a/_layouts/frontpage.html b/_layouts/frontpage.html index 743e27bd83..29fa5825fe 100644 --- a/_layouts/frontpage.html +++ b/_layouts/frontpage.html @@ -299,24 +299,24 @@

{{forum.title}}

{% endfor %} -
-

Real-time (topic-specialized) chat

- {% assign modLimit = site.data.chats-forums.gitterChannels.size | modulo: 2 %} +
+

Real-time chat

+ {% 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 %}
    {% endif %}
  • - - - {{channel.name}} + + + {{server.name}}
    • diff --git a/_overviews/FAQ/index.md b/_overviews/FAQ/index.md index 42f5406a90..fc9f4a10c1 100644 --- a/_overviews/FAQ/index.md +++ b/_overviews/FAQ/index.md @@ -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. @@ -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? diff --git a/_overviews/scala3-scaladoc/settings.md b/_overviews/scala3-scaladoc/settings.md index 5408585942..d490f82043 100644 --- a/_overviews/scala3-scaladoc/settings.md +++ b/_overviews/scala3-scaladoc/settings.md @@ -87,7 +87,7 @@ A mapping is of the form '\::\[scaladoc3|scaladoc|javadoc]::\'. 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. diff --git a/_sass/layout/table-of-content.scss b/_sass/layout/table-of-content.scss index 5dca9f7945..642244d0c1 100755 --- a/_sass/layout/table-of-content.scss +++ b/_sass/layout/table-of-content.scss @@ -109,7 +109,7 @@ @include clearfix; padding-bottom: $padding-small; .discourse, - .gitter { + .discord { h3 { margin-top: 0; } @@ -168,7 +168,7 @@ } } - .gitter { + .discord { ul { li { @include span-columns(3 of 6); diff --git a/_sass/layout/talk-to-us.scss b/_sass/layout/talk-to-us.scss index ca83f9676e..94c6a147e3 100755 --- a/_sass/layout/talk-to-us.scss +++ b/_sass/layout/talk-to-us.scss @@ -25,7 +25,7 @@ } .discourse, - .gitter { + .discord { margin-bottom: 50px; @include clearfix; } @@ -76,7 +76,7 @@ } } - .gitter { + .discord { ul.first { @include shift(2); diff --git a/_sips/sip-template.md b/_sips/sip-template.md index b3caf4e276..07668523a8 100644 --- a/_sips/sip-template.md +++ b/_sips/sip-template.md @@ -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" diff --git a/contribute.md b/contribute.md index 471ab85a3c..1abb5e539c 100644 --- a/contribute.md +++ b/contribute.md @@ -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 diff --git a/resources/img/frontpage/discord-logo.png b/resources/img/frontpage/discord-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..c055c19c6cc9f75494a5deb0ddf419d52a47a0b4 GIT binary patch literal 3674 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 literal 0 HcmV?d00001 diff --git a/resources/img/frontpage/gitter-logo.png b/resources/img/frontpage/gitter-logo.png deleted file mode 100644 index ff91a264d4b53823ebbd54b7541a6c0f66aa1e6a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 523 zcmeAS@N?(olHy`uVBq!ia0vp^79h;Q1|(OsS<3+_mUKs7M+SzC{oH>NSs54@4|%#c zhGeiN+nj&-dw!w>^RmP@<{PfN*;-slt}tP9PcE3yejr0g_KBd&h04W-9tIt3JDV;_ z$bk7eETIA`8)AKDHM;sRtoe2Oo^5_4`jE#-kT2nSTwqV~kI$c& zb7TFMyj)y4;Y5SfmQ!uDJVCnrN!?Crd3>083T?qnRMJ$`& z|1vfBv+KLenQJ>N<~B~8+4=DH%xE5d;i`j4Q-n;uDliKxGw+_Ha-;YDdYhKrQ(b59 z>zzB%R=~7-63d0=Gd%m}?`vJXbc*4d$uCy0Yx*iNudO#>W4B_{*b1aIc@H*TvzKaS zmSvuD3rJ6Cd*JZe-GoK6b|9g)&;_9!r6YY#|CEPa*1lf*ksQN=>4*;!-L2CLE= z#}%$d8Qo}le}DUYp6^bx4hHRy-_x#LX?5-%C$RT>EfA( z?fCnuCiJcBR151prr_H&wXd!3n1U?xY)n2Q1JiZy?4B)m7Xf3J!PC{xWt~$(69656 B+Q$F@ diff --git a/scala3/scaladoc.md b/scala3/scaladoc.md index fca1ba9593..69c307654e 100644 --- a/scala3/scaladoc.md +++ b/scala3/scaladoc.md @@ -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"}