From 7daf9dc6ff91c1ae23c62047311c4f88c3553386 Mon Sep 17 00:00:00 2001
From: rehrar <rehrar@tuta.io>
Date: Mon, 25 Sep 2017 11:10:47 -0600
Subject: [PATCH] - Removed some IRC channels from Hangouts page (not every
temporary one needs to be added) - Readded Blog RSS Feed to the footer -
Added Mattermost and Taiga to the Hangouts page - Added Press Kit page - CSS
Tweaks
---
_data/irc.yml | 6 +-----
_includes/footer.html | 3 ++-
community/hangouts/index.md | 13 +++++++++----
css/custom.css | 4 ++--
get-started/contributing/index.md | 2 +-
press-kit/index.md | 2 +-
6 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/_data/irc.yml b/_data/irc.yml
index 7a9bea00..58e84602 100644
--- a/_data/irc.yml
+++ b/_data/irc.yml
@@ -4,8 +4,6 @@
description: This channel is for the Monero community to congretate and discuss ideas.
- channel: monero-dev
description: The many contributors and developers come here to discuss dev-y things.
-- channel: monero-ffs
- description: Regarding the Monero forum funding system.
- channel: monero-markets
description: We use this channel to talk about the price of Monero and other coins.
- channel: monero-offtopic
@@ -17,6 +15,4 @@
- channel: monero-research-lab
description: Research into financial privacy with cryptocurrency.
- channel: monero-translations
- description: Localizing Monero into other languages
-- channel: monero-website
- description: For the development of the Monero website
\ No newline at end of file
+ description: Localizing Monero into other languages
\ No newline at end of file
diff --git a/_includes/footer.html b/_includes/footer.html
index eb6aed1f..d15590f6 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -8,6 +8,7 @@
<li><a href="/resources/moneropedia/" class="white">Moneropedia</a></li>
<li><a href="/resources/developer-guides/" class="white">Developer Guides</a></li>
<li><a href="/resources/user-guides/" class="white">User Guides</a></li>
+ <li><a href="https://getmonero.org/feed.xml" class="white">RSS Feed</a></li>
</ul>
</div>
<div class="col-sm-3 col-xs-6">
@@ -37,7 +38,7 @@
<li><a href="https://openalias.org" class="white">Open Alias</a></li>
<li><a href="https://getkovri.org" class="white">Kovri</a></li>
<li><a href="/resources/research-lab/" class="white">Monero Research Lab</a></li>
- <li><a href="#" class="white">Monero Press Kit</a></li>
+ <li><a href="/press-kit/" class="white">Monero Press Kit</a></li>
</ul>
</div>
</div>
diff --git a/community/hangouts/index.md b/community/hangouts/index.md
index 383b22fd..7b85fa52 100644
--- a/community/hangouts/index.md
+++ b/community/hangouts/index.md
@@ -32,17 +32,22 @@ The Monero community is diverse and varied. We come from all over, but we defini
<div class="info-block">
<div class="row center-xs">
<div class="col">
- <h2>Slack</h2>
+ <h2>Workgroup Resources</h2>
</div>
</div>
<div class="row center-xs">
- <p>Not everyone likes to get on the IRC, and for those people we have Slack with relays to IRC channels.
- It has also got a few channels of its own.</p>
+ <p>In an effort to support organic workgroups, Monero has several resources that the community can use to meet and plan projects. Mattermost even has relays into the most popular Monero-related IRC channels.</p>
</div>
<div class="row relays around-xs">
- <div class="col-md-8 col-sm-8 col-xs-8">
+ <div class="col-md-4 col-sm-4 col-xs-4">
<p><a href="https://monero.slack.com/" class="btn-link btn-fixed">Slack</a></p>
</div>
+ <div class="col-md-4 col-sm-4 col-xs-4">
+ <p><a href="https://mattermost.getmonero.org/" class="btn-link btn-fixed">Mattermost</a></p>
+ </div>
+ <div class="col-md-4 col-sm-4 col-xs-4">
+ <p><a href="https://taiga.getmonero.org/" class="btn-link btn-fixed">Taiga</a></p>
+ </div>
</div>
</div>
<div class="info-block">
diff --git a/css/custom.css b/css/custom.css
index 33c40f07..3c39b1be 100644
--- a/css/custom.css
+++ b/css/custom.css
@@ -3243,12 +3243,12 @@ footer {
.hangouts .social-icon.github {
background-image: url(../img/monero-spritesheet.png);
- background-position: -128px -144px;
+ background-position: -127px -144px;
}
.hangouts .social-icon.github:hover {
background-image: url(../img/monero-spritesheet.png);
- background-position: -176px -144px;
+ background-position: -175px -144px;
}
.hangouts .irc .col-md-4 {
diff --git a/get-started/contributing/index.md b/get-started/contributing/index.md
index 04ddab35..15879519 100644
--- a/get-started/contributing/index.md
+++ b/get-started/contributing/index.md
@@ -80,7 +80,7 @@ Mining ensures the Monero network remains decentralized and secure. In the Moner
<div class="row start-xs">
<div class="col-xs-12">
<h3>Other</h3>
- <p>E-mail <a href="mailto:dev@getmonero.org">dev@getmonero.org</a> for alternative means of donating.</p>
+ <p>E-mail <a href="mailto:dev@getmonero.org">dev@getmonero.org</a> for alternative means of donating or if you would like to become a sponsor for the Monero Project.</p>
</div>
</div>
</div>
diff --git a/press-kit/index.md b/press-kit/index.md
index ee69f523..5e3c5ccf 100644
--- a/press-kit/index.md
+++ b/press-kit/index.md
@@ -1,6 +1,6 @@
---
layout: default
-title: "Press Kit"
+title: "Monero Press Kit"
---
<div class="site-wrap">
--
GitLab