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

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

parents 942cd4da f581eef6
...@@ -15,6 +15,22 @@ span.title { ...@@ -15,6 +15,22 @@ span.title {
margin-top: 0; 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 */ /* Left part */
#feature h2 { #feature h2 {
...@@ -88,13 +104,13 @@ span.title { ...@@ -88,13 +104,13 @@ span.title {
} }
.tax-deducible { .tax-deducible {
font-size: 12px; font-size: 11px;
margin-top: 9px; margin-top: 9px;
} }
.amounts .btn { .amounts .btn {
padding-top: 33px; padding-top: 19px;
height: 95px; height: 65px;
border: solid 3px white !important; border: solid 3px white !important;
} }
...@@ -133,26 +149,27 @@ span.title { ...@@ -133,26 +149,27 @@ span.title {
/* Other ways */ /* Other ways */
#other-ways, #meet-partner { #other-ways-1, #other-ways-2, #other-ways-3, #meet-partner {
margin-top: 2em; margin-top: 2em;
background: #f5f5f5; background: #f5f5f5;
margin-left: -3.4em;
margin-right: -2em;
box-sizing: border-box; box-sizing: border-box;
padding-bottom: 1.5em; padding-bottom: 1.5em;
padding-left: 2.3em;
} }
#check, #bitcoin-cash, #cash { #other-ways-1 {
margin-top: 3em; margin-right: -15px;
margin-left: -50px;
padding-left: 50px;
padding-top: 1px;
} }
#ethereum, #ethereum-classic, #litecoin { #other-ways-2, #other-ways-3 {
margin-top: 1em; margin-top: 0;
padding-top: 20px;
} }
#other-ways h5 { #ethereum, #ethereum-classic, #litecoin {
margin-top: 1.5em; margin-top: 1em;
} }
/* Indent bank account details for wire transfers */ /* Indent bank account details for wire transfers */
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<div class="col-md-5"> <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"> <form method="post" action="https://www.paypal.com/cgi-bin/webscr">
...@@ -124,10 +124,9 @@ ...@@ -124,10 +124,9 @@
<input type="radio" autocomplete="off" value="200"/>$200 <input type="radio" autocomplete="off" value="200"/>$200
</label> </label>
<label class="btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 other"> <label class="btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 other">
<span>Other</span>
<div class="input-group"> <div class="input-group">
<span class="input-group-addon">$</span> <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> </div>
</label> </label>
</div> </div>
...@@ -155,9 +154,8 @@ ...@@ -155,9 +154,8 @@
<input type="radio" autocomplete="off" value="200"/>200€ <input type="radio" autocomplete="off" value="200"/>200€
</label> </label>
<label class="btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 other"> <label class="btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 other">
<span>Other</span>
<div class="input-group"> <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> <span class="input-group-addon"></span>
</div> </div>
</label> </label>
...@@ -185,7 +183,7 @@ permitted by law.</strong></p> ...@@ -185,7 +183,7 @@ permitted by law.</strong></p>
</div> </div>
<div id="paypal-without-js" class="row"> <div id="paypal-without-js">
<div id="dollars-without-js"> <div id="dollars-without-js">
...@@ -262,7 +260,7 @@ permitted by law.</strong></p> ...@@ -262,7 +260,7 @@ permitted by law.</strong></p>
</form> </form>
</div> </div> <!-- #dollars-without-js -->
<!-- <!--
<p><br/></p> <p><br/></p>
--> -->
...@@ -340,66 +338,37 @@ permitted by law.</strong></p> ...@@ -340,66 +338,37 @@ permitted by law.</strong></p>
</div> </div>
--> -->
</div> </div> <!-- #paypal-without-js -->
</div> <div id="other-ways-1">
</div> <!-- .row --> <h3>Other ways to donate</h3>
<div id="other-ways" class="row"> <div id="bitcoin">
<h3 class="col-md-12">Other ways to donate</h3> <h4>Bitcoin</h4>
<!--
<div class="col-md-5"> The bitcoin addresses below ('bitcoin-address' class) are displayed
<div id="bitcoin"> randomly according to their weight ('data-weight' attribute):
<h4>Bitcoin</h4> - Addresses with 'data-weight="0"' are never displayed.
<!-- - There is no maximum weight.
The bitcoin addresses below ('bitcoin-address' class) are displayed -->
randomly according to their weight ('data-weight' attribute): <div id="tails-bitcoind" class="bitcoin-address" data-weight="9">
- Addresses with 'data-weight="0"' are never displayed. <p><a href="bitcoin:1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2">[[!img bitcoin-1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2.png link="no"]]</a></p>
- There is no maximum weight. <p><strong>1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2</strong></p>
--> </div>
<div id="tails-bitcoind" class="bitcoin-address" data-weight="9"> <div id="riseuplab-coinbase" class="bitcoin-address" data-weight="0">
<p><a href="bitcoin:1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2">[[!img bitcoin-1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2.png link="no"]]</a></p> <p><a href="bitcoin:3QirvVRntoascPfTgNTUQvKxfKwPah5FNK">[[!img bitcoin-3QirvVRntoascPfTgNTUQvKxfKwPah5FNK.png link="no"]]</a></p>
<p><strong>1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2</strong></p> <p><strong>3QirvVRntoascPfTgNTUQvKxfKwPah5FNK</strong></p>
</div> </div>
<div id="riseuplab-coinbase" class="bitcoin-address" data-weight="0"> </div>
<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?"]]
[[!toggleable id="other-cryptos" text=""" </div> <!-- other-ways-1 -->
<p>Supporting a new cryptocurrency implies more work for us </div> <!-- col-md-5 -->
(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 </div> <!-- .row -->
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 id="other-ways-2" class="row">
<div class="col-md-7"> <div class="col-md-7">
<h4>Bank transfer</h4> <h4>Bank transfer</h4>
...@@ -438,13 +407,57 @@ permitted by law.</strong></p> ...@@ -438,13 +407,57 @@ permitted by law.</strong></p>
organization in Germany.<br/> organization in Germany.<br/>
<a href="https://techcultivation.org/donate.html">Donations are tax-deductible to the full extent permitted by law.</a></p> <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> <h4 id="check">US check</h4>
<p>You can send us US checks by post:</p> <p>You can send us US checks by post:</p>
<p>Riseup Labs<br/> <p>Riseup Labs<br/>
PO Box 4282<br/> PO Box 4282<br/>
Seattle, WA 98194 Seattle, WA 98194
</p> </p>
</div>
<div class="col-md-5">
<h4 id="cash">Cash</h4> <h4 id="cash">Cash</h4>
<p>You can send us cash by post:</p> <p>You can send us cash by post:</p>
<p>Weber<br/> <p>Weber<br/>
...@@ -453,7 +466,8 @@ permitted by law.</strong></p> ...@@ -453,7 +466,8 @@ permitted by law.</strong></p>
Germany Germany
</p> </p>
</div> </div>
</div>
</div> <!-- .row -->
<div id="expenses" class="row"> <div id="expenses" class="row">
...@@ -493,12 +507,14 @@ permitted by law.</strong></p> ...@@ -493,12 +507,14 @@ permitted by law.</strong></p>
</div> </div>
</div> </div> <!-- .row -->
<div id="meet-partner" class="row"> <div id="meet-partner" class="row">
<div class="col-md-12"> <div class="col-md-12">
<h3>Our partners</h3> <h3>Our partners</h3>
<p>Tails also receives grants, awards, corporate donations, and substantial donations from individuals.</p> <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> <p>Meet our [[partners|partners]] or [[become a partner|partners/become]]!</p>
</div> </div>
</div> </div>
Supports Markdown
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