Skip to content

Commit

Permalink
updated formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
Matt Walters committed Sep 16, 2014
2 parents 1fac8d6 + d2374cb commit 47da6c6
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 30 deletions.
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "empirenode-2014",
"description": "Homepage for 2014.empirenode.org",
"version": "2.5.0",
"version": "2.6.1",
"repository": {
"type": "git",
"url": "http://github.com/empirejs/2014.empirenode.org.git"
Expand Down
16 changes: 12 additions & 4 deletions public/css/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ a:hover.button {
#organizers,
#speakers,
#love {
margin-top: 50px;
margin-top: 25px;
border-top: 2px solid #999;
padding-top: 20px;
}
Expand All @@ -196,7 +196,6 @@ a:hover.button {
#schedule .subheader,
#location .subheader,
#organizers .subheader {
border-bottom: 1px solid black;
display: block;
height: 40px;
margin: 0 0 20px 0;
Expand All @@ -213,7 +212,8 @@ a:hover.button {
text-align: left;
}

#sponsors .subheader h2 {
#sponsors .subheader h2,
#sponsor-list h2 a {
color: #b4d183;
}

Expand All @@ -229,6 +229,14 @@ a:hover.button {
padding-bottom: 40px;
}

#sponsor-list h2 {
margin-top: 25px;
}

#sponsor-list h2 a {
text-decoration: underline;
}

#location .location05,
#location .cruise,
#location .lightbox {
Expand Down Expand Up @@ -544,6 +552,7 @@ section.more-speakers span {
}
.schedule table {
margin: 0 auto;
width: 100%;
}
.schedule table thead tr {
color: #333;
Expand Down Expand Up @@ -651,7 +660,6 @@ section.more-speakers span {
.schedule table tr:last-child {
color: #78ba51;
font-style: italic;
height: auto;
}
.schedule table tr:last-child td {
border-bottom: 0px solid #FFF;
Expand Down
50 changes: 25 additions & 25 deletions public/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,49 +114,49 @@ <h2>Schedule</h2>
<td>9:00am</td>
<td>
<img src="/img/empirenode.png">
<talk>TBD</talk>
<talk>Announced Soon!</talk>
<speaker>
<a href="#" target="_blank">TBD</a>
<a href="#" target="_blank">Announced Soon!</a>
</speaker>
</td>
</tr>
<tr>
<td>9:40am</td>
<td>
<img src="/img/empirenode.png">
<talk>TBD</talk>
<talk>Announced Soon!</talk>
<speaker>
<a href="#" target="_blank">TBD</a>
<a href="#" target="_blank">Announced Soon!</a>
</speaker>
</td>
</tr>
<tr>
<td>10:20am</td>
<td>
<img src="/img/empirenode.png">
<talk>TBD</talk>
<talk>Announced Soon!</talk>
<speaker>
<a href="#" target="_blank">TBD</a>
<a href="#" target="_blank">Announced Soon!</a>
</speaker>
</td>
</tr>
<tr>
<td>11:00am</td>
<td>
<img src="/img/empirenode.png">
<talk>TBD</talk>
<talk>Announced Soon!</talk>
<speaker>
<a href="#" target="_blank">TBD</a>
<a href="#" target="_blank">Announced Soon!</a>
</speaker>
</td>
</tr>
<tr>
<td>11:40am</td>
<td>
<img src="/img/empirenode.png">
<talk>TBD</talk>
<talk>Announced Soon!</talk>
<speaker>
<a href="#" target="_blank">TBD</a>
<a href="#" target="_blank">Announced Soon!</a>
</speaker>
</td>
</tr>
Expand All @@ -171,29 +171,29 @@ <h2>Schedule</h2>
<td>1:10pm</td>
<td>
<img src="/img/empirenode.png">
<talk>TBD</talk>
<talk>Announced Soon!</talk>
<speaker>
<a href="#" target="_blank">TBD</a>
<a href="#" target="_blank">Announced Soon!</a>
</speaker>
</td>
</tr>
<tr>
<td>1:50pm</td>
<td>
<img src="/img/empirenode.png">
<talk>TBD</talk>
<talk>Announced Soon!</talk>
<speaker>
<a href="#" target="_blank">TBD</a>
<a href="#" target="_blank">Announced Soon!</a>
</speaker>
</td>
</tr>
<tr>
<td>2:30pm</td>
<td>
<img src="/img/empirenode.png">
<talk>TBD</talk>
<talk>Announced Soon!</talk>
<speaker>
<a href="#" target="_blank">TBD</a>
<a href="#" target="_blank">Announced Soon!</a>
</speaker>
</td>
</tr>
Expand All @@ -207,39 +207,39 @@ <h2>Schedule</h2>
<td>3:30pm</td>
<td>
<img src="/img/empirenode.png">
<talk>TBD</talk>
<talk>Announced Soon!</talk>
<speaker>
<a href="#" target="_blank">TBD</a>
<a href="#" target="_blank">Announced Soon!</a>
</speaker>
</td>
</tr>
<tr>
<td>4:10pm</td>
<td>
<img src="/img/empirenode.png">
<talk>TBD</talk>
<talk>Announced Soon!</talk>
<speaker>
<a href="#" target="_blank">TBD</a>
<a href="#" target="_blank">Announced Soon!</a>
</speaker>
</td>
</tr>
<tr>
<td>4:50pm</td>
<td>
<img src="/img/empirenode.png">
<talk>TBD</talk>
<talk>Announced Soon!</talk>
<speaker>
<a href="#" target="_blank">TBD</a>
<a href="#" target="_blank">Announced Soon!</a>
</speaker>
</td>
</tr>
<tr>
<td>5:30pm</td>
<td>
<img src="/img/empirenode.png">
<talk>TBD</talk>
<talk>Announced Soon!</talk>
<speaker>
<a href="#" target="_blank">TBD</a>
<a href="#" target="_blank">Announced Soon!</a>
</speaker>
</td>
</tr>
Expand All @@ -257,7 +257,6 @@ <h2>Schedule</h2>
<div id="sponsors">
<div class="subheader">
<h2>Sponsorship by</h2>
<h4>Interested in sponsoring? <a href="mailto:sponsors@empirenode.org">Email us!</a></h4>
</div>

<div id="sponsor-list">
Expand All @@ -267,6 +266,7 @@ <h4>Interested in sponsoring? <a href="mailto:sponsors@empirenode.org">Email us!
<a href="http://digitalocean.com" target="_blank">
<img src="/img/sponsors/digitalocean.png" width="400" />
</a>
<h2>Interested in sponsoring? <a href="mailto:sponsors@empirenode.org">Email us!</a></h2>
</div>
</div>

Expand Down

0 comments on commit 47da6c6

Please sign in to comment.