Merge branch 'master' into dev

This commit is contained in:
0xboobface 2018-11-19 19:33:31 +01:00
commit 6ef67b9385
7 changed files with 35 additions and 39 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.6 KiB

BIN
docs/img/patreon-logo.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
docs/img/patreon-round.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.6 KiB

BIN
docs/img/paypal-round.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.6 KiB

BIN
docs/img/pp196.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.1 KiB

View File

@ -42,7 +42,7 @@
<!-- Navigation -->
<nav class="navbar navbar-expand-lg bg-secondary fixed-top text-uppercase" id="mainNav">
<div class="container">
<a class="navbar-brand js-scroll-trigger" href="#page-top"><img src="https://raw.githubusercontent.com/0xboobface/ctbrec/master/src/main/resources/icon64.png" alt="Logo"/>CTB Recorder</a>
<a class="navbar-brand js-scroll-trigger" href="#page-top"><img src="https://raw.githubusercontent.com/0xboobface/ctbrec/master/client/src/main/resources/icon64.png" alt="Logo"/>CTB Recorder</a>
<button class="navbar-toggler navbar-toggler-right text-uppercase bg-primary text-white rounded" type="button" data-toggle="collapse" data-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
Menu
<i class="fa fa-bars"></i>
@ -118,19 +118,19 @@
</script>
<div class="row text-center">
<div class="col">
<a class="btn btn-xl btn-outline-dark" href="#donate" onclick="downloadFile('https://github.com/0xboobface/ctbrec/releases/download/1.9.0/ctbrec-1.9.0-win64-jre.zip');">
<a class="btn btn-xl btn-outline-dark" href="#donate" onclick="downloadFile('https://github.com/0xboobface/ctbrec/releases/download/1.10.0/ctbrec-1.10.0-win64-jre.zip');">
<i class="fa fa-windows mr-2"></i>
Download for Windows!
</a>
</div>
<div class="col">
<a class="btn btn-xl btn-outline-dark" href="#donate" onclick="downloadFile('https://github.com/0xboobface/ctbrec/releases/download/1.9.0/ctbrec-1.9.0-macos-jre.zip');">
<a class="btn btn-xl btn-outline-dark" href="#donate" onclick="downloadFile('https://github.com/0xboobface/ctbrec/releases/download/1.10.0/ctbrec-1.10.0-macos-jre.zip');">
<i class="fa fa-apple mr-2"></i>
Download for macOS!
</a>
</div>
<div class="col">
<a class="btn btn-xl btn-outline-dark" href="#donate" onclick="downloadFile('https://github.com/0xboobface/ctbrec/releases/download/1.9.0/ctbrec-1.9.0-linux-jre.zip');">
<a class="btn btn-xl btn-outline-dark" href="#donate" onclick="downloadFile('https://github.com/0xboobface/ctbrec/releases/download/1.10.0/ctbrec-1.10.0-linux-jre.zip');">
<i class="fa fa-linux mr-2"></i>
Download for Linux!
</a>
@ -152,9 +152,38 @@
</p>
</div>
</div>
<div class="row text-center">
<div class="col">
<p class="lead">
<a href="https://www.buymeacoffee.com/0xboobface" target="_blank">
<img src="img/buymeacoffee-round.png" alt="Buy a coffee" style="height: 160px; margin: 20px"/>
</a><br/>
<input type="button" value="Buy a coffee"
onclick="window.open('https://www.buymeacoffee.com/0xboobface','_blank')">
</p>
</div>
<div class="col">
<p class="lead">
<a href="https://www.paypal.me/0xb00bface" target="_blank">
<img src="img/paypal-round.png" alt="PayPal" style="height: 160px; margin: 20px"/>
</a><br/>
<input type="button" value="PayPal"
onclick="window.open('https://www.paypal.me/0xb00bface','_blank')">
</p>
</div>
<div class="col">
<p class="lead">
<a href="https://www.patreon.com/0xb00bface" target="_blank">
<img src="img/patreon-round.png" alt="Patreon" style="height: 160px; margin: 20px"/>
</a><br/>
<input type="button" value="Patreon"
onclick="window.open('https://www.patreon.com/0xb00bface','_blank')">
</p>
</div>
</div>
<br/><br/>
<div class="row text-center">
<div class="col-md-2"></div>
<div class="col-md-4">
<div class="col">
<p class="lead">
<a href="https://chaturbate.com/in/?track=default&amp;tour=LQps&amp;campaign=55vTi&amp;room=0xb00bface" target="_blank" title="If you buy tokens by using this button, Chaturbate will award me 20% of the tokens' value for sending you over. You get the full tokens and it doesn't cost you any more!">
<img src="img/token.png" alt="Buy Chaturbate tokens"/>
@ -164,39 +193,6 @@
title="If you buy tokens by using this button, Chaturbate will award me 20% of the tokens' value for sending you over. You get the full tokens and it doesn't cost you any more!">
</p>
</div>
<div class="col-md-4">
<p class="lead">
<a href="https://www.buymeacoffee.com/0xboobface" target="_blank">
<img src="img/buymeacoffee/buymeacoffee.png" alt="Buy a coffee" style="height: 160px; margin: 20px"/>
</a><br/>
<input type="button" value="Buy a coffee"
onclick="window.open('https://www.buymeacoffee.com/0xboobface','_blank')">
</p>
</div>
</div>
<br/><br/>
<div class="row text-center">
<div class="col">
<p class="lead">
Bitcoin<br/>
<img src="https://raw.githubusercontent.com/0xboobface/ctbrec/master/src/main/resources/html/bitcoin-address.png" alt="bitcoin:15sLWZon8diPqAX4UdPQU1DcaPuvZs2GgA" style="width:200px"/><br/><br/>
<input type="text" value="15sLWZon8diPqAX4UdPQU1DcaPuvZs2GgA" onClick="this.select(); document.execCommand('copy');"/>
</p>
</div>
<div class="col">
<p class="lead">
Ethereum<br/>
<img src="https://raw.githubusercontent.com/0xboobface/ctbrec/master/src/main/resources/html/ethereum-address.png" alt="ethereum:0x996041638eEAE7E31f39Ef6e82068d69bA7C090e" style="width:200px"/><br/><br/>
<input type="text" value="0x996041638eEAE7E31f39Ef6e82068d69bA7C090e" onClick="this.select(); document.execCommand('copy');"/>
</p>
</div>
<div class="col">
<p class="lead">
Monero<br/>
<img src="https://raw.githubusercontent.com/0xboobface/ctbrec/master/src/main/resources/html/monero-address.png" alt="monero:448ZQZpzvT4iRNAVBr7CMQBfEbN3H8uAF2BWabtqVRckgTY3GQJkUgydjotEPaGvpzJboUpe39J8rPBkWZaUbrQa31FoSMj" style="width:200px"/><br/><br/>
<input type="text" value="448ZQZpzvT4iRNAVBr7CMQBfEbN3H8uAF2BWabtqVRckgTY3GQJkUgydjotEPaGvpzJboUpe39J8rPBkWZaUbrQa31FoSMj" onClick="this.select(); document.execCommand('copy');"/>
</p>
</div>
</div>
</div>
</section>