Merge branch 'master' into feature/whitepaper

This commit is contained in:
Daniel 2019-07-11 14:58:07 +02:00 committed by GitHub
commit 348cf9e683
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 8 deletions

View file

@ -81,6 +81,6 @@ communities:
donations: donations:
bitcoin: bitcoin:
url: / url: https://www.blockchain.com/btc/address/1AosdDyzd8PVUFTUEXoaJHTyPVHuKQxdmq?filter=2
paypal: paypal:
url: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=2QHNM78H9YC9L&source=url url: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=2QHNM78H9YC9L&source=url

View file

@ -1,7 +1,8 @@
communities: communities:
- text: > - text: >
### Safing Community ### Safing Community - CURRENTLY DOWN
Will return asap.
Let's talk - Join our community. Get to know us and our products! Let's talk - Join our community. Get to know us and our products!
# #
image: image:
@ -9,6 +10,7 @@ communities:
alt: safing community alt: safing community
url: 'https://discourse.safing.community/' url: 'https://discourse.safing.community/'
disabled: true
- text: > - text: >
### Github ### Github

View file

@ -38,7 +38,7 @@ exclude_community_snippet: true
<div class="community-hub"> <div class="community-hub">
{% for pitch in site.data.community_hub.communities %} {% for pitch in site.data.community_hub.communities %}
<a class="ui button"{% unless pitch.pending %} href="{{ pitch.url }}"{% unless pitch.internal %} target="_blank"{% endunless %}{% endunless %}> <a class="ui button{% if pitch.disabled %} disabled{% endif %}"{% unless pitch.pending %}{% unless pitch.disabled %} href="{{ pitch.url }}"{% endunless %}{% unless pitch.internal %} target="_blank"{% endunless %}{% endunless %}>
{% comment %}0 = even (right text), 1 = odd (left text){% endcomment %} {% comment %}0 = even (right text), 1 = odd (left text){% endcomment %}
{% assign modulo = forloop.index | modulo: 2 %} {% assign modulo = forloop.index | modulo: 2 %}
{% include pitch.html %} {% include pitch.html %}

View file

@ -21,26 +21,24 @@ container_class: 'text'
<div class="middle aligned row"> <div class="middle aligned row">
<div class="column"> <div class="column">
<div class="ui second header"> <div class="ui second header">
<a href="{{ site.donations.paypal.url }}" class="ui safing-primary button"> <a href="{{ site.donations.paypal.url }}" class="ui safing-primary button" target="blank">
<i class="paypal icon"></i> <i class="paypal icon"></i>
Donate via Paypal Donate via Paypal
</a> </a>
</div> </div>
</div> </div>
</div> </div>
<!-- deactivate until bitcoin address is ready
<div class="ui horizontal divider">OR</div> <div class="ui horizontal divider">OR</div>
<div class="middle aligned row"> <div class="middle aligned row">
<div class="column"> <div class="column">
<div class="ui second header"> <div class="ui second header">
<a href="{{ site.donations.bitcoin.url }}" class="ui safing-primary button"> <a href="{{ site.donations.bitcoin.url }}" class="ui safing-primary button" target="blank">
<i class="bitcoin icon"></i> <i class="bitcoin icon"></i>
Donate via Bitcoin Donate via Bitcoin
</a> </a>
</div> </div>
</div> </div>
</div> </div>
-->
</div> </div>
</div> </div>
<div class="ui center aligned basic segment"> <div class="ui center aligned basic segment">

View file

@ -164,7 +164,7 @@ This section shall inform about what influence the company is exposed to. This i
<div class="extra content"> <div class="extra content">
<i class="green money icon"></i>invested over <b>200.000€</b> in value <i class="green money icon"></i>invested over <b>200.000€</b> in value
<div class="margin-top-10"></div> <div class="margin-top-10"></div>
<i class="blue clock icon"></i>You can support us by <a href="/support/" style="color: #0078ff;"><b>donating.</b></a> <i class="blue clock icon"></i>You can support us by <a href="/donate/" style="color: #0078ff;"><b>donating.</b></a>
</div> </div>
</div> </div>