Skip to content

Commit 4b9bb96

Browse files
nicksloannicksloan
committed
Merge branch 'master' into prod
2 parents 5eafc37 + baf1e66 commit 4b9bb96

File tree

8 files changed

+22
-18
lines changed

8 files changed

+22
-18
lines changed

‎css/style.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ div#container {
99
margin: auto;
1010
}
1111

12-
p {
12+
body {
1313
font-family: Arial, sans-serif;
1414
}
1515

‎resources/404.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ <h1>PHP Community
1212
<li><a href="home">Home</a></li>
1313
<li><a href="speakers">Speakers</a></li>
1414
<li><a href="location">Location</a></li>
15-
<li><a href="about">About Us</a></li>
16-
<li><a href="sponsorships">Sponsor Us</a></li>
15+
<li><a href="about">About</a></li>
16+
<li><a href="sponsorships">Sponsor</a></li>
1717
</ul>
1818
</div>
1919
<div id="social">

‎resources/about.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ <h1>PHP Community
1212
<li><a href="home">Home</a></li>
1313
<li><a href="speakers">Speakers</a></li>
1414
<li><a href="location">Location</a></li>
15-
<li>About Us</li>
16-
<li><a href="sponsorships">Sponsor Us</a></li>
15+
<li>About</li>
16+
<li><a href="sponsorships">Sponsor</a></li>
1717
</ul>
1818
</div>
1919
<div id="social">

‎resources/home.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ <h3>Nashville,<span>&nbsp;</span>TN</h3>
1717
<li>Home</li>
1818
<li><a href="speakers">Speakers</a></li>
1919
<li><a href="location">Location</a></li>
20-
<li><a href="about">About Us</a></li>
21-
<li><a href="sponsorships">Sponsor Us</a></li>
20+
<li><a href="about">About</a></li>
21+
<li><a href="sponsorships">Sponsor</a></li>
2222
</ul>
2323
</div>
2424
</div>

‎resources/location.html

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ <h1>PHP Community
1111
<li><a href="home">Home</a></li>
1212
<li><a href="speakers">Speakers</a></li>
1313
<li>Location</li>
14-
<li><a href="about">About Us</a></li>
15-
<li><a href="sponsorships">Sponsor Us</a></li>
14+
<li><a href="about">About</a></li>
15+
<li><a href="sponsorships">Sponsor</a></li>
1616
</ul>
1717
</div>
1818
<div id="social">
@@ -25,11 +25,15 @@ <h1>PHP Community
2525
</div>
2626
<div class="section">
2727
<h2>Venue</h2>
28-
<p>We've booked a fantastic space for the first PHP Community Conference. <a href="http://www.nashvilleeventspace.com/venues/avenue/">aVenue</a> is one of Nashville's hippest venues. Located only a block away from the Nashville Hilton, aVenue is the perfect space for our conference.</p>
28+
<p>We've booked a fantastic space for the first PHP Community Conference. During our search for a venue, <a href="http://www.nashvilleeventspace.com/venues/avenue/avenue-blank-venue/">aVenue</a> stood out because of its spacious, industrial feel, which we think suits our theme of building things out of big ideas. Located only a block away from the conference hotel, Hilton Nashville Downtown, aVenue is a relaxed, friendly space for our conference. aVenue is surounded by cool things to do in Downtown Nashville. There are always music events going on at the many bars and clubs in the area. Nashville is also filled with amazing places to eat like <a href="http://www.demosrestaurants.com/">Demos</a> and <a href="http://www.osf.com/">The Old Spaghetti Factory</a>.</p>
29+
<p>120 3rd Avenue South<br>
30+
Nashville, Tennessee 37201<br>
31+
<a href="http://maps.google.com/maps?f=q&source=s_q&hl=en&geocode=&q=120+3rd+Avenue+South+Nashville,+Tennessee+37201&sll=37.0625,-95.677068&sspn=34.724817,68.554688&ie=UTF8&hq=&hnear=120+3rd+Ave+S,+Nashville,+Davidson,+Tennessee+37201&ll=36.162652,-86.775212&spn=0.008211,0.016737&z=16&iwloc=A">Map</a></p>
2932
<h2>Hotel</h2>
30-
<p>Some text about the hotel.</p>
33+
<p>We've arranged a great deal for our attendees at the <a href="http://nashvillehilton.com/">Hilton Nashville Downtown</a>! For just $129 per night, you'll be located right in downtown Nashville around the block from the conference venue. In the evenings, we'll walk around downtown and entertain ourselves Nashville-style!</p>
34+
<p><a href="http://www.hilton.com/en/hi/groups/personalized/B/BNANSHF-PHP2-20110420/index.jhtml?WT.mc_id=POG">Reserve your room</a> now at our special rate of $129 per night!</p>
3135
<h2>Travel</h2>
32-
<p>Located only 10 miles from the Nashville Hilton, Nashville International (BNA) is a convenient arrival location for your visit. The Grey Line Airport Express provides shuttle service to the hotel for $12 one-way, or $18 round trip. There are other taxi and shuttle services available as well.</p>
36+
<p>Located only 10 miles from the Nashville Hilton, <a href="http://www.flynashville.com/">Nashville International (BNA)</a> is a convenient arrival location for your visit. The Gray Line Airport Express provides shuttle service to the hotel for $12 one-way, or $20 round trip.</p>
3337
</div>
3438
<?php
3539
$body = ob_get_clean();

‎resources/speakers.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ <h1>PHP Community
1111
<li><a href="home">Home</a></li>
1212
<li>Speakers</li>
1313
<li><a href="location">Location</a></li>
14-
<li><a href="about">About Us</a></li>
15-
<li><a href="sponsorships">Sponsor Us</a></li>
14+
<li><a href="about">About</a></li>
15+
<li><a href="sponsorships">Sponsor</a></li>
1616
</ul>
1717
</div>
1818
<div id="social">

‎resources/sponsorships.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ <h1>PHP Community
1212
<li><a href="home">Home</a></li>
1313
<li><a href="speakers">Speakers</a></li>
1414
<li><a href="location">Location</a></li>
15-
<li><a href="about">About Us</a></li>
16-
<li>Sponsor Us</li>
15+
<li><a href="about">About</a></li>
16+
<li>Sponsor</li>
1717
</ul>
1818
</div>
1919
<div id="social">

‎resources/subscribe.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ <h1>PHP Community
1212
<li><a href="home">Home</a></li>
1313
<li><a href="speakers">Speakers</a></li>
1414
<li><a href="location">Location</a></li>
15-
<li><a href="about">About Us</a></li>
16-
<li><a href="sponsorships">Sponsor Us</a></li>
15+
<li><a href="about">About</a></li>
16+
<li><a href="sponsorships">Sponsor</a></li>
1717
</ul>
1818
</div>
1919
<div id="social">

0 commit comments

Comments
 (0)