status-im
/
hackathon.status.im
mirror of
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into gh-pages

This commit is contained in:
Ben Morrow 2017-06-02 07:32:26 -07:00
parent b043d4fc23 8ce13bfe58
commit d7c0c65c16
11 changed files with 55 additions and 77 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

26
css/new.css
View File

@ -1,27 +1,5 @@
/* Added all new CSS to main.css, but please keep adding your own CSS here. Thanks in Advance! */
.supported-by {
text-align: center;
padding: 52px 0 0 0;
}
.supported-by img {
height: 65px; /* smaller than real size to provide for retina devices */
filter: grayscale(100%);
}
.supported-by img:hover {
filter: none;
}
@media (min-width: 568px) {
.supported-by a:not(:first-child) {
margin-left: 48px;
}
}
@media (max-width: 568px) {
.supported-by a {
display: block;
}
.judge-jorge .judge-picture {
background-image: url(../img/judges/jorge-izquierdo.jpg);
}

BIN
img/icons/icon_external-link.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 109 KiB

BIN
img/judges/alex-van-de-sande.jpeg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB

BIN
img/judges/ben-morrow.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 84 KiB

BIN
img/judges/bo-shen.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 20 KiB

BIN
img/judges/carolyn-reckhow.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 22 KiB

BIN
img/judges/iuri-matias.jpeg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB

BIN
img/judges/jorge-izquierdo.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 26 KiB

BIN
img/judges/xin-xu.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 40 KiB

104
index.html
View File

@ -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">Hangout on Air: 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=FEgoJeaA_i8">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>
@ -293,7 +293,55 @@
<h3 class="schedule-title">Winners Announcement</h3>
<div class="schedule-time">Tuesday June 13th 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">Winners will be announced in a blog post and live Hangout on Air, with recorded judges' comments.</div>
<div class="schedule-text">Winners will be announced in a blog post and <a href="https://www.youtube.com/watch?v=ZgyfLjXTHdo">live Hangout on Air</a>, with recorded judges' comments.</div>
</div>
</div>
</div>
<div class="section section--judges">
<h2>Judges</h2>
<div class="judges">
<div class="judge-item judge-iuri">
<div class="judge-top">
<div class="judge-picture"><!--img src="img/judges/iuri-matias.jpeg" /--></div>
<h3 class="judge-title">Iuri Matias</h3>
</div>
<div class="judge-text">Developer of Embark,<br />a framework for Ethereum DApps</div>
</div>
<div class="judge-item judge-carolyn">
<div class="judge-top">
<div class="judge-picture"><!--img src="img/judges/carolyn-reckhow.jpg" /--></div>
<h3 class="judge-title">Carolyn Reckhow</h3>
</div>
<div class="judge-text">Director of Operations, Consensys</div>
</div>
<div class="judge-item judge-alex">
<div class="judge-top">
<div class="judge-picture"><!--img src="img/judges/alex-van-de-sande.jpeg" /--></div>
<h3 class="judge-title">Alex Van De Sande</h3>
</div>
<div class="judge-text">UX designer, Ethereum Foundation<br />&amp; Lead, Mist</div>
</div>
<div class="judge-item judge-xin">
<div class="judge-top">
<div class="judge-picture"><!--img src="img/judges/xin-xu.jpg" /--></div>
<h3 class="judge-title">Xin Xu</h3>
</div>
<div class="judge-text">Founder, EthFans</div>
</div>
<div class="judge-item judge-jorge">
<div class="judge-top">
<div class="judge-picture"><!--img src="img/judges/jorge-izquierdo.jpg" /--></div>
<h3 class="judge-title">Jorge Izquierdo</h3>
</div>
<div class="judge-text">Founder, Aragon</div>
</div>
<div class="judge-item judge-ben">
<div class="judge-top">
<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, Status</div>
</div>
</div>
</div>
@ -301,59 +349,11 @@
<div class="section">
<h2>Supported By</h2>
<div class="supported-by">
<a href="https://blockgeeks.com" target="_blank"><img src="img/sponsors/blockgeeks.png" /></a>
<a href="https://www.b9lab.com/" target="_blank"><img src="img/sponsors/b9lab.png" /></a>
<a class="supported-by-item supported-by-item--blockgeeks" href="https://blockgeeks.com" target="_blank"></a>
<a class="supported-by-item supported-by-item--b9lab" href="https://www.b9lab.com/" target="_blank"></a>
</div>
</div>
<!--div class="section">
<h2>Judges</h2>
<div class="judges">
<div class="judge-item">
<div class="judge-top">
<div class="judge-picture"></div>
<h3 class="judge-title">Jarrad</h3>
</div>
<div class="judge-text">Co-Whatever you like, so long as it uses Ethereum, and works inside of Status.</div>
</div>
<div class="judge-item">
<div class="judge-top">
<div class="judge-picture"></div>
<h3 class="judge-title">Carl</h3>
</div>
<div class="judge-text">No, you can enter alone, or team up with another developer via our Slack.</div>
</div>
<div class="judge-item">
<div class="judge-top">
<div class="judge-picture"></div>
<h3 class="judge-title">Roman</h3>
</div>
<div class="judge-text">Anyone anywhere. The Hackathon is borderless and virtual.</div>
</div>
<div class="judge-item">
<div class="judge-top">
<div class="judge-picture"></div>
<h3 class="judge-title">Roman</h3>
</div>
<div class="judge-text">Anyone anywhere. The Hackathon is borderless and virtual.</div>
</div>
<div class="judge-item">
<div class="judge-top">
<div class="judge-picture"></div>
<h3 class="judge-title">Roman</h3>
</div>
<div class="judge-text">Anyone anywhere. The Hackathon is borderless and virtual.</div>
</div>
<div class="judge-item">
<div class="judge-top">
<div class="judge-picture"></div>
<h3 class="judge-title">Roman</h3>
</div>
<div class="judge-text">Anyone anywhere. The Hackathon is borderless and virtual.</div>
</div>
</div>
</div-->
</div>
</div>
</div>