Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/schedule #10

Merged
merged 6 commits into from
Sep 16, 2014
Merged

Feature/schedule #10

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
12f6a8b
adding node to npm start
Sep 3, 2014
9c03382
Merge branch 'master' of github.com:EmpireJS/2014.empirenode.org
Sep 9, 2014
52f1baf
adding page nav
Sep 9, 2014
1fac8d6
schedule skeleton
Sep 9, 2014
47da6c6
updated formatting
Sep 16, 2014
8768882
putting on shades
Sep 16, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 9 additions & 12 deletions public/css/style.css
View file
Open in desktop
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 Down Expand Up @@ -596,7 +593,7 @@ section.more-speakers span {
}
.schedule table tr.breakfast {
background-color: #FFFDF7;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we change all of the big really light-colored table blocks(#FFFDF7) to #3D3D40 and make the fonts for those blocks match the same white as the rest of the schedule? It is very bright.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Too bright?

(••)
( ••)>⌐■-■
(⌐■_■)

On Mon, Sep 15, 2014 at 11:45 PM, Tracy [email protected] wrote:

In public/css/style.css:

@@ -596,7 +593,7 @@ section.more-speakers span {
}
.schedule table tr.breakfast {
background-color: #FFFDF7;

can we change all of the big really light-colored table blocks(#FFFDF7) to
#3D3D40 and make the fonts for those blocks match the same white as the
rest of the schedule? It is very bright.

—
Reply to this email directly or view it on GitHub
https://github.com/EmpireJS/2014.empirenode.org/pull/10/files#r17582005.

color: #f8d15f;
color: #78ba51;
}
.schedule table td registration::after {
font-style: normal;
Expand All @@ -618,7 +615,7 @@ section.more-speakers span {
font-size: 18px;
}
.schedule table tr.coffee {
background-color: #FFF8F2;
background-color: #FCFFF7;
color: #E7721F;
}
.schedule table td coffee::after {
Expand All @@ -633,36 +630,36 @@ 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;
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
Open in desktop
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
Open in desktop
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