status-im/hackathon.status.im
2
0
Fork 0
mirror of synced 2025-02-22 17:08:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into gh-pages

Browse Source
This commit is contained in:
Ben Morrow 2017-06-05 13:08:42 -07:00
commit 74a6ef305c
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
css/main.css
View File

File diff suppressed because one or more lines are too long

12
css/new.css
View File

@ -2,4 +2,16 @@
.judge-jorge .judge-picture {
background-image: url(../img/judges/jorge-izquierdo.jpg);
}
.judge-ben .judge-title:after {
background-image: url(../img/new-site/apple-touch-icon-76.png);
background-size: 16px;
background-repeat: no-repeat;
background-position: center;
width: 16px;
height: 20px;
padding-left: 16px;
margin-left: 5px;
content: "";
}

8
index.html
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=56a0874">
<link rel="stylesheet" href="css/main.css?v=56a0875">
<link rel="stylesheet" href="css/new.css">
<meta property="og:title" content="Status $25,000 Global Hackathon" />
@ -218,7 +218,7 @@
<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">We're using GitHub for submissions. Before the <strong>Kickoff</strong>, add your team's project as an <em>issue</em>. Then, edit it as you make progress. By the <strong>Pencils Down</strong> deadline, your issue should include everything on the template and you should make a <em>pull request</em> with your code.</div>
<div class="step-text">We're using GitHub for submissions. <strong>Right now</strong>, add your team's project as an <em>issue</em>. Then, edit it as you make progress. By the <strong>Pencils Down</strong> deadline, your issue should include everything on the template and you should make a <em>pull request</em> with your code.</div>
</div>
<a class="button button--secondary step-button" target="_blank" href="https://github.com/status-im/hackathon/issues/new">Sign up with Issue</a>
</div>
@ -281,7 +281,7 @@
<h3 class="schedule-title">Kickoff</h3>
<div class="schedule-time">Saturday June 3rd 7:45am PDT</div>
<div class="schedule-time-verbose">10:45am New York, 3:45pm London, 5:45pm St. Petersburg, 10:45pm Shanghai</div>
<div class="schedule-text"><a href="https://www.youtube.com/watch?v=FEgoJeaA_i8">Hangout on Air</a>: API intro tutorial, answer questions about the hackathon. Begin coding your project.</div>
<div class="schedule-text"><a href="https://www.youtube.com/watch?v=bH1PHgJMn6k">Hangout on Air</a>: API intro tutorial, answer questions about the hackathon. Begin coding your project.</div>
</div>
<div class="schedule-item schedule-item--regular">
<h3 class="schedule-title">Pencils Down</h3>
@ -341,7 +341,7 @@
<div class="judge-picture"><!--img src="img/judges/ben-morrow.jpg" /--></div>
<h3 class="judge-title">Ben Morrow</h3>
</div>
<div class="judge-text">Community Organizer at Status</div>
<div class="judge-text">Hackathon Organizer at Status</div>
</div>
</div>
</div>