Skip to content

Commit

Permalink
Merge pull request #10 from EmpireJS/feature/schedule
Browse files Browse the repository at this point in the history 
Feature/schedule
  • Loading branch information
Matt Walters committed Sep 16, 2014
2 parents d2374cb + 8768882 commit 604b40d
Show file tree
Hide file tree
Showing 3 changed files with 174 additions and 15 deletions.
28 changes: 13 additions & 15 deletions public/css/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,10 +217,6 @@ a:hover.button {
color: #b4d183;
}

#schedule .subheader h2 {
color: #d65357;
}

#sponsor-list {
text-align: center;
margin: 0 auto;
Expand Down Expand Up @@ -556,6 +552,7 @@ section.more-speakers span {
}
.schedule table {
margin: 0 auto;
width: 100%;
}
.schedule table thead tr {
color: #333;
Expand All @@ -578,7 +575,6 @@ section.more-speakers span {
.schedule table tr.lunch td:first-child,
.schedule table tr.coffee td:first-child,
.schedule table tr.party td:first-child {
color: rgb(24, 24, 24);
font-size: 18px;
font-style: normal;
}
Expand All @@ -595,7 +591,8 @@ section.more-speakers span {
font-weight: lighter;
}
.schedule table tr.breakfast {
background-color: #FFFDF7;
background-color: #3D3D40;
border-top: 1px solid #CDCDCD;
color: #f8d15f;
}
.schedule table td registration::after {
Expand All @@ -609,7 +606,7 @@ section.more-speakers span {
font-size: 18px;
}
.schedule table tr.lunch {
background-color: #FCFFF7;
background-color: #3D3D40;
color: #b2cf7e;
}
.schedule table td lunch::after {
Expand All @@ -618,7 +615,7 @@ section.more-speakers span {
font-size: 18px;
}
.schedule table tr.coffee {
background-color: #FFF8F2;
background-color: #3D3D40;
color: #E7721F;
}
.schedule table td coffee::after {
Expand All @@ -633,36 +630,37 @@ section.more-speakers span {
.schedule table td img {
float: left;
width: 35px;
margin: 6px 6px 0px 0px;
margin: 6px 20px 0px 0px;
}
.schedule table td speaker > a {
color: #D03080;
color: #78ba51;
text-decoration: underline;
}
.schedule table tr.party {
background-color: #F7FDFF;
background-color: #3D3D40;
border-bottom: 1px solid #CDCDCD;
color: #2496b2;
}
}/*
.schedule table td cruise::after {
font-style: normal;
content: 'Statue of Liberty Cruise';
font-size: 18px;
}
}*/
.schedule table td party::after {
font-style: normal;
content: 'Closing Party at LightBox';
font-size: 18px;
}

.schedule table th {
color: #FFF;
font-weight: bold;
text-align: left;
padding: 10px 0 10px 20px;
}
.schedule table tr:last-child {
color: #333;
color: #78ba51;
font-style: italic;
height: auto;
}
.schedule table tr:last-child td {
border-bottom: 0px solid #FFF;
Expand Down
Binary file added public/img/empirenode.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
161 changes: 161 additions & 0 deletions public/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
<ul>
<li><a href="/#/synopsis" title="Information">Information</a></li>
<li><a href="/#/speakers" title="Speakers">Speakers</a></li>
<li><a href="/#/schedule" title="Speakers">Schedule</a></li>
<li><a href="/#/sponsors" title="Sponsors">Sponsors</a></li>
<li><a href="https://ti.to/empirejs/empirenode-2014" title="Tickets" target="_blank">Tickets</a></li>
<li><a class="glyphicon-heart" href="/#/love" title="Contacts">&lt;3</a></li>
Expand Down Expand Up @@ -94,6 +95,165 @@ <h2>Speakers &amp; Instructors</h2>
</div>
</div>

<div id="schedule" class="content">
<div class="subheader">
<h2>Schedule</h2>
</div>

<div class="schedule content">
<table>
<tbody>
<tr class="break breakfast">
<td>8:00am</td>
<td>
<registration></registration><br>
<!-- Sponsored by <a href="http://etsy.com/" target="_blank">Etsy</a> -->
</td>
</tr>
<tr>
<td>9:00am</td>
<td>
<img src="/img/empirenode.png">
<talk>Announced Soon!</talk>
<speaker>
<a href="#" target="_blank">Announced Soon!</a>
</speaker>
</td>
</tr>
<tr>
<td>9:40am</td>
<td>
<img src="/img/empirenode.png">
<talk>Announced Soon!</talk>
<speaker>
<a href="#" target="_blank">Announced Soon!</a>
</speaker>
</td>
</tr>
<tr>
<td>10:20am</td>
<td>
<img src="/img/empirenode.png">
<talk>Announced Soon!</talk>
<speaker>
<a href="#" target="_blank">Announced Soon!</a>
</speaker>
</td>
</tr>
<tr>
<td>11:00am</td>
<td>
<img src="/img/empirenode.png">
<talk>Announced Soon!</talk>
<speaker>
<a href="#" target="_blank">Announced Soon!</a>
</speaker>
</td>
</tr>
<tr>
<td>11:40am</td>
<td>
<img src="/img/empirenode.png">
<talk>Announced Soon!</talk>
<speaker>
<a href="#" target="_blank">Announced Soon!</a>
</speaker>
</td>
</tr>
<tr class="break lunch">
<td>12:10pm</td>
<td>
<lunch></lunch><br>
<!-- Sponsored by <a href="http://bazaarvoice.com/" target="_blank">BazaarVoice</a> -->
</td>
</tr>
<tr>
<td>1:10pm</td>
<td>
<img src="/img/empirenode.png">
<talk>Announced Soon!</talk>
<speaker>
<a href="#" target="_blank">Announced Soon!</a>
</speaker>
</td>
</tr>
<tr>
<td>1:50pm</td>
<td>
<img src="/img/empirenode.png">
<talk>Announced Soon!</talk>
<speaker>
<a href="#" target="_blank">Announced Soon!</a>
</speaker>
</td>
</tr>
<tr>
<td>2:30pm</td>
<td>
<img src="/img/empirenode.png">
<talk>Announced Soon!</talk>
<speaker>
<a href="#" target="_blank">Announced Soon!</a>
</speaker>
</td>
</tr>
<tr class="break coffee">
<td>3:00pm</td>
<td>
<coffee></coffee>
</td>
</tr>
<tr>
<td>3:30pm</td>
<td>
<img src="/img/empirenode.png">
<talk>Announced Soon!</talk>
<speaker>
<a href="#" target="_blank">Announced Soon!</a>
</speaker>
</td>
</tr>
<tr>
<td>4:10pm</td>
<td>
<img src="/img/empirenode.png">
<talk>Announced Soon!</talk>
<speaker>
<a href="#" target="_blank">Announced Soon!</a>
</speaker>
</td>
</tr>
<tr>
<td>4:50pm</td>
<td>
<img src="/img/empirenode.png">
<talk>Announced Soon!</talk>
<speaker>
<a href="#" target="_blank">Announced Soon!</a>
</speaker>
</td>
</tr>
<tr>
<td>5:30pm</td>
<td>
<img src="/img/empirenode.png">
<talk>Announced Soon!</talk>
<speaker>
<a href="#" target="_blank">Announced Soon!</a>
</speaker>
</td>
</tr>
<tr class="break party">
<td>8:00pm</td>
<td>
Amazing After-Party!
</td>
</tr>
</tbody>
</table>
</div>
</div>

<div id="sponsors">
<div class="subheader">
<h2>Sponsorship by</h2>
Expand Down Expand Up @@ -165,6 +325,7 @@ <h2>Organized by</h2>
'welcome': run_route
, '/synopsis': run_route
, '/speakers': run_route
, '/schedule': run_route
, '/videos': run_route
, '/sponsors': run_route
, '/love': run_route
Expand Down

0 comments on commit 604b40d

Please sign in to comment.