Skip to content

Commit

Permalink
Removed Slack from community page, contributors (#780)
Browse files Browse the repository at this point in the history
  • Loading branch information
peterzen authored Feb 7, 2020
1 parent b16b8b7 commit d515628
Show file tree
Hide file tree
Showing 11 changed files with 27 additions and 281 deletions.
47 changes: 19 additions & 28 deletions src/assets/css/decred-v5.css
Original file line number Diff line number Diff line change
Expand Up @@ -906,7 +906,7 @@ body {
background-color: #2970ff;
}

.footer.slack-join {
.footer.matrix-join {
position: relative;
padding-top: 30px;
-webkit-box-flex: 0;
Expand Down Expand Up @@ -978,10 +978,6 @@ body {
background-image: url('../images/iconYoutube.svg');
}

.slack {
background-image: url('../images/iconSlack.svg');
}

.discord {
background-image: url('../images/iconDiscord.svg');
}
Expand Down Expand Up @@ -1115,7 +1111,7 @@ body {
height: 100%;
}

.main.slack-join {
.main.matrix-join {
position: static;
display: -webkit-box;
display: -webkit-flex;
Expand Down Expand Up @@ -1866,11 +1862,6 @@ body {
mask-image: url('../images/iconDiscord.svg');
}

.nav-social-link.nav-slack {
-webkit-mask-image: url('../images/iconSlack.svg');
mask-image: url('../images/iconSlack.svg');
}

.nav-social-link.nav-twitter {
-webkit-mask-image: url('../images/iconTwitter.svg');
mask-image: url('../images/iconTwitter.svg');
Expand Down Expand Up @@ -2516,7 +2507,7 @@ html[dir="rtl"] .lang-menu {
z-index: 1;
}

._960.slack-join {
._960.matrix-join {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
Expand Down Expand Up @@ -3337,7 +3328,7 @@ html[dir="rtl"] .lang-menu {
opacity: 0.8;
}

.subpage-logo.slack-join {
.subpage-logo.matrix-join {
background-image: url('../images/logoWithBlueType.svg');
background-size: contain;
}
Expand Down Expand Up @@ -4149,7 +4140,7 @@ html[dir="rtl"] .lang-menu {
background-repeat: no-repeat;
}

.wrapper.slack-join {
.wrapper.matrix-join {
position: relative;
display: -webkit-box;
display: -webkit-flex;
Expand Down Expand Up @@ -4184,7 +4175,7 @@ html[dir="rtl"] .lang-menu {
padding-bottom: 20px;
}

.left-wrapper .slack-join-notice p {
.left-wrapper .matrix-join-notice p {
font-size: 1.2em;
}

Expand All @@ -4194,7 +4185,7 @@ html[dir="rtl"] .lang-menu {
padding: 91px 20px 20px 100px;
}

.slack-join-notice {
.matrix-join-notice {
max-width: 200px;
margin-top: 90px;
margin-right: 20px;
Expand All @@ -4204,7 +4195,7 @@ html[dir="rtl"] .lang-menu {
line-height: 18px;
}

.slack-join-notice-highlight {
.matrix-join-notice-highlight {
font-weight: 600;
}

Expand All @@ -4220,7 +4211,7 @@ html[dir="rtl"] .lang-menu {
width: 400px;
}

.slack-join-copy {
.matrix-join-copy {
width: 396px;
margin-top: 48px;
float: left;
Expand All @@ -4229,12 +4220,12 @@ html[dir="rtl"] .lang-menu {
font-weight: 400;
}

.slack-join-copy-heading {
.matrix-join-copy-heading {
font-size: 34px;
line-height: 42px;
}

.slack-join-copy-highlight {
.matrix-join-copy-highlight {
font-weight: 600;
}

Expand Down Expand Up @@ -4955,7 +4946,7 @@ html[dir="rtl"] .lang-menu {
margin-left: 0px;
padding-right: 0px;
}
._960.slack-join {
._960.matrix-join {
-webkit-box-pack: end;
-webkit-justify-content: flex-end;
-ms-flex-pack: end;
Expand Down Expand Up @@ -5158,7 +5149,7 @@ html[dir="rtl"] .lang-menu {
width: 100%;
padding-left: 20px;
}
.slack-join-copy {
.matrix-join-copy {
width: 100%;
}
.footer-logo {
Expand Down Expand Up @@ -5569,7 +5560,7 @@ html[dir="rtl"] .lang-menu {
-ms-flex-align: start;
align-items: flex-start;
}
._960.slack-join {
._960.matrix-join {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
Expand Down Expand Up @@ -5807,7 +5798,7 @@ html[dir="rtl"] .lang-menu {
.right-wrapper {
padding-bottom: 70px;
}
.slack-join-notice {
.matrix-join-notice {
margin-bottom: 30px;
}
.footer-logo {
Expand Down Expand Up @@ -5943,7 +5934,7 @@ html[dir="rtl"] .lang-menu {
.footer {
padding: 30px 10px;
}
.footer.slack-join {
.footer.matrix-join {
height: auto;
-webkit-box-flex: 0;
-webkit-flex: 0 0 auto;
Expand Down Expand Up @@ -6007,7 +5998,7 @@ html[dir="rtl"] .lang-menu {
-ms-flex-align: stretch;
align-items: stretch;
}
._960.slack-join {
._960.matrix-join {
display: block;
-webkit-box-pack: center;
-webkit-justify-content: center;
Expand Down Expand Up @@ -6222,12 +6213,12 @@ html[dir="rtl"] .lang-menu {
}

@media (min-width: 1440px) {
.slack-join-notice {
.matrix-join-notice {
max-width: 317px;
margin-left: -181px;
}

.left-wrapper .slack-join-notice p {
.left-wrapper .matrix-join-notice p {
font-size: 1.3em;
line-height: 136%;
}
Expand Down
Binary file not shown.
25 changes: 0 additions & 25 deletions src/assets/js/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,6 @@ $(document).ready(function () {
teamFilterButton = $('.team-filter-button'),
teamMembers = $('.team-members'),
teamMember = $('.team-member'),
teamSlack = teamMember.find($('.slack')),
teamTwitter = teamMember.find($('.twitter')),
teamDataBalloon = $(".team-data-balloon"),
dataBalloonTop = $(".data-balloon-top"),
Expand Down Expand Up @@ -205,30 +204,6 @@ $(document).ready(function () {
teamFilterButton.eq(0).trigger('click');
}

teamCorporateLogo.add(teamSlack).on('mouseenter', function() {

// get text
var dataBaloonGetText = '';
if($(this).is(teamCorporateLogo)) {
dataBalloonTop.show()
dataBaloonGetText = $(this).parent().attr('data-corporate-id');
}
if($(this).is(teamSlack)) {
dataBalloonTop.hide();
dataBaloonGetText = $(this).parent().parent().attr('data-slack');
}
dataBalloonBottom.text(dataBaloonGetText);

// balloon follow
$(this).mousemove( function(e) {
teamDataBalloon.css({'left': e.pageX-(teamDataBalloon.width()/2), 'top': e.pageY+20});
});

teamDataBalloon.addClass('active');
}).on('mouseleave', function() {
teamDataBalloon.removeClass('active');
});

teamCorporateLogo.add(teamTwitter).on('mouseenter', function() {

// get text
Expand Down
8 changes: 0 additions & 8 deletions src/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ params:
id: discord
label: Discord
url: https://discordapp.com/invite/GJ2GXfz
-
id: slack
label: Slack
url: https://slack.decred.org
-
id: github
label: GitHub
Expand Down Expand Up @@ -79,10 +75,6 @@ languages:
id: discord
label: Discord
url: https://discordapp.com/invite/GJ2GXfz
-
id: slack
label: Slack
url: https://slack.decred.org
-
id: github
label: GitHub
Expand Down
2 changes: 1 addition & 1 deletion src/content/recruiting/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ While what Decred needs as an organization may not line up with precisely what p

#### Wallet support

* support users of various wallets in Slack #support channel
* support users of various wallets in [Matrix](https://www.decred.org/matrix/) support channel

#### Payment processor and exchange integration

Expand Down
4 changes: 0 additions & 4 deletions src/data/community/channels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
url: "https://discord.gg/GJ2GXfz"
img_src: "dcr-community-platforms-discord.png"
name: Discord
-
url: "https://join.slack.com/t/decred/shared_invite/enQtNTE4MDM1NzAzODEzLWFiYzgwN2YzYTQyNWQxOTg2NjEwNGU5YTI4YmZiNTI5Mzk2Y2E1N2QxNWEwOWVmYmYzZWY3MWNjNTJlYTgyZDQ"
img_src: "dcr-community-platforms-slack.png"
name: Slack
-
url: "https://t.me/decred"
img_src: "dcr-community-platforms-telegram.png"
Expand Down
9 changes: 1 addition & 8 deletions src/data/contributors/people.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,11 @@
title: developer
github_id: dajohi
-
slack_alias: klka
company_id: block_42
group: development
avatar_image: "team_67.svg"
name: "Dmitry Fedorov"
title: Developer
slack_id: UALCYK2C9
-
matrix_id: dnldd:matrix.org
group: development
Expand Down Expand Up @@ -187,7 +185,6 @@
avatar_image: "team_10.svg"
name: "Peter Banik"
title: developer
slack_id: U4T3MAY2X
github_id: peterzen
-
company_id: raedah_group
Expand Down Expand Up @@ -355,13 +352,11 @@
name: "Insaf Nori"
title: "Community Manager (Middle East)"
-
slack_alias: Jesiki
company_id: raedah_group
group: community
avatar_image: "team_60.svg"
name: "Jessica Eggleston"
title: "Conference Coordinator"
slack_id: UAG6W3GFP
github_id: jesiki
-
matrix_id: joshuam:decred.org
Expand Down Expand Up @@ -396,13 +391,11 @@
title: "Designer"
twitter_alias: morphymore
-
slack_alias: nkpla
twitter_alias: "nkplasma"
group: community
avatar_image: "team_30.svg"
name: "Namkyun Kim"
title: "Community Manager (KR)"
slack_id: U6U173R9R
-
matrix_id: nickb:decred.org
twitter_alias: "nbdeagle"
Expand Down Expand Up @@ -519,4 +512,4 @@
name: "Amir Massarwa"
title: "Developer"
twitter_alias: "amirma209"
github_id: "amassarwi"
github_id: "amassarwi"
10 changes: 5 additions & 5 deletions src/layouts/matrix/list.html
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@

{{ define "main" }}
<div class="main slack-join">
<div class="wrapper slack-join">
<div class="main matrix-join">
<div class="wrapper matrix-join">
<div class="left">
<div class="left-wrapper">
<div class="slack-join-notice">
<div class="matrix-join-notice">
<p>{{ T "matrix_to_register_using_the_riot" }}</p>
<p><a href="https://chat.decred.org/#/register">{{ T "matrix_register_with_riot" }}</a></p>
<p class="slack-join-notice-highlight">{{ T "matrix_note_you_must_register_with" }}</p>
<p class="matrix-join-notice-highlight">{{ T "matrix_note_you_must_register_with" }}</p>
<p>{{ T "matrix_if_you_already_have_an" }}</p>
<p><a href="https://chat.decred.org/#/login">{{ T "matrix_login_to_decred_homeserver" | safeHTML }}</a></p>
<p>{{ T "matrix_to_browse_decred_rooms_click" }}</p>
Expand All @@ -19,7 +19,7 @@
<div class="right no-bgimage">
<div class="right-bg"></div>
<div class="right-wrapper w-clearfix">
<div class="slack-join-copy">
<div class="matrix-join-copy">
{{ T "matrix_matrix_is_a_secure_open" | safeHTML }}
</div>
</div>
Expand Down
8 changes: 1 addition & 7 deletions src/layouts/partials/contributor-grid.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
{{ $imgPath := path.Join "images/contributors" .avatar_image }}
{{ $image := resources.Get ($imgPath) }}

<div data-id="{{ .name }}" data-slack="{{ .slack_alias }}" data-twitter="{{ .twitter_alias }}" data-corporate-id="{{ $company_name }}" data-filter="{{ .group }}" class="team-member w-clearfix">
<div data-id="{{ .name }}" data-twitter="{{ .twitter_alias }}" data-corporate-id="{{ $company_name }}" data-filter="{{ .group }}" class="team-member w-clearfix">
<div class="team-member-avatar"><img alt="" src="{{ $image.RelPermalink }}" class="image"></div>
<div class="team-member-name">{{ .name }}</div>
<div class="team-member-title">{{ .title }}</div>
Expand All @@ -28,12 +28,6 @@
{{ end }}

<div class="team-member-social">
{{ if ne .slack_alias nil }}
<a target="_blank" rel="noopener noreferrer" href="https://decred.slack.com/team/{{ .slack_alias }}" class="slack team-member-social-link w-inline-block">
<img alt="" src="/images/team_slack.svg" class="team-member-social-link-image">
</a>
{{ end }}

{{ if ne .matrix_id nil }}
<a target="_blank" rel="noopener noreferrer" href="https://matrix.to/#/@{{ .matrix_id }}" class="matrix team-member-social-link w-inline-block">
<img alt="" src="/images/team_matrix.svg" class="team-member-social-link-image">
Expand Down
Loading

0 comments on commit d515628

Please sign in to comment.