Skip to content

Commit 6f7d18d

Browse files
committed
Merge branch 'master' into prod
2 parents e91327d + 02a0bc6 commit 6f7d18d

File tree

3 files changed

+37
-9
lines changed

3 files changed

+37
-9
lines changed

css/style.css

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -382,4 +382,14 @@ div#container.sub.speakers ul.speakers h4 {
382382
font-weight: bold;
383383
}
384384

385+
div#main.section {
386+
font-size: 16px;
387+
line-height: 20px;
388+
}
389+
390+
div#main.section {
391+
margin: 10px 0;
392+
}
385393

394+
div#main.section li {
395+
margin: 10px 0;

images/sponsor-cakedcplat2.png

28.4 KB
Loading

resources/home.html

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,30 +25,48 @@ <h3>Nashville,<span>&nbsp;</span>TN</h3>
2525
<div class="aside">
2626
<p>A conference for people who care about PHP and what they make with it.</p>
2727
</div>
28-
<div class="section">
29-
<h4><a href="http://phpcon.eventbrite.com">Register now for only $300!</a></h4>
30-
<p>We've had an amazing response to our call for sponsors and in the spirit of community, we're lowering the ticket price. It's going to be a fun, relaxed event where we can all get to know each other and mingle with some really great speakers, too.
31-
<p>For $300, you'll receive:</p>
28+
<div class="section" id="main">
29+
<h4><a href="http://phpcon.eventbrite.com">Register now for only $300!</a></h4>
30+
<p>Registration gets you:</p>
3231
<ul>
33-
<li>Two tutorials on the 21st</li>
34-
<li>A full day of <a href="speakers">excellent speakers</a> on the 22nd</li>
35-
<li>All your food, snacks, and conversation free</li>
32+
<li>Two informative tutorials on Thursday that will leave
33+
you with new skills that you can use in your work right away.</li>
34+
<li>A Friday full of <a href="speakers">excellent speakers</a>
35+
sharing their stories, and talking about solutions to real
36+
problems.</li>
37+
<li>A Pecha Kucha event on Friday evening, with a chance to
38+
win one of two iPad 2s, sponsored by CakeDC.</li>
3639
</ul>
3740
</div>
3841

3942
<div class="sectionWide">
4043
<h1>The Conference</h1>
4144
<p>Inspired by conferences like Webstock and Brooklyn Beta, we want to make a friendly conference for us. Together with our friends and peers, we aim to inspire you to make great things with PHP.</p>
42-
<p>The PHP Community Conference is a two-day event. We kick things off with a tutorial day that will introduce you to tools and ideas that you can use in your code right away. The second day will consist of presentations that will inspire you to create something new with PHP. With the help of our sponsors, we are able to offer admission to the entire event for $300. We'll provide lunch and snacks on both days. On Friday night, we'll finish off the conference with a party featuring pecha kucha talks by our awesome attendees.</p>
45+
46+
<p>The PHP Community Conference is a two-day event. We kick
47+
things off with a tutorial day that will introduce you to tools
48+
and ideas that you can use in your code right away. The second
49+
day will consist of presentations that will inspire you to
50+
create something new with PHP. With the help of our sponsors, we
51+
are able to offer admission to the entire event for $300. We'll
52+
provide lunch and snacks on both days. On Friday night, we'll
53+
finish off the conference with a party featuring pecha kucha
54+
talks by our awesome attendees. The best pecha kucha talks
55+
will have a chance at winning one of two iPad 2s sponsored by
56+
CakeDC!</p>
57+
4358
<p>We can't wait to see you there, so <a href="http://phpcon.eventbrite.com">register</a> now.</p>
4459
</div>
4560

4661
<div id="sponsors" class="sectionWide">
4762
<h1>Our Sponsors</h1>
63+
<h2>Platinum Sponsors</h2>
64+
<div>
65+
<a href="http://cakedc.com"><img src="images/sponsor-cakedcplat2.png" alt="CakeDC"/></a>
66+
</div>
4867
<h2>Gold Sponsors</h2>
4968
<div>
5069
<a href="http://www.facebook.com/opensource/"><img src="images/sponsor-facebook.png" alt="Facebook"/></a>
51-
<a href="http://cakedc.com"><img src="images/sponsor-cakedc.png" alt="CakeDC"/></a><br>
5270
<a href="http://microsoft.com/web/webmatrix/"><img src="images/sponsor-webmatrix.png" alt="Microsoft Web Matrix"/></a>
5371
</div>
5472
<h2>Silver Sponsors</h2>

0 commit comments

Comments
 (0)