Merge branch 'master' into prod

Author: nicksloan

css/style.css

@@ -212,13 +212,16 @@ li {
     line-height: 20px;
 }
 
+.section, .sectionWide{
+    font-size: 14px;
+}
+
 .section {
     margin: auto;
-    font-size: 14px;
     padding-left: 430px;
 }
 
-.section p {
+.section p, .sectionWide p {
     line-height: 20px;
     margin: 0;
     margin-bottom: 20px;
@@ -302,9 +305,10 @@ div#nav li a {
 
 div#sponsors {
     padding-bottom: 50px;
+    clear: both;
 }
 
-div#sponsors h1 {
+div.sectionWide h1 {
     font-size: 18px;
     color: white;
     background-color: #363636;
@@ -313,11 +317,11 @@ div#sponsors h1 {
     font-weight: normal;
     text-transform: uppercase;
     height: 26px;
-    margin: 0 0 34px 0;
+    margin: 20px 0 34px 0;
     padding-left: 8px;
 }
 
-div#sponsors h2 {
+div.sectionWide h2 {
     color: #363636;
     font-size: 18px;
     font-family: "NevisBold";
@@ -359,3 +363,22 @@ div.communitySponsor > a {
 div#sponsors > div > a {
     margin-right: 20px;
 }
+
+div#container.sub.speakers ul.speakers {
+	list-style-type: none;
+	margin-left: 0;
+	padding-left: 0;
+}
+
+div#container.sub.speakers ul.speakers h3 {
+	font-family: "MuseoSlab500";
+}
+
+div#container.sub.speakers ul.speakers h4 {
+	font-family: "MuseoSlab500";
+	color: #363636;
+	font-size: 18px;
+	font-weight: bold;
+}
+
+

resources/404.html

@@ -10,7 +10,7 @@ <h1>PHP Community
                 <div id="nav">
                     <ul>
                         <li><a href="home">Home</a></li>
-                        <li><a href="http://phpcon.eventbrite.com/">Register</a></li>
+                        <li><a href="speakers">Speakers</a></li>
                         <li><a href="about">About Us</a></li>
                         <li><a href="sponsorships">Sponsor Us</a></li>
                         <li><a href="subscribe">Keep in Touch</a></li>

resources/about.html

@@ -10,10 +10,9 @@ <h1>PHP Community
                 <div id="nav">
                     <ul>
                         <li><a href="home">Home</a></li>
-                        <li><a href="register">Register</a></li>
+			<li><a href="speakers">Speakers</a></li>
                         <li>About Us</li>
                         <li><a href="sponsorships">Sponsor Us</a></li>
-                        <li><a href="subscribe">Keep in Touch</a></li>
                     </ul>
                 </div>
                 <div id="social">

resources/cfp.html

@@ -15,23 +15,27 @@ <h3>Nashville,<span>&nbsp;</span>TN</h3>
                 <div id="nav">
                     <ul>
                         <li>Home</li>
-                        <li><a href="register">Register</a></li>
+                        <li><a href="speakers">Speakers</a></li>
                         <li><a href="about">About Us</a></li>
                         <li><a href="sponsorships">Sponsor Us</a></li>
-                        <li><a href="subscribe">Keep in Touch</a></li>
                     </ul>
                 </div>
             </div>
             <div class="aside">
                 <p>A conference for people who care about PHP and what they make with it.</p>
             </div>
             <div class="section">
-                <p>We know you were sold at <em>Community</em> <strong>so <a href="http://phpcon.eventbrite.com/">register</a> now!</strong> Spaces will go quickly. If you need a bit of a sales pitch, keep reading. Read quickly though, we could be sold out before you finish.</p>
-                <p>The PHP Community Conference is all about you! Come  on out to Nashville for a different kind of conference this spring.  We're going to hear from community members about projects they're  working on and how they were inspired. It's going to be a fun, laid-back event where you and the people you'll meet can collaborate to build some awesome applications of your own with PHP.</p>
+                <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>
                 <p><a href="subscribe">Subscribe to our mailing list</a>, and we'll keep you updated on all the latest PHP Community Conference news and information.</p>
             </div>
 
-            <div id="sponsors">
+            <div class="sectionWide">
+                <h1>The Conference</h1>
+                <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 $350. 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>
+                <p>We can't wait to see you there, so <a href="http://phpcon.eventbrite.com">register</a> now.</p>
+            </div>
+
+            <div id="sponsors" class="sectionWide">
                 <h1>Our Sponsors</h1>
                 <h2>Gold Sponsors</h2>
                 <div>