Merge remote-tracking branch 'status-im/gh-pages' into gh-pages

This commit is contained in:
Ben Morrow 2017-06-19 16:40:28 -05:00
commit eaa7260de5
6 changed files with 39 additions and 55 deletions

View File

@ -20,7 +20,7 @@
<link rel="mask-icon" href="img/new-site/logo-mask.svg" color="4360DF">
<!-- favicon.ico in the root directory -->
<link rel="stylesheet" href="css/main.css?v=1b4d2f6">
<link rel="stylesheet" href="css/main.css?v=ca03fb8">
<meta property="og:title" content="Status Contribution Period" />
</head>
@ -54,10 +54,6 @@
<div class="checkbox-inner"><input type="checkbox" name="citizen" class="popup__checkbox" id="citizenship-checkbox" value="none" /><label for="citizenship-checkbox"></label></div>
<div class="pseudo-label">I hereby confirm that I am not a US citizen or resident, nor am I signing on behalf of a US citizen or resident.</div>
</div>
<div class="checkbox-wrap">
<div class="checkbox-inner"><input type="checkbox" name="workshop" class="popup__checkbox" id="workshop-checkbox" value="none" /><label for="workshop-checkbox"></label></div>
<div class="pseudo-label">I hereby acknowledge that the Contributions will be used to fulfil the workshop mission.</div>
</div>
<div class="checkbox-wrap">
<div class="checkbox-inner"><input type="checkbox" name="tokens" class="popup__checkbox" id="tokens-checkbox" value="none" /><label for="tokens-checkbox"></label></div>
<div class="pseudo-label">I hereby acknowledge that the Contributor does not receive equity in Status Research & Development GmbH.</div>
@ -84,7 +80,7 @@
<div class="popup__text">
Send ETH to the smart contract address below using Mist, Metamask, imToken, Parity or MyEtherWallet. By sending ETH to the address below, you agree to the <a href="https://contribute.status.im/status-terms.pdf" target="_blank" >Contribution Terms</a>.
<div class="text-note">
<h5>IMPORTANT</h5> DO NOT send ETH from exchanges like Coinbase, Poloniex, Kraken, or use Jaxx. In addition DO NOT make use of any Multi-Signature wallet as we will not support them and your transaction will not go through. By doing so your ETH may be permanently lost, and the SNT may not be created.
<h5>IMPORTANT</h5> DO NOT send ETH from exchanges like Coinbase, Poloniex, Kraken, or use Jaxx. By doing so your ETH may be permanently lost, and the SNT may not be created.
<h5>REMEMBER</h5> Your tokens, transactions, wallets and passwords are your responsibility. Protect your keys and passwords, they are unrecoverable. If you lose them someone else may get access to your tokens
</div>
</div>
@ -93,14 +89,14 @@
<div class="address__row">
<div class="address__column">
<div class="address__label">Contract address</div>
<div class="address__value">ADDRESS WILL BE DISPLAYED HERE</div>
<div class="address__value">0x55d34b686aa8C04921397c5807DB9ECEdba00a4c</div>
</div>
</div>
<div class="address__row">
<div class="address__column address__column--third">
<div class="address__label">Start Block</div>
<div class="address__value">000000</div>
<div class="address__value">#3903900</div>
</div>
<div class="address__column address__column--third">
<div class="address__label">Recommended Gas Limit</div>
@ -140,9 +136,9 @@
<div class="header-section header-section--right">
<div class="nav">
<a class="nav__item" target="_blank" href="https://twitter.com/ethstatus">Twitter</a>
<a class="nav__item" target="_blank" href="http://slack.status.im/">Slack</a>
<a class="nav__item" target="_blank" href="https://github.com/status-im">Github</a>
<a class="nav__item" target="_blank" href="https://www.reddit.com/r/statusim/">Reddit</a>
<a class="nav__item" target="_blank" href="https://github.com/status-im">Github</a>
<a class="nav__item" target="_blank" href="https://www.facebook.com/ethstatus/?pnref=lhc">Facebook</a>
</div>
</div>
</div>
@ -159,7 +155,6 @@
<div class="widget-wrap">
<div class="widget">
<div class="widget-row widget-row--status">
<div class="widget-row--status__inner">
Open and accepting contributions (demo)
@ -175,7 +170,7 @@
</div>
<div class="widget-row widget-row--block">
<div class="widget-key">Start Block</div>
<div class="widget-value">000000</div>
<div class="widget-value">#3903900</div>
</div>
</div>
</div>
@ -201,7 +196,7 @@
<p>The exact start date is determined by a block number. We will announce the exact block number and contribution contract address here once its deployed to the Ethereum network - 12 hours before the start of the Contribution Period.</p>
<p>To contribute, you must press the 'Contribute' above at approximately 2pm GMT on June 20th in order to agree to the Explanatory Note & Governance Terms, before you can send ETH (ether) to the Smart Contract address shown. The contribution can be made using Metamask, MyEtherWallet, Mist, Parity or imToken. Tutorials can be found below.</p>
<h5>Important</h5>
<p class="paragraph--warning">DO NOT send ETH from exchanges like Coinbase, Poloniex, Kraken, or use Jaxx. In addition DO NOT make use of any Multi-Signature wallet as we will not support them and your transaction will not go through. By doing so your ETH may be permanently lost, and the SNT may not be created.</p>
<p class="paragraph--warning">DO NOT send ETH from exchanges like Coinbase, Poloniex, Kraken, or use Jaxx. By doing so your ETH may be permanently lost, and the SNT may not be created.</p>
</div>
<div class="data">
@ -302,7 +297,7 @@
<span class="app-button__platform">Android</span>
<span class="app-button__icon"></span>
</a>
<a class="app-button app-button--ios" href="http://slack.status.im/">
<a class="app-button app-button--ios" href="https://www.reddit.com/r/statusim/">
<span class="app-button__title">Request TestFlight</span>
<span class="app-button__platform">IOS</span>
<span class="app-button__icon"></span>
@ -388,7 +383,6 @@
<ul class="footer-list">
<li class="footer-link footer-link--fb"><a href="https://www.facebook.com/ethstatus" target="_blank"><span class="footer-icon"></span><span class="footer-link-label">Facebook</span></a></li>
<li class="footer-link footer-link--tw"><a href="https://twitter.com/ethstatus" target="_blank"><span class="footer-icon"></span><span class="footer-link-label">Twitter</span></a></li>
<li class="footer-link footer-link--sl"><a href="http://slack.status.im/" target="_blank"><span class="footer-icon"></span><span class="footer-link-label">Slack</span></a></li>
<li class="footer-link footer-link--gh"><a href="https://github.com/status-im" target="_blank"><span class="footer-icon"></span><span class="footer-link-label">Github</span></a></li>
<li class="footer-link footer-link--rd"><a href="https://www.reddit.com/r/statusim/" target="_blank"><span class="footer-icon"></span><span class="footer-link-label">Reddit</span></a></li>
<li class="footer-link footer-link--yt"><a href="https://www.youtube.com/channel/UCFzdJTUdzqyX4e9dOW7UpPQ/" target="_blank"><span class="footer-icon"></span><span class="footer-link-label">YouTube</span></a></li>
@ -417,7 +411,7 @@
</div>
<script src="js/polyfill.min.js?v=0c1f4da"></script>
<script src="js/app.js?v=65f1f11"></script>
<script src="js/app.js?v=a419168"></script>
<script src="js/mc-validate.js?v=207d097"></script>
<!-- Google Analytics -->

File diff suppressed because one or more lines are too long

View File

@ -20,7 +20,7 @@
<link rel="mask-icon" href="img/new-site/logo-mask.svg" color="4360DF">
<!-- favicon.ico in the root directory -->
<link rel="stylesheet" href="css/main.css?v=1b4d2f6">
<link rel="stylesheet" href="css/main.css?v=ca03fb8">
<meta property="og:title" content="Status, a Mobile Ethereum OS" />
</head>
@ -137,7 +137,7 @@
<a class="nav__item" target="_blank" href="https://twitter.com/ethstatus">Twitter</a>
<a class="nav__item" target="_blank" href="https://www.reddit.com/r/statusim/">Reddit</a>
<a class="nav__item" target="_blank" href="https://github.com/status-im">Github</a>
<a class="nav__item" target="_blank" href="https://www.reddit.com/r/statusim/">Reddit</a>
<a class="nav__item" target="_blank" href="https://www.facebook.com/ethstatus/?pnref=lhc">Facebook</a>
</div>
</div>
</div>
@ -381,7 +381,6 @@
<ul class="footer-list">
<li class="footer-link footer-link--fb"><a href="https://www.facebook.com/ethstatus" target="_blank"><span class="footer-icon"></span><span class="footer-link-label">Facebook</span></a></li>
<li class="footer-link footer-link--tw"><a href="https://twitter.com/ethstatus" target="_blank"><span class="footer-icon"></span><span class="footer-link-label">Twitter</span></a></li>
<!--<li class="footer-link footer-link&#45;&#45;sl"><a href="http://slack.status.im/" target="_blank"><span class="footer-icon"></span><span class="footer-link-label">Slack</span></a></li>-->
<li class="footer-link footer-link--gh"><a href="https://github.com/status-im" target="_blank"><span class="footer-icon"></span><span class="footer-link-label">Github</span></a></li>
<li class="footer-link footer-link--rd"><a href="https://www.reddit.com/r/statusim/" target="_blank"><span class="footer-icon"></span><span class="footer-link-label">Reddit</span></a></li>
<li class="footer-link footer-link--yt"><a href="https://www.youtube.com/channel/UCFzdJTUdzqyX4e9dOW7UpPQ/" target="_blank"><span class="footer-icon"></span><span class="footer-link-label">YouTube</span></a></li>
@ -410,7 +409,7 @@
</div>
<script src="js/polyfill.min.js?v=0c1f4da"></script>
<script src="js/app.js?v=65f1f11"></script>
<script src="js/app.js?v=a419168"></script>
<script src="js/mc-validate.js?v=207d097"></script>
<!-- Google Analytics -->

File diff suppressed because one or more lines are too long

View File

@ -20,7 +20,7 @@
<link rel="mask-icon" href="img/new-site/logo-mask.svg" color="4360DF">
<!-- favicon.ico in the root directory -->
<link rel="stylesheet" href="css/main.css?v=1b4d2f6">
<link rel="stylesheet" href="css/main.css?v=ca03fb8">
<meta property="og:title" content="Status, a Mobile Ethereum OS" />
</head>
@ -54,10 +54,6 @@
<div class="checkbox-inner"><input type="checkbox" name="citizen" class="popup__checkbox" id="citizenship-checkbox" value="none" /><label for="citizenship-checkbox"></label></div>
<div class="pseudo-label">I hereby confirm that I am not a US citizen or resident, nor am I signing on behalf of a US citizen or resident.</div>
</div>
<div class="checkbox-wrap">
<div class="checkbox-inner"><input type="checkbox" name="workshop" class="popup__checkbox" id="workshop-checkbox" value="none" /><label for="workshop-checkbox"></label></div>
<div class="pseudo-label">I hereby acknowledge that the Contributions will be used to fulfil the workshop mission.</div>
</div>
<div class="checkbox-wrap">
<div class="checkbox-inner"><input type="checkbox" name="tokens" class="popup__checkbox" id="tokens-checkbox" value="none" /><label for="tokens-checkbox"></label></div>
<div class="pseudo-label">I hereby acknowledge that the Contributor does not receive equity in Status Research & Development GmbH.</div>
@ -79,12 +75,12 @@
<div class="popup popup--address">
<a class="popup__button popup__button--close"></a>
<div class="popup__steps">Step 2 of 2</div>
<h4 class="popup__title">Send Your Contribution Using ETH on/after Block #000000</h4>
<h4 class="popup__title">Send Your Contribution Using ETH on/after Block #3903900</h4>
<div class="popup__text">
Send ETH to the smart contract address below using Mist, Metamask, imToken, Parity or MyEtherWallet. By sending ETH to the address below, you agree to the <a href="https://contribute.status.im/status-terms.pdf" target="_blank" >Contribution Terms</a>.
<div class="text-note">
<h5>IMPORTANT</h5> DO NOT send ETH from exchanges like Coinbase, Poloniex, Kraken, or use Jaxx. In addition DO NOT make use of any Multi-Signature wallet as we will not support them and your transaction will not go through. By doing so your ETH may be permanently lost, and the SNT may not be created.
<h5>IMPORTANT</h5> DO NOT send ETH from exchanges like Coinbase, Poloniex, Kraken, or use Jaxx. By doing so your ETH may be permanently lost, and the SNT may not be created.
<h5>REMEMBER</h5> Your tokens, transactions, wallets and passwords are your responsibility. Protect your keys and passwords, they are unrecoverable. If you lose them someone else may get access to your tokens
</div>
</div>
@ -93,14 +89,14 @@
<div class="address__row">
<div class="address__column">
<div class="address__label">Contract address</div>
<div class="address__value">ADDRESS WILL BE DISPLAYED HERE</div>
<div class="address__value">0x55d34b686aa8C04921397c5807DB9ECEdba00a4c</div>
</div>
</div>
<div class="address__row">
<div class="address__column address__column--third">
<div class="address__label">Start Block</div>
<div class="address__value">000000</div>
<div class="address__value">#3903900</div>
</div>
<div class="address__column address__column--third">
<div class="address__label">Recommended Gas Limit</div>
@ -140,9 +136,9 @@
<div class="header-section header-section--right">
<div class="nav">
<a class="nav__item" target="_blank" href="https://twitter.com/ethstatus">Twitter</a>
<a class="nav__item" target="_blank" href="http://slack.status.im/">Slack</a>
<a class="nav__item" target="_blank" href="https://github.com/status-im">Github</a>
<a class="nav__item" target="_blank" href="https://www.reddit.com/r/statusim/">Reddit</a>
<a class="nav__item" target="_blank" href="https://github.com/status-im">Github</a>
<a class="nav__item" target="_blank" href="https://www.facebook.com/ethstatus/?pnref=lhc">Facebook</a>
</div>
</div>
</div>
@ -160,25 +156,22 @@
<div class="widget-wrap">
<div class="widget">
<div class="widget-timer">
<div class="widget-timer__date">Begins June 20th at 2pm GMT</div>
<div class="widget-timer__countdown" id="countdown">
<span class="countdown-item"><span class="countdown-value countdown-value--days">50</span><span class="countdown-label countdown-label--days">days</span></span>
<span class="countdown-item"><span class="countdown-value countdown-value--hours">0</span><span class="countdown-label countdown-label--hours">hours</span></span>
<span class="countdown-item"><span class="countdown-value countdown-value--minutes">50</span><span class="countdown-label countdown-label--minutes">minutes</span></span>
<span class="countdown-item"><span class="countdown-value countdown-value--seconds">50</span><span class="countdown-label countdown-label--seconds">seconds</span></span>
<div class="widget-timer__date widget-timer__date--center">Contribution Period starts in</div>
<div class="widget-timer__countdown widget-timer__countdown--block" id="blockCountdown">
<span class="countdown-item countdown-item--block"><span class="countdown-value countdown-value--blocks">0000</span><span class="countdown-label countdown-label--days">Blocks</span></span>
</div>
</div>
<div class="widget-row widget-row--status">
<div class="widget-key">Current status</div>
<div class="widget-value">Opening Soon</div>
<div class="widget-row widget-row--date">
<div class="widget-key">Starts Approximately</div>
<div class="widget-value">June 20th at 2pm GMT</div>
</div>
<div class="widget-row widget-row--rate">
<div class="widget-key">SNT Creation rate</div>
<div class="widget-key">SNT Creation Rate</div>
<div class="widget-value">10,000 SNT per 1 ETH</div>
</div>
<div class="widget-row widget-row--block">
<div class="widget-key">Start Block</div>
<div class="widget-value">#000000</div>
<div class="widget-value">#3903900</div>
</div>
</div>
</div>
@ -205,7 +198,7 @@
<p>The exact start date is determined by a block number. We will announce the exact block number and contribution contract address here once its deployed to the Ethereum network - 12 hours before the start of the Contribution Period.</p>
<p>To contribute, you must press the 'Contribute' above at approximately 2pm GMT on June 20th in order to agree to the Explanatory Note & Governance Terms, before you can send ETH (ether) to the Smart Contract address shown. The contribution can be made using Metamask, MyEtherWallet, Mist, Parity or imToken. Tutorials can be found below.</p>
<h5>Important</h5>
<p class="paragraph--warning">DO NOT send ETH from exchanges like Coinbase, Poloniex, Kraken, or use Jaxx. In addition DO NOT make use of any Multi-Signature wallet as we will not support them and your transaction will not go through. By doing so your ETH may be permanently lost, and the SNT may not be created.</p>
<p class="paragraph--warning">DO NOT send ETH from exchanges like Coinbase, Poloniex, Kraken, or use Jaxx. By doing so your ETH may be permanently lost, and the SNT may not be created.</p>
</div>
<div class="data">
@ -306,7 +299,7 @@
<span class="app-button__platform">Android</span>
<span class="app-button__icon"></span>
</a>
<a class="app-button app-button--ios" href="http://slack.status.im/">
<a class="app-button app-button--ios" href="https://www.reddit.com/r/statusim/">
<span class="app-button__title">Request TestFlight</span>
<span class="app-button__platform">IOS</span>
<span class="app-button__icon"></span>
@ -392,7 +385,6 @@
<ul class="footer-list">
<li class="footer-link footer-link--fb"><a href="https://www.facebook.com/ethstatus" target="_blank"><span class="footer-icon"></span><span class="footer-link-label">Facebook</span></a></li>
<li class="footer-link footer-link--tw"><a href="https://twitter.com/ethstatus" target="_blank"><span class="footer-icon"></span><span class="footer-link-label">Twitter</span></a></li>
<li class="footer-link footer-link--sl"><a href="http://slack.status.im/" target="_blank"><span class="footer-icon"></span><span class="footer-link-label">Slack</span></a></li>
<li class="footer-link footer-link--gh"><a href="https://github.com/status-im" target="_blank"><span class="footer-icon"></span><span class="footer-link-label">Github</span></a></li>
<li class="footer-link footer-link--rd"><a href="https://www.reddit.com/r/statusim/" target="_blank"><span class="footer-icon"></span><span class="footer-link-label">Reddit</span></a></li>
<li class="footer-link footer-link--yt"><a href="https://www.youtube.com/channel/UCFzdJTUdzqyX4e9dOW7UpPQ/" target="_blank"><span class="footer-icon"></span><span class="footer-link-label">YouTube</span></a></li>
@ -421,7 +413,7 @@
</div>
<script src="js/polyfill.min.js?v=0c1f4da"></script>
<script src="js/app.js?v=65f1f11"></script>
<script src="js/app.js?v=a419168"></script>
<script src="js/mc-validate.js?v=207d097"></script>
<!-- Google Analytics -->

View File

@ -21,7 +21,7 @@
<link rel="mask-icon" href="img/new-site/logo-mask.svg" color="4360DF">
<!-- favicon.ico in the root directory -->
<link rel="stylesheet" href="css/main.css?v=1b4d2f6">
<link rel="stylesheet" href="css/main.css?v=ca03fb8">
<meta property="og:title" content="Status, a Mobile Ethereum OS"/>
</head>
@ -133,7 +133,7 @@
<a class="nav__item" target="_blank" href="https://twitter.com/ethstatus">Twitter</a>
<a class="nav__item" target="_blank" href="https://www.reddit.com/r/statusim/">Reddit</a>
<a class="nav__item" target="_blank" href="https://github.com/status-im">Github</a>
<a class="nav__item" target="_blank" href="https://www.reddit.com/r/statusim/">Reddit</a>
<a class="nav__item" target="_blank" href="https://www.facebook.com/ethstatus/?pnref=lhc">Facebook</a>
</div>
</div>
</div>
@ -325,7 +325,6 @@
class="footer-icon"></span><span class="footer-link-label">Facebook</span></a></li>
<li class="footer-link footer-link--tw"><a href="https://twitter.com/ethstatus" target="_blank"><span
class="footer-icon"></span><span class="footer-link-label">Twitter</span></a></li>
<!--<li class="footer-link footer-link&#45;&#45;sl"><a href="http://slack.status.im/" target="_blank"><span class="footer-icon"></span><span class="footer-link-label">Slack</span></a></li>-->
<li class="footer-link footer-link--gh"><a href="https://github.com/status-im" target="_blank"><span
class="footer-icon"></span><span class="footer-link-label">Github</span></a></li>
<li class="footer-link footer-link--rd"><a href="https://www.reddit.com/r/statusim/" target="_blank"><span
@ -358,7 +357,7 @@
</div>
<script src="js/polyfill.min.js?v=0c1f4da"></script>
<script src="js/app.js?v=65f1f11"></script>
<script src="js/app.js?v=a419168"></script>
<script src="js/mc-validate.js?v=207d097"></script>
<script type="application/javascript">
if (!Date.now) {