Skip to content

migrate gitter links to discord #14211

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
Jan 4, 2022
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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -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)
Expand All @@ -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
Expand Down
6 changes: 0 additions & 6 deletions docs/_layouts/main.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,3 @@
<div id="content-wrapper">
{{ content }}
</div>
<script>
((window.gitter = {}).chat = {}).options = {
room: 'scala/scala'
};
</script>
<script src="https://sidecar.gitter.im/dist/sidecar.v1.js" async defer></script>
29 changes: 0 additions & 29 deletions docs/css/dottydoc.css
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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;
Expand Down
6 changes: 0 additions & 6 deletions docs/css/frontpage.css
Original file line number Diff line number Diff line change
Expand Up @@ -119,12 +119,6 @@ pre, code {
line-height: 1.75em;
}

/* gitter chat */
.gitter-chat-embed {
top: 0;
bottom: 0;
}

aside {
margin: 0;
padding: 0;
Expand Down
2 changes: 1 addition & 1 deletion project/Build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion project/scripts/cmdScaladocTests
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down