Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Code Review] Updated Live site styles #41

Merged
merged 9 commits into from Mar 19, 2012
Merged

[Code Review] Updated Live site styles #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
94e1029
Added favicon
Mar 19, 2012
17b64eb
Added Speaker companies
Mar 19, 2012
f156ff3
Merge branch 'refs/heads/live_site' into live_site-styles
Mar 19, 2012
80380c9
Added jumpstartLabs logo to training page
Mar 19, 2012
8c9bdd1
Moved speaker photos to 'images/speaker' directory
Mar 19, 2012
86af02b
Moved icons > 'images/icons' directory
Mar 19, 2012
0ef8af1
Updated Styles
Mar 19, 2012
e653450
Fixed location button bug
Mar 19, 2012
447ad55
Updated styles for media page
Mar 19, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 5 additions & 2 deletions public/cfp.html
View file
Open in desktop
Expand Up @@ -4,6 +4,9 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<link rel="stylesheet" href="stylesheets/wufoo.css" /> <link rel="stylesheet" href="stylesheets/wufoo.css" />
<link rel="stylesheet" href="stylesheets/style.css" /> <link rel="stylesheet" href="stylesheets/style.css" />

<!-- Icons -->
<link rel="shortcut icon" href="images/icons/favicon.ico">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>
<script type="text/javascript"> <script type="text/javascript">
if (typeof jQuery == 'undefined') if (typeof jQuery == 'undefined')
Expand Down Expand Up @@ -35,7 +38,7 @@
<li class="page-3 current"><a href="sponsors">Sponsors</a></li> <li class="page-3 current"><a href="sponsors">Sponsors</a></li>
</ul> </ul>
<a id="logo" class="home" href="index.html" title="Return to the homepage"> <a id="logo" class="home" href="index.html" title="Return to the homepage">
<img src="images/logo.png" alt="Aloha Ruby Conference" /> <img src="images/aloharuby-logo.png" alt="Aloha Ruby Conference" />
</a> </a>
<ul id="leftLinks"> <ul id="leftLinks">
<li class="page-4"><a href="training">Training</a></li> <li class="page-4"><a href="training">Training</a></li>
Expand Down Expand Up @@ -156,7 +159,7 @@ <h3 id="title153">Speaker Info</h3>
</div> </div>
<p class="instruct" id="instruct141"><small>Links to YouTube, Confreaks, Vimeo, etc. If we haven’t seen you speak before, this is a great way to show us what you can do.</small></p> <p class="instruct" id="instruct141"><small>Links to YouTube, Confreaks, Vimeo, etc. If we haven’t seen you speak before, this is a great way to show us what you can do.</small></p>
</li> </li>

<div class="clear hr"></div>
<li id="foli152" class="notranslate section"> <li id="foli152" class="notranslate section">
<section> <section>
<h3 id="title152">Talk Info</h3> <h3 id="title152">Talk Info</h3>
Expand Down
5 changes: 4 additions & 1 deletion public/contact.html
View file
Open in desktop
Expand Up @@ -4,6 +4,9 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<link rel="stylesheet" href="stylesheets/wufoo.css" /> <link rel="stylesheet" href="stylesheets/wufoo.css" />
<link rel="stylesheet" href="stylesheets/style.css" /> <link rel="stylesheet" href="stylesheets/style.css" />

<!-- Icons -->
<link rel="shortcut icon" href="images/icons/favicon.ico">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>
<script type="text/javascript"> <script type="text/javascript">
if (typeof jQuery == 'undefined') if (typeof jQuery == 'undefined')
Expand Down Expand Up @@ -35,7 +38,7 @@
<li class="page-3"><a href="sponsors">Sponsors</a></li> <li class="page-3"><a href="sponsors">Sponsors</a></li>
</ul> </ul>
<a id="logo" class="home" href="index.html" title="Return to the homepage"> <a id="logo" class="home" href="index.html" title="Return to the homepage">
<img src="images/logo.png" alt="Aloha Ruby Conference" /> <img src="images/aloharuby-logo.png" alt="Aloha Ruby Conference" />
</a> </a>
<ul id="leftLinks"> <ul id="leftLinks">
<li class="page-4"><a href="training">Training</a></li> <li class="page-4"><a href="training">Training</a></li>
Expand Down
0 public/images/logo.png → public/images/aloharuby-logo.png
View file
Open in desktop
File renamed without changes
Binary file removed public/images/arrow.png
View file
Open in desktop
Binary file not shown.
Binary file removed public/images/google-icon.png
View file
Open in desktop
Binary file not shown.
Binary file removed public/images/icon-github.png
View file
Open in desktop
Binary file not shown.
Binary file removed public/images/icon-location.png
View file
Open in desktop
Binary file not shown.
Binary file removed public/images/icon-registration.png
View file
Open in desktop
Binary file not shown.
Binary file removed public/images/icon-speakers.png
View file
Open in desktop
Binary file not shown.
Binary file removed public/images/icon-sponsors.png
View file
Open in desktop
Binary file not shown.
Binary file removed public/images/icon-twitter.png
View file
Open in desktop
Binary file not shown.
Binary file removed public/images/icon-world.png
View file
Open in desktop
Binary file not shown.
Binary file removed public/images/rails.png
View file
Open in desktop
Binary file not shown.
Binary file removed public/images/register-button-hover.png
View file
Open in desktop
Binary file not shown.
Binary file removed public/images/register-button.png
View file
Open in desktop
Binary file not shown.
0 public/images/aaron-patterson.png → public/images/speakers/aaron-patterson.png
View file
Open in desktop
File renamed without changes
0 public/images/chad-fowler.jpg → public/images/speakers/chad-fowler.jpg
View file
Open in desktop
File renamed without changes
0 public/images/chad_fowler.png → public/images/speakers/chad_fowler.png
View file
Open in desktop
File renamed without changes
0 public/images/ilya-grigorik.jpg → public/images/speakers/ilya-grigorik.jpg
View file
Open in desktop
File renamed without changes
0 public/images/james_gray.png → public/images/speakers/james_gray.png
View file
Open in desktop
File renamed without changes
0 public/images/mark_bates.jpg → public/images/speakers/mark_bates.jpg
View file
Open in desktop
File renamed without changes
0 public/images/matt-aimonetti.jpg → public/images/speakers/matt-aimonetti.jpg
View file
Open in desktop
File renamed without changes
Binary file added public/images/sponsors/jumpstartlab-logo.png
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/images/twitter-icon.png
View file
Open in desktop
Binary file not shown.
7 changes: 5 additions & 2 deletions public/index.html
View file
Open in desktop
Expand Up @@ -2,8 +2,11 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<link rel="stylesheet" href="stylesheets/style.css" />
<link rel="stylesheet" href="stylesheets/wufoo.css" /> <link rel="stylesheet" href="stylesheets/wufoo.css" />
<link rel="stylesheet" href="stylesheets/style.css" />

<!-- Icons -->
<link rel="shortcut icon" href="images/icons/favicon.ico">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>
<script type="text/javascript"> <script type="text/javascript">
if (typeof jQuery == 'undefined') if (typeof jQuery == 'undefined')
Expand Down Expand Up @@ -35,7 +38,7 @@
<li class="page-3"><a href="sponsors">Sponsors</a></li> <li class="page-3"><a href="sponsors">Sponsors</a></li>
</ul> </ul>
<a id="logo" class="home" href="index.html" title="Return to the homepage"> <a id="logo" class="home" href="index.html" title="Return to the homepage">
<img src="images/logo.png" alt="Aloha Ruby Conference" /> <img src="images/aloharuby-logo.png" alt="Aloha Ruby Conference" />
</a> </a>
<ul id="leftLinks"> <ul id="leftLinks">
<li class="page-4"><a href="training">Training</a></li> <li class="page-4"><a href="training">Training</a></li>
Expand Down
11 changes: 6 additions & 5 deletions public/location.html
View file
Open in desktop
Expand Up @@ -2,8 +2,11 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<link rel="stylesheet" href="stylesheets/style.css" />
<link rel="stylesheet" href="stylesheets/wufoo.css" /> <link rel="stylesheet" href="stylesheets/wufoo.css" />
<link rel="stylesheet" href="stylesheets/style.css" />

<!-- Icons -->
<link rel="shortcut icon" href="images/icons/favicon.ico">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>
<script type="text/javascript"> <script type="text/javascript">
if (typeof jQuery == 'undefined') if (typeof jQuery == 'undefined')
Expand Down Expand Up @@ -35,7 +38,7 @@
<li class="page-3"><a href="sponsors">Sponsors</a></li> <li class="page-3"><a href="sponsors">Sponsors</a></li>
</ul> </ul>
<a id="logo" class="home" href="index.html" title="Return to the homepage"> <a id="logo" class="home" href="index.html" title="Return to the homepage">
<img src="images/logo.png" alt="Aloha Ruby Conference" /> <img src="images/aloharuby-logo.png" alt="Aloha Ruby Conference" />
</a> </a>
<ul id="leftLinks"> <ul id="leftLinks">
<li class="page-4"><a href="training">Training</a></li> <li class="page-4"><a href="training">Training</a></li>
Expand Down Expand Up @@ -94,9 +97,7 @@ <h3>Hotel Accommodations</h3>
</div> </div>
<div class="quote"> <div class="quote">
<p class="locationAction">Request a quote below from Hawaii-Aloha Travel:</br> <p class="locationAction">Request a quote below from Hawaii-Aloha Travel:</br>
<a id="registrationButton" href="http://hawaii-aloha.com/html/alohaconf.html"> <a id="registrationButton" href="http://hawaii-aloha.com/html/alohaconf.html"><span>Request a Quote!</span></a>
<span>Request a Quote!</span>
</a>
</p> </p>
</div> </div>
<div class='clear'></div> <div class='clear'></div>
Expand Down
15 changes: 9 additions & 6 deletions public/media.html
View file
Open in desktop
Expand Up @@ -2,8 +2,11 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<link rel="stylesheet" href="stylesheets/style.css" />
<link rel="stylesheet" href="stylesheets/wufoo.css" /> <link rel="stylesheet" href="stylesheets/wufoo.css" />
<link rel="stylesheet" href="stylesheets/style.css" />

<!-- Icons -->
<link rel="shortcut icon" href="images/icons/favicon.ico">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>
<script type="text/javascript"> <script type="text/javascript">
if (typeof jQuery == 'undefined') if (typeof jQuery == 'undefined')
Expand Down Expand Up @@ -35,7 +38,7 @@
<li class="page-3"><a href="sponsors">Sponsors</a></li> <li class="page-3"><a href="sponsors">Sponsors</a></li>
</ul> </ul>
<a id="logo" class="home" href="index.html" title="Return to the homepage"> <a id="logo" class="home" href="index.html" title="Return to the homepage">
<img src="images/logo.png" alt="Aloha Ruby Conference" /> <img src="images/aloharuby-logo.png" alt="Aloha Ruby Conference" />
</a> </a>
<ul id="leftLinks"> <ul id="leftLinks">
<li class="page-4"><a href="training">Training</a></li> <li class="page-4"><a href="training">Training</a></li>
Expand All @@ -57,10 +60,10 @@ <h1 id="title">Media</h1>
<section id="registrationAvailable"> <section id="registrationAvailable">
<div id="info"> <div id="info">
</div> </div>
<section id="speakers"> <section id="speakers" class="badges">
<h3>Badges</h3> <h3>Badges</h3>
<div class='speaker first'> <div class='speaker first'>
<p>Speaking</p> <p>Speaking Badge</p>
<img src='/images/aloharuby-badge-speaker.jpg'> <img src='/images/aloharuby-badge-speaker.jpg'>
<p><code> <p><code>
&lt;a href="https://aloharubyconf.com"&gt;&lt;img src="https://www.aloharubyconf.com/images/aloharuby-badge-speaker.jpg" alt="I Am Speaking At Aloha Ruby Conference, The Hawaii Ruby Conference" title="I Am Speaking At Aloha Ruby Conference, The Hawaii Ruby Conference" width="288" height="202" /&gt;&lt;/a&gt; &lt;a href="https://aloharubyconf.com"&gt;&lt;img src="https://www.aloharubyconf.com/images/aloharuby-badge-speaker.jpg" alt="I Am Speaking At Aloha Ruby Conference, The Hawaii Ruby Conference" title="I Am Speaking At Aloha Ruby Conference, The Hawaii Ruby Conference" width="288" height="202" /&gt;&lt;/a&gt;
Expand All @@ -69,7 +72,7 @@ <h3>Badges</h3>
</div> </div>


<div class='speaker first'> <div class='speaker first'>
<p>Attending</p> <p>Attending Badge</p>
<img src='/images/aloharuby-badges-attendant.jpg'> <img src='/images/aloharuby-badges-attendant.jpg'>
<p><code> <p><code>
&lt;a href="https://aloharubyconf.com"&gt;&lt;img src="https://www.aloharubyconf.com/images/aloharuby-badge-attendant.jpg" alt="I Am Attending At Aloha Ruby Conference, The Hawaii Ruby Conference" title="I Am Attending At Aloha Ruby Conference, The Hawaii Ruby Conference" width="288" height="202" /&gt;&lt;/a&gt; &lt;a href="https://aloharubyconf.com"&gt;&lt;img src="https://www.aloharubyconf.com/images/aloharuby-badge-attendant.jpg" alt="I Am Attending At Aloha Ruby Conference, The Hawaii Ruby Conference" title="I Am Attending At Aloha Ruby Conference, The Hawaii Ruby Conference" width="288" height="202" /&gt;&lt;/a&gt;
Expand All @@ -78,7 +81,7 @@ <h3>Badges</h3>
</div> </div>


<div class='speaker last'> <div class='speaker last'>
<p>Sponsoring</p> <p>Sponsoring Badge</p>
<img src='/images/aloharuby-badge-sponsor.jpg'> <img src='/images/aloharuby-badge-sponsor.jpg'>
<p><code> <p><code>
&lt;a href="http://aloharubyconf.com"&gt;&lt;img src="https://www.aloharubyconf.com/images/aloharuby-badge-sponsor.jpg" alt="I Am Sponsoring At Aloha Ruby Conference, The Hawaii Ruby Conference" title="I Am Sponsoring At Aloha Ruby Conference, The Hawaii Ruby Conference" width="288" height="202" /&gt;&lt;/a&gt; &lt;a href="http://aloharubyconf.com"&gt;&lt;img src="https://www.aloharubyconf.com/images/aloharuby-badge-sponsor.jpg" alt="I Am Sponsoring At Aloha Ruby Conference, The Hawaii Ruby Conference" title="I Am Sponsoring At Aloha Ruby Conference, The Hawaii Ruby Conference" width="288" height="202" /&gt;&lt;/a&gt;
Expand Down
27 changes: 19 additions & 8 deletions public/program.html
View file
Open in desktop
Expand Up @@ -2,8 +2,11 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<link rel="stylesheet" href="stylesheets/style.css" />
<link rel="stylesheet" href="stylesheets/wufoo.css" /> <link rel="stylesheet" href="stylesheets/wufoo.css" />
<link rel="stylesheet" href="stylesheets/style.css" />

<!-- Icons -->
<link rel="shortcut icon" href="images/icons/favicon.ico">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>
<script type="text/javascript"> <script type="text/javascript">
if (typeof jQuery == 'undefined') if (typeof jQuery == 'undefined')
Expand Down Expand Up @@ -35,7 +38,7 @@
<li class="page-3"><a href="sponsors">Sponsors</a></li> <li class="page-3"><a href="sponsors">Sponsors</a></li>
</ul> </ul>
<a id="logo" class="home" href="index.html" title="Return to the homepage"> <a id="logo" class="home" href="index.html" title="Return to the homepage">
<img src="images/logo.png" alt="Aloha Ruby Conference" /> <img src="images/aloharuby-logo.png" alt="Aloha Ruby Conference" />
</a> </a>
<ul id="leftLinks"> <ul id="leftLinks">
<li class="page-4"><a href="training">Training</a></li> <li class="page-4"><a href="training">Training</a></li>
Expand All @@ -62,7 +65,7 @@ <h1 id="title">Program</h1>
<h3>Speakers</h3> <h3>Speakers</h3>
<div class='speaker first'> <div class='speaker first'>
<div class="imageInfo"> <div class="imageInfo">
<img src='/images/aaron-patterson.png' class='speaker' width='150' height='150' /> <img src='/images/speakers/aaron-patterson.png' class='speaker' width='150' height='150' />
<div class="clear"></div> <div class="clear"></div>
<div class="socialmedia"> <div class="socialmedia">
<a class="twitter" href="https://twitter.com/#!/tenderlove">@tenderlove</a> <a class="twitter" href="https://twitter.com/#!/tenderlove">@tenderlove</a>
Expand All @@ -72,6 +75,7 @@ <h3>Speakers</h3>
</div> </div>
<div class="speaker-content"> <div class="speaker-content">
<div class='name'>Aaron Patterson</div> <div class='name'>Aaron Patterson</div>
<div class='company'><em>AT&amp;T Interactive</em></div>
<div class='session'><strong>Keynote</strong></div> <div class='session'><strong>Keynote</strong></div>
<p>When he isn’t ruining people’s lives by writing software like <p>When he isn’t ruining people’s lives by writing software like
phuby, enterprise, and neversaydie, Aaron can be found writing phuby, enterprise, and neversaydie, Aaron can be found writing
Expand All @@ -86,7 +90,7 @@ <h3>Speakers</h3>


<div class='speaker'> <div class='speaker'>
<div class="imageInfo"> <div class="imageInfo">
<img src='/images/chad_fowler.png' class='speaker' width='150' height='150' /> <img src='/images/speakers/chad_fowler.png' class='speaker' width='150' height='150' />
<div class="clear"></div> <div class="clear"></div>
<div class="socialmedia"> <div class="socialmedia">
<a class="twitter" href="https://twitter.com/#!/chadfowler">@chadfowler</a> <a class="twitter" href="https://twitter.com/#!/chadfowler">@chadfowler</a>
Expand All @@ -96,6 +100,7 @@ <h3>Speakers</h3>
</div> </div>
<div class="speaker-content"> <div class="speaker-content">
<div class='name'>Chad Fowler</div> <div class='name'>Chad Fowler</div>
<div class='company'><em>LivingSocial</em></div>
<div class='session'></div> <div class='session'></div>
<p>VP Engineering at LivingSocial, author, technologist, consultant, speaker, teacher, musician, organizer.</p> <p>VP Engineering at LivingSocial, author, technologist, consultant, speaker, teacher, musician, organizer.</p>
</div> </div>
Expand All @@ -104,7 +109,7 @@ <h3>Speakers</h3>


<div class='speaker'> <div class='speaker'>
<div class="imageInfo"> <div class="imageInfo">
<img src='/images/ilya-grigorik.jpg' class='speaker' width='150' height='150' /> <img src='/images/speakers/ilya-grigorik.jpg' class='speaker' width='150' height='150' />
<div class="clear"></div> <div class="clear"></div>
<div class="socialmedia"> <div class="socialmedia">
<a class="twitter" href="https://twitter.com/#!/igrigorik">@igrigorik</a> <a class="twitter" href="https://twitter.com/#!/igrigorik">@igrigorik</a>
Expand All @@ -114,6 +119,7 @@ <h3>Speakers</h3>
</div> </div>
<div class="speaker-content"> <div class="speaker-content">
<div class='name'>Ilya Grigorik</div> <div class='name'>Ilya Grigorik</div>
<div class='company'><em>Google</em></div>
<div class='session'></div> <div class='session'></div>
<p>Ilya Grigorik is a developer, an open-source and Ruby evangelist, <p>Ilya Grigorik is a developer, an open-source and Ruby evangelist,
a data-geek, and a proverbial early adopter of all things digital. a data-geek, and a proverbial early adopter of all things digital.
Expand All @@ -128,7 +134,7 @@ <h3>Speakers</h3>


<div class='speaker'> <div class='speaker'>
<div class="imageInfo"> <div class="imageInfo">
<img src='/images/matt-aimonetti.jpg' class='speaker' width='150' height='150' /> <img src='/images/speakers/matt-aimonetti.jpg' class='speaker' width='150' height='150' />
<div class="clear"></div> <div class="clear"></div>
<div class="socialmedia"> <div class="socialmedia">
<a class="twitter" href="https://twitter.com/#!/merbist">@merbist</a> <a class="twitter" href="https://twitter.com/#!/merbist">@merbist</a>
Expand All @@ -138,6 +144,7 @@ <h3>Speakers</h3>
</div> </div>
<div class="speaker-content"> <div class="speaker-content">
<div class='name'>Matt Aimonetti</div> <div class='name'>Matt Aimonetti</div>
<div class='company'><em>LivingSocial</em></div>
<div class='session'></div> <div class='session'></div>
<p>R&amp;D Engineer at LivingSocial - Former Sony PlayStation developer.</p> <p>R&amp;D Engineer at LivingSocial - Former Sony PlayStation developer.</p>
</div> </div>
Expand All @@ -146,7 +153,7 @@ <h3>Speakers</h3>


<div class='speaker'> <div class='speaker'>
<div class="imageInfo"> <div class="imageInfo">
<img src='/images/mark_bates.jpg' class='speaker' width='150' height='150' /> <img src='/images/speakers/mark_bates.jpg' class='speaker' width='150' height='150' />
<div class="clear"></div> <div class="clear"></div>
<div class="socialmedia"> <div class="socialmedia">
<!--<a class="twitter" href=""></a></p>--> <!--<a class="twitter" href=""></a></p>-->
Expand All @@ -156,6 +163,7 @@ <h3>Speakers</h3>
</div> </div>
<div class="speaker-content"> <div class="speaker-content">
<div class='name'>Mark Bates</div> <div class='name'>Mark Bates</div>
<div class='company'><em>Meta42 Labs, LLC</em></div>
<div class='session'></div> <div class='session'></div>
<p>Mark Bates is the founder and chief architect of the Boston, MA based consulting <p>Mark Bates is the founder and chief architect of the Boston, MA based consulting
company, Meta42 Labs. Mark spends his days focusing on new application development company, Meta42 Labs. Mark spends his days focusing on new application development
Expand All @@ -177,7 +185,7 @@ <h3>Speakers</h3>


<div class='speaker'> <div class='speaker'>
<div class="imageInfo"> <div class="imageInfo">
<img src='/images/james_gray.png' class='speaker' width='150' height='150' /> <img src='/images/speakers/james_gray.png' class='speaker' width='150' height='150' />
<div class="clear"></div> <div class="clear"></div>
<div class="socialmedia"> <div class="socialmedia">
<a class="twitter" href="https://twitter.com/#!/JEG2">@JEG2</a> <a class="twitter" href="https://twitter.com/#!/JEG2">@JEG2</a>
Expand All @@ -187,6 +195,7 @@ <h3>Speakers</h3>
</div> </div>
<div class="speaker-content"> <div class="speaker-content">
<div class='name'>James Edward Gray</div> <div class='name'>James Edward Gray</div>
<div class='company'><em>Gray Productions Software Inc.</em></div>
<div class='session'> <div class='session'>
<strong>Session:</strong> Ten Things You Didn't Know Ruby Could Do <strong>Session:</strong> Ten Things You Didn't Know Ruby Could Do
</div> </div>
Expand All @@ -207,6 +216,7 @@ <h3>Speakers</h3>
</div> </div>
<div class="speaker-content"> <div class="speaker-content">
<div class='name'>Zach Holman</div> <div class='name'>Zach Holman</div>
<div class='company'><em>GitHub</em></div>
<div class='session'> <div class='session'>
<strong>Session:</strong> Ruby: You've Changed, Bro. <strong>Session:</strong> Ruby: You've Changed, Bro.
</div> </div>
Expand All @@ -227,6 +237,7 @@ <h3>Speakers</h3>
</div> </div>
<div class="speaker-content"> <div class="speaker-content">
<div class='name'>Wesley Beary</div> <div class='name'>Wesley Beary</div>
<div class='company'><em>Heroku</em></div>
<div class='session'> <div class='session'>
<strong>Session:</strong> Maintain Less, Mentor More: Community Building Techniques from Open Source <strong>Session:</strong> Maintain Less, Mentor More: Community Building Techniques from Open Source
</div> </div>
Expand Down
7 changes: 5 additions & 2 deletions public/registration.html
View file
Open in desktop
Expand Up @@ -2,8 +2,11 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<link rel="stylesheet" href="stylesheets/style.css" />
<link rel="stylesheet" href="stylesheets/wufoo.css" /> <link rel="stylesheet" href="stylesheets/wufoo.css" />
<link rel="stylesheet" href="stylesheets/style.css" />

<!-- Icons -->
<link rel="shortcut icon" href="images/icons/favicon.ico">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>
<script type="text/javascript"> <script type="text/javascript">
if (typeof jQuery == 'undefined') if (typeof jQuery == 'undefined')
Expand Down Expand Up @@ -35,7 +38,7 @@
<li class="page-3"><a href="sponsors">Sponsors</a></li> <li class="page-3"><a href="sponsors">Sponsors</a></li>
</ul> </ul>
<a id="logo" class="home" href="index.html" title="Return to the homepage"> <a id="logo" class="home" href="index.html" title="Return to the homepage">
<img src="images/logo.png" alt="Aloha Ruby Conference" /> <img src="images/aloharuby-logo.png" alt="Aloha Ruby Conference" />
</a> </a>
<ul id="leftLinks"> <ul id="leftLinks">
<li class="page-4"><a href="#">Training</a></li> <li class="page-4"><a href="#">Training</a></li>
Expand Down
7 changes: 5 additions & 2 deletions public/sponsors.html
View file
Open in desktop
Expand Up @@ -2,8 +2,11 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<link rel="stylesheet" href="stylesheets/style.css" />
<link rel="stylesheet" href="stylesheets/wufoo.css" /> <link rel="stylesheet" href="stylesheets/wufoo.css" />
<link rel="stylesheet" href="stylesheets/style.css" />

<!-- Icons -->
<link rel="shortcut icon" href="images/icons/favicon.ico">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>
<script type="text/javascript"> <script type="text/javascript">
if (typeof jQuery == 'undefined') if (typeof jQuery == 'undefined')
Expand Down Expand Up @@ -35,7 +38,7 @@
<li class="page-3 current"><a href="sponsors">Sponsors</a></li> <li class="page-3 current"><a href="sponsors">Sponsors</a></li>
</ul> </ul>
<a id="logo" class="home" href="index.html" title="Return to the homepage"> <a id="logo" class="home" href="index.html" title="Return to the homepage">
<img src="images/logo.png" alt="Aloha Ruby Conference" /> <img src="images/aloharuby-logo.png" alt="Aloha Ruby Conference" />
</a> </a>
<ul id="leftLinks"> <ul id="leftLinks">
<li class="page-4"><a href="training">Training</a></li> <li class="page-4"><a href="training">Training</a></li>
Expand Down