Merge branch 'gh-pages' into develop

This commit is contained in:
Ben Morrow 2017-05-16 16:26:17 -05:00
commit 1c36fb27a5
2 changed files with 42 additions and 21 deletions

File diff suppressed because one or more lines are too long

View File

@ -19,7 +19,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=5b947b7">
<link rel="stylesheet" href="css/main.css?v=18f5be2">
<meta property="og:title" content="Status, a Mobile Ethereum OS" />
@ -84,7 +84,7 @@
<div class="section section--prize">
<h2>Prizes</h2>
<div class="text">
<p>A total prizepool of US$25,000 will be paid out in ether (ETH).</p>
<p>If youd like to receive updates on the Contribution Period and the launch of the Status Network, please subscribe</p>
</div>
<div class="prizes">
<div class="prize-item">
@ -166,35 +166,26 @@
<div class="rule-item">
<div class="rule-icon-wrap"><div class="rule-icon rule-icon--phone"></div></div>
<h3 class="rule-title">Mobile ready your DApp</h3>
<div class="rule-text">Already have a decentralized application? Make it mobile-compatible, or build one from scratch.</div>
<div class="rule-text">Already have a DApp? Make it mobile-compatible, or build one from scratch.</div>
<a class="button button--secondary rule-button" target="_blank" href="http://slack.status.im/">Join our Slack</a>
</div>
<div class="rule-item">
<div class="rule-icon-wrap"><div class="rule-icon rule-icon--bubble"></div></div>
<h3 class="rule-title">Create a decentralized chatbot</h3>
<div class="rule-text">Create a chatbots that dont require centralized servers using the Status API.</div>
<a class="button button--secondary rule-button" target="_blank" href="http://slack.status.im/">Open docs</a>
</div>
<div class="rule-item">
<div class="rule-icon-wrap"><div class="rule-icon rule-icon--command"></div></div>
<h3 class="rule-title">Extend Status with new commands</h3>
<h3 class="rule-title">Extend Status with commands</h3>
<div class="rule-text">Help us improve Status by creating a new command, or add a command to your existing DApp.</div>
<a class="button button--secondary rule-button" target="_blank" href="http://slack.status.im/">Learn more</a>
</div>
</div>
</div>
<div class="section">
<h2>Schedule</h2>
<h3>Kickoff</h3>
<p>Saturday May 27th 7:45am PDT<br/>(10:45am New York, 3:45pm London, 5:45pm St. Petersburg, 11:45pm Seoul)<br/>Live with Hangouts on Air - Get up and running with the Status API, questions answered about programming, design, and the hackathon itself</p>
<h3>Pencils Down</h3>
<p>Sunday June 4th 7:45am PDT<br/>(10:45am New York, 3:45pm London, 5:45pm St. Petersburg, 11:45pm Seoul)<br/>Final due date to submit projects (as a pull request on GitHub)</p>
<h3>Judges Meeting</h3>
<p>Monday June 5th 7:45am PDT<br/>(10:45am New York, 3:45pm London, 5:45pm St. Petersburg, 11:45pm Seoul)<br/>Discuss projects</p>
<h3>Winners Announcement</h3>
<p>Tuesday June 6th 7:45am PDT<br/>(10:45am New York, 3:45pm London, 5:45pm St. Petersburg, 11:45pm Seoul)<br/>Blog post and live Hangout on Air - with recorded judges' comments</p>
</div>
<div class="section">
<h2>How to Enter</h2>
<div class="steps">
@ -202,7 +193,7 @@
<div class="step-number">1</div>
<div class="step-description">
<h3 class="step-title"><span class="step-title-number">1. </span>Join the Community</h3>
<div class="step-text">Come say Hi in #hackathon (were friendly people!). You can meet teammates and get your questions answered.</div>
<div class="step-text">Come say Hi in #hackathon (were friendly people!)</div>
</div>
<a class="button button--secondary step-button" target="_blank" href="http://slack.status.im/">Join our Slack</a>
</div>
@ -210,9 +201,9 @@
<div class="step-number">2</div>
<div class="step-description">
<h3 class="step-title"><span class="step-title-number">2. </span>Submit Entry via Github</h3>
<div class="step-text">Before the Kickoff, add your team's project as an issue on GitHub. Then, edit it along the way as you make progress. By the deadline, your project should include your open-source code. You also may add an up to two-minute video showing how your DApp, chatbot, or command works. You can also show slides or pictures in the video as further explanation, but these are no substitute for working code. Judges will make decisions based on technical achievement, not marketing ability.</div>
<div class="step-text">Instructions can be found on the Readme below.</div>
</div>
<a class="button button--secondary step-button" target="_blank" href="https://github.com/status-im/hackathon/issues/new">Submit GitHub Issue</a>
<a class="button button--secondary step-button" target="_blank" href="https://github.com/status-im/hackathon/issues/new">Submit Pull Request</a>
</div>
</div>
</div>
@ -226,7 +217,7 @@
</div>
<div class="faq-item">
<h3 class="faq-title">Who can apply?</h3>
<div class="faq-text">Anyone anywhere. The Hackathon is borderless and virtual. You can build your DApp under a palm tree on an island in the South Pacific.</div>
<div class="faq-text">Anyone anywhere. The Hackathon is borderless and virtual.</div>
</div>
<div class="faq-item">
<h3 class="faq-title">Do I need a team? </h3>
@ -251,6 +242,36 @@
</div>
</div>
<div class="section">
<h2>Schedule</h2>
<div class="schedule">
<div class="schedule-item schedule-item--regular">
<h3 class="schedule-title">Kickoff</h3>
<div class="schedule-time">Saturday May 27th 7:45am PDT</div>
<div class="schedule-time-verbose">10:45am New York, 3:45pm London, 5:45pm St. Petersburg, 11:45pm Seoul</div>
<div class="schedule-text">Live with Hangouts on Air - Get up and running with the Status API, questions answered about programming, design, and the hackathon itself</div>
</div>
<div class="schedule-item schedule-item--regular">
<h3 class="schedule-title">Pencils Down</h3>
<div class="schedule-time">Sunday June 4th 7:45am PDT</div>
<div class="schedule-time-verbose">10:45am New York, 3:45pm London, 5:45pm St. Petersburg, 11:45pm Seoul</div>
<div class="schedule-text">Live with Hangouts on Air - Get up and running with the Status API, questions answered about programming, design, and the hackathon itself</div>
</div>
<div class="schedule-item schedule-item--regular">
<h3 class="schedule-title">Judges Meeting</h3>
<div class="schedule-time">Monday June 5th 7:45am PDT</div>
<div class="schedule-time-verbose">10:45am New York, 3:45pm London, 5:45pm St. Petersburg, 11:45pm Seoul</div>
<div class="schedule-text">Discuss projects</div>
</div>
<div class="schedule-item schedule-item--main">
<h3 class="schedule-title">Winners Announcement</h3>
<div class="schedule-time">Tuesday June 6th 7:45am PDT</div>
<div class="schedule-time-verbose">10:45am New York, 3:45pm London, 5:45pm St. Petersburg, 11:45pm Seoul</div>
<div class="schedule-text">Blog post and live Hangout on Air - with recorded judges' comments</div>
</div>
</div>
</div>
<!--div class="section">
<h2>Judges</h2>
<div class="judges">