Merge branch 'master' of [email protected]:scoates/phpcon-web

Conflicts:
	css/style.css

Author: ramsey

css/style.css

@@ -194,6 +194,7 @@ p {
 
 ul {
     margin: 20px 0;
+    padding-left: 2em;
 }
 
 li {
@@ -222,26 +223,44 @@ li {
     padding-left: 50px;
     /*background: url(../images/quote.png) no-repeat;*/
     height: 93px;
+    position: relative;
 }
 
 .aside p {
     color: #363636;
     text-transform: uppercase;
     font-family: "NevisBold";
-    text-indent: -2.2em;
-    line-height: 35px;
+    line-height: 40px;
     margin: 0;
     vertical-align: bottom;
     /*text-indent: -99999px;*/
+    text-indent: -43px;
 }
 
-.aside p span {
-    line-height: inherit;
+.aside p:before {
+    content: "“";
+    line-height: 40px;
+    vertical-align: top;
+    font-size: 60px;
+    font-family: "RockwellExtraBoldRegular";
     color: #BD820E;
+
+}
+
+.aside p:after {
+    content: "”";
+    line-height: 40px;
+    vertical-align: top;
     font-size: 60px;
     font-family: "RockwellExtraBoldRegular";
-    line-height: 14px;
-    vertical-align: text-bottom;
+    color: #BD820E;
+}
+
+.aside p span {
+    line-height: inherit;
+    font-size: 60px;
+    line-height: 40px;
+    vertical-align: text-top;
 }
 
 div#nav {

resources/cfp.html

@@ -20,7 +20,7 @@ <h1>PHP Community
                 </div>
             </div>
             <div class="aside">
-                <p><span>&ldquo;</span>Tell us about an inspiring project you&rsquo;re working on and why it&rsquo;s important.<span>&rdquo;</span></p>
+                <p>Tell us about an inspiring project you&rsquo;re working on and why it&rsquo;s important.</p>
             </div>
             <div class="section">
 

resources/home.html

@@ -21,7 +21,7 @@ <h3>Nashville,<span>&nbsp;</span>TN</h3>
                 </div>
             </div>
             <div class="aside">
-                <p><span>&ldquo;</span>The PHP Community Conference is an event for people who care about PHP and the code they write with it.<span>&rdquo;</span></p>
+                <p>The PHP Community Conference is an event for people who care about PHP and the code they write 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

@@ -10,6 +10,7 @@
         <meta property="og:url" content="http://www.phpcon.org/" />
         <meta property="og:image" content="http://www.phpcon.org/images/guitar.png" />
         <meta property="fb:admins" content="623959689,796025211,756315701,12105030" />
+        <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" rel="stylesheet" type="text/css">