Merge branch 'master' into prod

Author: ramsey

css/style.css

@@ -209,7 +209,7 @@ li {
 .section {
     margin: auto;
     font-size: 14px;
-    padding-left: 400px;
+    padding-left: 430px;
 }
 
 .section p {
@@ -220,11 +220,11 @@ li {
 }
 
 .aside {
-    width: 325px;
-    margin-right: 25px;
+    width: 350px;
+    margin-right: 40px;
     float: left;
     font-size: 20px;
-    padding-left: 50px;
+    padding-left: 40px;
     /*background: url(../images/quote.png) no-repeat;*/
     height: 93px;
     position: relative;

resources/home.html

@@ -21,7 +21,7 @@ <h3>Nashville,<span>&nbsp;</span>TN</h3>
                 </div>
             </div>
             <div class="aside">
-                <p>The PHP Community Conference is for people who care about PHP and what they make with it.</p>
+                <p>A conference for people who care about PHP and what they make with it.</p>
             </div>
             <div class="section">
                 <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. Ticket sales will begin on February 3, 2011.</p>

templates/page.php

@@ -13,7 +13,7 @@
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
         <link href="webfontkit/stylesheet.css" rel="stylesheet" type="text/css">
-        <link href="css/style.css?r=20110125-1" rel="stylesheet" type="text/css">
+        <link href="css/style.css?r=20110125-2" rel="stylesheet" type="text/css">
         <!-- Grab latest version of jQuery -->
         <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js">
         </script>