diff --git a/README.md b/README.md index 30789723d25a..834f02bc01fd 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ Dotty ===== [![Dotty CI](https://github.com/lampepfl/dotty/workflows/Dotty/badge.svg?branch=master)](https://github.com/lampepfl/dotty/actions?query=branch%3Amaster) -[![Join the chat at https://gitter.im/scala/scala](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/scala/scala?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +[![Join the chat at https://discord.com/invite/scala](https://img.shields.io/discord/632150470000902164)](https://img.shields.io/discord/632150470000902164) * [Homepage](https://dotty.epfl.ch) * [Documentation](https://dotty.epfl.ch/docs) @@ -18,7 +18,7 @@ Building a Local Distribution Code of Conduct =============== Dotty uses the [Scala Code of Conduct](https://www.scala-lang.org/conduct.html) -for all communication and discussion. This includes both GitHub, Gitter chat and +for all communication and discussion. This includes both GitHub, Discord and other more direct lines of communication such as email. How to Contribute diff --git a/docs/_layouts/main.html b/docs/_layouts/main.html index 5a9a2c1f2254..51139f6080ac 100644 --- a/docs/_layouts/main.html +++ b/docs/_layouts/main.html @@ -8,9 +8,3 @@
{{ content }}
- - diff --git a/docs/css/dottydoc.css b/docs/css/dottydoc.css index 3dd8b13bfaa2..ca7613835ff0 100644 --- a/docs/css/dottydoc.css +++ b/docs/css/dottydoc.css @@ -211,21 +211,6 @@ aside.success { background-color: #ebfddd; } -/* gitter chat */ -.gitter-open-chat-button { - background-color: grey; -} -.gitter-open-chat-button:focus, .gitter-open-chat-button:hover { - background-color: var(--primary); -} -.gitter-open-chat-button:focus { - box-shadow: 0 0 8px var(--primary); -} -.gitter-chat-embed { - top: 40px; /* 50px (navbar) - 10px (aside's margin) */ - bottom: -10px; -} - /* media queries for bigger screens (dottydoc is mobile-first) */ @media (min-width: 576px) { .byline .author { @@ -252,20 +237,6 @@ aside.success { } } -.gitter-open-chat-button { - writing-mode: vertical-lr; - text-orientation: upright; - right: 0px; - bottom: 100px; - padding: 0.5em 0.25em 0.5em 0.25em; - border-bottom-left-radius: .5em; - border-top-right-radius: 0em; -} - -.gitter-open-chat-button.is-collapsed { - transform: translateX(120%); -} - header { position: static !important; width: 100% !important; diff --git a/docs/css/frontpage.css b/docs/css/frontpage.css index 722d4ba09802..a3a5c0d7dd8a 100644 --- a/docs/css/frontpage.css +++ b/docs/css/frontpage.css @@ -119,12 +119,6 @@ pre, code { line-height: 1.75em; } -/* gitter chat */ -.gitter-chat-embed { - top: 0; - bottom: 0; -} - aside { margin: 0; padding: 0; diff --git a/project/Build.scala b/project/Build.scala index a18e37db9772..3ee15efc21e9 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -329,7 +329,7 @@ object Build { "-project-logo", "docs/logo.svg", "-social-links:" + "github::https://github.com/lampepfl/dotty," + - "gitter::https://gitter.im/scala/scala," + + "discord::https://discord.com/invite/scala," + "twitter::https://twitter.com/scala_lang", // contains special definitions which are "transplanted" elsewhere // and which therefore confuse Scaladoc when accessed from this pkg diff --git a/project/scripts/cmdScaladocTests b/project/scripts/cmdScaladocTests index fd3c4de85777..e2eb8fd65470 100755 --- a/project/scripts/cmdScaladocTests +++ b/project/scripts/cmdScaladocTests @@ -30,7 +30,7 @@ dist/target/pack/bin/scaladoc \ "-skip-by-regex:.+\.internal($|\..+)" \ "-skip-by-regex:.+\.impl($|\..+)" \ -project-logo docs/logo.svg \ - -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 \ -Ygenerate-inkuire \ "-skip-by-id:scala.runtime.stdLibPatches" \ "-skip-by-id:scala.runtime.MatchCase" \