Skip to content

Commit 17f413d

Browse files
committed
Fix #34 Replace Gitter links and icon with Matrix
1 parent 4661a6c commit 17f413d

File tree

10 files changed

+44
-29
lines changed

10 files changed

+44
-29
lines changed

content/_config.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ description: >- # this means to ignore newlines until "baseurl:"
1414
1515
discourse_url: https://cwl.discourse.group/
1616
github_url: https://github.com/common-workflow-language/
17-
gitter_url: https://gitter.im/common-workflow-language/common-workflow-language
1817
matrix_url: https://matrix.to/#/#common-workflow-language_common-workflow-language:gitter.im
1918
twitter_url: https://twitter.com/commonwl
2019
youtube_url: https://www.youtube.com/c/CommonWLorgStandard/

content/_includes/gitter.html

Lines changed: 0 additions & 21 deletions
This file was deleted.

content/_includes/top_nav.html

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,16 @@
4949
<a href="{{ site.github_url }}" aria-label="GitHub link"><i class="fab fa-github first-icon"></i></a>
5050
<a href="{{ site.twitter_url }}" aria-label="Twitter link"><i class="fab fa-twitter"></i></a>
5151
<a href="{{ site.youtube_url }}" aria-label="YouTube link"><i class="fab fa-youtube"></i></a>
52-
<a href="{{ site.gitter_url }}" aria-label="Gitter link"><i class="fab fa-gitter"></i></a>
52+
<a href="{{ site.matrix_url }}" class="matrix-link" aria-label="Matrix link">
53+
<svg width="26" height="29.7" class="matrix-svg" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" version="1.1" viewBox="0 0 27.9 32">
54+
<title>Matrix (protocol) logo</title>
55+
<g transform="translate(-.095 .005)" fill="#040404">
56+
<path d="m27.1 31.2v-30.5h-2.19v-0.732h3.04v32h-3.04v-0.732z"/>
57+
<path class="svg-matrix-path" d="m8.23 10.4v1.54h0.044c0.385-0.564 0.893-1.03 1.49-1.37 0.58-0.323 1.25-0.485 1.99-0.485 0.72 0 1.38 0.14 1.97 0.42 0.595 0.279 1.05 0.771 1.36 1.48 0.338-0.5 0.796-0.941 1.38-1.32 0.58-0.383 1.27-0.574 2.06-0.574 0.602 0 1.16 0.074 1.67 0.22 0.514 0.148 0.954 0.383 1.32 0.707 0.366 0.323 0.653 0.746 0.859 1.27 0.205 0.522 0.308 1.15 0.308 1.89v7.63h-3.13v-6.46c0-0.383-0.015-0.743-0.044-1.08-0.0209-0.307-0.103-0.607-0.242-0.882-0.133-0.251-0.336-0.458-0.584-0.596-0.257-0.146-0.606-0.22-1.05-0.22-0.44 0-0.796 0.085-1.07 0.253-0.272 0.17-0.485 0.39-0.639 0.662-0.159 0.287-0.264 0.602-0.308 0.927-0.052 0.347-0.078 0.697-0.078 1.05v6.35h-3.13v-6.4c0-0.338-7e-3 -0.673-0.021-1-0.0114-0.314-0.0749-0.623-0.188-0.916-0.108-0.277-0.3-0.512-0.55-0.673-0.258-0.168-0.636-0.253-1.14-0.253-0.198 0.0083-0.394 0.042-0.584 0.1-0.258 0.0745-0.498 0.202-0.705 0.374-0.228 0.184-0.422 0.449-0.584 0.794-0.161 0.346-0.242 0.798-0.242 1.36v6.62h-3.13v-11.4z"/>
58+
<path d="m0.936 0.732v30.5h2.19v0.732h-3.04v-32h3.03v0.732z"/>
59+
</g>
60+
</svg>
61+
</a>
5362
<a href="{{ site.discourse_url }}" aria-label="Discourse link"><i class="fab fa-discourse"></i></a>
5463
</li>
5564
</ul>

content/_sass/partials/_nav.scss

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,21 @@
311311
margin: 0;
312312
padding: $nav--item-padding 0.25rem;
313313

314+
.matrix-link {
315+
text-decoration: none;
316+
}
317+
318+
.matrix-svg {
319+
position: relative;
320+
top: 4px;
321+
vertical-align: initial;
322+
width: 26px;
323+
324+
&:hover g {
325+
fill: $cwl-red;
326+
}
327+
}
328+
314329
.fab {
315330
font-size: 2em;
316331
margin: $nav--item-margin;
@@ -326,6 +341,11 @@
326341
margin: 8px 0 0;
327342
padding: 0 1rem;
328343

344+
.matrix-svg {
345+
height: auto;
346+
width: 24px;
347+
}
348+
329349
.fab {
330350
font-size: 1.5rem;
331351
margin: 0 $nav--item-margin;
@@ -341,6 +361,7 @@
341361

342362
@include media-breakpoint-up(xl) {
343363
.nav-social-icons {
364+
align-items: center;
344365
display: flex;
345366
flex-wrap: nowrap;
346367
}

content/_sass/partials/_variables.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ $salmon: #f5ecdf;
1717
$cwl-red: #b5314c;
1818
$link-blue: #0d6efd;
1919
$link-blue-dark: #0264f7;
20-
$gitter-grey: rgba(15, 70, 100, .12);
2120
$twitter-blue: #08a0e9;
2221
$youtube-red: #c00;
2322
$cwl-menu-blue: #337ab7;

content/assets/img/Matrix_icon.svg

Lines changed: 9 additions & 0 deletions
Loading

content/code-of-conduct.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ The CWL Project is dedicated to providing a harassment-free experience for
1313
everyone. We do not tolerate harassment of participants in any form.
1414

1515
This code of conduct applies to all CWL Project spaces both online and off: the
16-
Google Group, the Gitter chat room, the Google Hangouts chats, and any other
16+
Google Group, the Matrix chat room, the Google Hangouts chats, and any other
1717
CWL spaces. Anyone who violates this code of conduct may be sanctioned or
1818
expelled from these spaces at the discretion of the CWL Leadership Team.
1919

content/community.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ class: page-short
99
If you’re interested in joining the CWL community, we recommend checking out the following resources and forums:
1010

1111
* The place to ask a question about all things CWL is [the CWL Discourse Group](https://cwl.discourse.group/). Previously we used [biostars.org](https://www.biostars.org/t/cwl/) where you can still read older responses.
12-
* If you are interested in learning more or contributing ideas or code, [come chat with us on Gitter](https://gitter.im/common-workflow-language/common-workflow-language), check out [#CommonWL on Twitter](https://twitter.com/search?q=%23CommonWL), join the [mailing list common-workflow-language on Google Groups](https://groups.google.com/forum/#!forum/common-workflow-language) or [fork the repository](https://github.com/common-workflow-language/common-workflow-language) and send a pull request!
12+
* If you are interested in learning more or contributing ideas or code, [come chat with us on Matrix](https://matrix.to/#/#common-workflow-language_common-workflow-language:gitter.im), check out [#CommonWL on Twitter](https://twitter.com/search?q=%23CommonWL), join the [mailing list common-workflow-language on Google Groups](https://groups.google.com/forum/#!forum/common-workflow-language) or [fork the repository](https://github.com/common-workflow-language/common-workflow-language) and send a pull request!
1313
* Besides the web interface for the mailing list, one can also join by sending a blank email to [common-workflow-language+subscribe@googlegroups.com](mailto:common-workflow-language+subscribe@googlegroups.com) and replying to the automated response.
1414
* If you would like to receive Google Calendar invites for the CWL weekly video chat, sign up at [https://groups.google.com/g/common-workflow-language-videochat-invites](https://groups.google.com/g/common-workflow-language-videochat-invites).
1515

16-
The CWL Project is dedicated to providing a harassment-free experience for everyone, regardless of gender, gender identity and expression, sexual orientation, disability, physical appearance, body size, age, race, or religion. We do not tolerate harassment of participants in any form. This code of conduct applies to all CWL Project spaces, including the Google Group, the Gitter chat room, the Google Hangouts chats, both online and off. Anyone who violates this code of conduct may be sanctioned or expelled from these spaces at the discretion of the leadership team.
16+
The CWL Project is dedicated to providing a harassment-free experience for everyone, regardless of gender, gender identity and expression, sexual orientation, disability, physical appearance, body size, age, race, or religion. We do not tolerate harassment of participants in any form. This code of conduct applies to all CWL Project spaces, including the Google Group, the Matrix chat room, the Google Hangouts chats, both online and off. Anyone who violates this code of conduct may be sanctioned or expelled from these spaces at the discretion of the leadership team.
1717

1818
For more details, see our [Code of Conduct](https://github.com/common-workflow-language/common-workflow-language/blob/main/CODE_OF_CONDUCT.md).

content/getting-started.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
{%- capture getting_started_content -%}
1010

11-
Below are some useful resources to getting started. Additionally, help is available through [community resources](/community) such as the [CWL Gitter channel](https://gitter.im/common-workflow-language/common-workflow-language).
11+
Below are some useful resources to getting started. Additionally, help is available through [community resources](/community) such as the [CWL Matrix channel](https://matrix.to/#/#common-workflow-language_common-workflow-language:gitter.im).
1212

1313
* Learn to write CWL using the [CWL user guide](/user_guide/) which provides a gentle introduction to creating CWL command line tool and workflow descriptions.
1414
* Browse [CWL Implementations](/implementations/) to find a software package that's right for you.

content/style.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,3 @@
2121
@import 'partials/social-bar';
2222
@import 'partials/user-gallery';
2323
@import 'partials/back-to-top';
24-
@import 'partials/gitter';

0 commit comments

Comments
 (0)