Skip to content

GitLab

Commit b4be6334 authored by Ulrike Uhlig's avatar Ulrike Uhlig
Browse files

Merge branch 'web/16170-other-ways-above-fold'

parents 942cd4da f581eef6
Hide whitespace changes
Inline Side-by-side
Showing with 111 additions and 78 deletions
wiki/src/donate.css
View file @ b4be6334
......@@ -15,6 +15,22 @@ span.title {
margin-top: 0;
}
/* Remove white margin on page */
#pagebody {
margin-left: -2em;
}
#content {
padding: 0;
}
.row {
margin-left: 0;
margin-right: -2em;
padding-left: 35px;
}
/* Left part */
#feature h2 {
......@@ -88,13 +104,13 @@ span.title {
}
.tax-deducible {
font-size: 12px;
font-size: 11px;
margin-top: 9px;
}
.amounts .btn {
padding-top: 33px;
height: 95px;
padding-top: 19px;
height: 65px;
border: solid 3px white !important;
}
......@@ -133,26 +149,27 @@ span.title {
/* Other ways */
#other-ways, #meet-partner {
#other-ways-1, #other-ways-2, #other-ways-3, #meet-partner {
margin-top: 2em;
background: #f5f5f5;
margin-left: -3.4em;
margin-right: -2em;
box-sizing: border-box;
padding-bottom: 1.5em;
padding-left: 2.3em;
}
#check, #bitcoin-cash, #cash {
margin-top: 3em;
#other-ways-1 {
margin-right: -15px;
margin-left: -50px;
padding-left: 50px;
padding-top: 1px;
}
#ethereum, #ethereum-classic, #litecoin {
margin-top: 1em;
#other-ways-2, #other-ways-3 {
margin-top: 0;
padding-top: 20px;
}
#other-ways h5 {
margin-top: 1.5em;
#ethereum, #ethereum-classic, #litecoin {
margin-top: 1em;
}
/* Indent bank account details for wire transfers */
......
wiki/src/donate.html
View file @ b4be6334
......@@ -48,7 +48,7 @@
<div class="col-md-5">
<div id="paypal-with-js" class="row">
<div id="paypal-with-js">
<form method="post" action="https://www.paypal.com/cgi-bin/webscr">
......@@ -124,10 +124,9 @@
<input type="radio" autocomplete="off" value="200"/>$200
</label>
<label class="btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 other">
<span>Other</span>
<div class="input-group">
<span class="input-group-addon">$</span>
<input type="text" pattern="\d+" class="form-control" id="other-dollar"/>
<input type="text" pattern="\d+" class="form-control" id="other-dollar" placeholder="Other"/>
</div>
</label>
</div>
......@@ -155,9 +154,8 @@
<input type="radio" autocomplete="off" value="200"/>200€
</label>
<label class="btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 other">
<span>Other</span>
<div class="input-group">
<input type="text" pattern="\d+" class="form-control text-right" id="other-euro"/>
<input type="text" pattern="\d+" class="form-control text-right" id="other-euro" placeholder="Other"/>
<span class="input-group-addon">€</span>
</div>
</label>
......@@ -185,7 +183,7 @@ permitted by law.</strong></p>
</div>
<div id="paypal-without-js" class="row">
<div id="paypal-without-js">
<div id="dollars-without-js">
......@@ -262,7 +260,7 @@ permitted by law.</strong></p>
</form>
</div>
</div> <!-- #dollars-without-js -->
<!--
<p><br/></p>
-->
......@@ -340,66 +338,37 @@ permitted by law.</strong></p>
</div>
-->
</div>
</div>
</div> <!-- .row -->
<div id="other-ways" class="row">
<h3 class="col-md-12">Other ways to donate</h3>
<div class="col-md-5">
<div id="bitcoin">
<h4>Bitcoin</h4>
<!--
The bitcoin addresses below ('bitcoin-address' class) are displayed
randomly according to their weight ('data-weight' attribute):
- Addresses with 'data-weight="0"' are never displayed.
- There is no maximum weight.
-->
<div id="tails-bitcoind" class="bitcoin-address" data-weight="9">
<p><a href="bitcoin:1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2">[[!img bitcoin-1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2.png link="no"]]</a></p>
<p><strong>1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2</strong></p>
</div>
<div id="riseuplab-coinbase" class="bitcoin-address" data-weight="0">
<p><a href="bitcoin:3QirvVRntoascPfTgNTUQvKxfKwPah5FNK">[[!img bitcoin-3QirvVRntoascPfTgNTUQvKxfKwPah5FNK.png link="no"]]</a></p>
<p><strong>3QirvVRntoascPfTgNTUQvKxfKwPah5FNK</strong></p>
</div>
</div>
<h4 id="bitcoin-cash">Bitcoin Cash</h4>
<p><strong>qrzav77wkhd942nyqvya34mya3fqxzx90ypjge0njh</strong></p>
<h4 id="ethereum">Ethereum</h4>
<p><strong>0xD6A73051933ab97C38cEFf2abB2f9E06F3a3ed78</strong></p>
<h4 id="ethereum-classic">Ethereum Classic</h4>
<p><strong>0x86359F8b44188c105E198DdA3c0421AC60729195</strong></p>
<h4 id="litecoin">Litecoin</h4>
<p><strong>MJ1fqVucBt8YpfPiQTuwBtmLJtzhizx6pz</strong></p>
<a id="other-cryptos"></a>
[[!toggle id="other-cryptos" text="What about other cryptocurrencies?"]]
</div> <!-- #paypal-without-js -->
<div id="other-ways-1">
<h3>Other ways to donate</h3>
<div id="bitcoin">
<h4>Bitcoin</h4>
<!--
The bitcoin addresses below ('bitcoin-address' class) are displayed
randomly according to their weight ('data-weight' attribute):
- Addresses with 'data-weight="0"' are never displayed.
- There is no maximum weight.
-->
<div id="tails-bitcoind" class="bitcoin-address" data-weight="9">
<p><a href="bitcoin:1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2">[[!img bitcoin-1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2.png link="no"]]</a></p>
<p><strong>1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2</strong></p>
</div>
<div id="riseuplab-coinbase" class="bitcoin-address" data-weight="0">
<p><a href="bitcoin:3QirvVRntoascPfTgNTUQvKxfKwPah5FNK">[[!img bitcoin-3QirvVRntoascPfTgNTUQvKxfKwPah5FNK.png link="no"]]</a></p>
<p><strong>3QirvVRntoascPfTgNTUQvKxfKwPah5FNK</strong></p>
</div>
</div>
[[!toggleable id="other-cryptos" text="""
</div> <!-- other-ways-1 -->
<p>Supporting a new cryptocurrency implies more work for us
(learning how it works, installing the software in a secure place,
monitoring its value and trading it, etc.). To make a good use of
our time, we focus on the ones that are the easiest for us to
accept and the most popular.</p>
</div> <!-- col-md-5 -->
<p>Until now, cryptocurrencies other than Bitcoin represent less
than 5% of our donations in cryptocurrencies. We want to see
cryptcurrencies other than Bitcoin gain popularity before spending
time on them.</p>
"""]]
</div> <!-- .row -->
</div>
<div id="other-ways-2" class="row">
<div class="col-md-7">
<h4>Bank transfer</h4>
......@@ -438,13 +407,57 @@ permitted by law.</strong></p>
organization in Germany.<br/>
<a href="https://techcultivation.org/donate.html">Donations are tax-deductible to the full extent permitted by law.</a></p>
</div>
<div class="col-md-5">
<h4 id="bitcoin-cash">Bitcoin Cash</h4>
<p><strong>qrzav77wkhd942nyqvya34mya3fqxzx90ypjge0njh</strong></p>
<h4 id="ethereum">Ethereum</h4>
<p><strong>0xD6A73051933ab97C38cEFf2abB2f9E06F3a3ed78</strong></p>
<h4 id="ethereum-classic">Ethereum Classic</h4>
<p><strong>0x86359F8b44188c105E198DdA3c0421AC60729195</strong></p>
<h4 id="litecoin">Litecoin</h4>
<p><strong>MJ1fqVucBt8YpfPiQTuwBtmLJtzhizx6pz</strong></p>
<a id="other-cryptos"></a>
[[!toggle id="other-cryptos" text="What about other cryptocurrencies?"]]
[[!toggleable id="other-cryptos" text="""
<p>Supporting a new cryptocurrency implies more work for us
(learning how it works, installing the software in a secure place,
monitoring its value and trading it, etc.). To make a good use of
our time, we focus on the ones that are the easiest for us to
accept and the most popular.</p>
<p>Until now, cryptocurrencies other than Bitcoin represent less
than 5% of our donations in cryptocurrencies. We want to see
cryptcurrencies other than Bitcoin gain popularity before spending
time on them.</p>
"""]]
</div>
</div> <!-- .row -->
<div id="other-ways-3" class="row">
<div class="col-md-7">
<h4 id="check">US check</h4>
<p>You can send us US checks by post:</p>
<p>Riseup Labs<br/>
PO Box 4282<br/>
Seattle, WA 98194
</p>
</div>
<div class="col-md-5">
<h4 id="cash">Cash</h4>
<p>You can send us cash by post:</p>
<p>Weber<br/>
......@@ -453,7 +466,8 @@ permitted by law.</strong></p>
Germany
</p>
</div>
</div>
</div> <!-- .row -->
<div id="expenses" class="row">
......@@ -493,12 +507,14 @@ permitted by law.</strong></p>
</div>
</div>
</div> <!-- .row -->
<div id="meet-partner" class="row">
<div class="col-md-12">
<h3>Our partners</h3>
<p>Tails also receives grants, awards, corporate donations, and substantial donations from individuals.</p>
<p>Meet our [[partners|partners]] or [[become a partner|partners/become]]!</p>
</div>
</div>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment