[Code Review] Updated Live site styles #41

Merged
merged 9 commits into from Mar 19, 2012
Jump to file
+193 −117
Split
View
@@ -4,6 +4,9 @@
<meta charset="UTF-8">
<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 type="text/javascript">
if (typeof jQuery == 'undefined')
@@ -35,7 +38,7 @@
<li class="page-3 current"><a href="sponsors">Sponsors</a></li>
</ul>
<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>
<ul id="leftLinks">
<li class="page-4"><a href="training">Training</a></li>
@@ -156,7 +159,7 @@ <h3 id="title153">Speaker Info</h3>
</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>
</li>
-
+ <div class="clear hr"></div>
<li id="foli152" class="notranslate section">
<section>
<h3 id="title152">Talk Info</h3>
View
@@ -4,6 +4,9 @@
<meta charset="UTF-8">
<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 type="text/javascript">
if (typeof jQuery == 'undefined')
@@ -35,7 +38,7 @@
<li class="page-3"><a href="sponsors">Sponsors</a></li>
</ul>
<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>
<ul id="leftLinks">
<li class="page-4"><a href="training">Training</a></li>
File renamed without changes
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Deleted file not rendered
View
@@ -2,8 +2,11 @@
<html lang="en">
<head>
<meta charset="UTF-8">
- <link rel="stylesheet" href="stylesheets/style.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 type="text/javascript">
if (typeof jQuery == 'undefined')
@@ -35,7 +38,7 @@
<li class="page-3"><a href="sponsors">Sponsors</a></li>
</ul>
<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>
<ul id="leftLinks">
<li class="page-4"><a href="training">Training</a></li>
View
@@ -2,8 +2,11 @@
<html lang="en">
<head>
<meta charset="UTF-8">
- <link rel="stylesheet" href="stylesheets/style.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 type="text/javascript">
if (typeof jQuery == 'undefined')
@@ -35,7 +38,7 @@
<li class="page-3"><a href="sponsors">Sponsors</a></li>
</ul>
<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>
<ul id="leftLinks">
<li class="page-4"><a href="training">Training</a></li>
@@ -94,9 +97,7 @@ <h1 id="title">Location</h1>
</div>
<div class="quote">
<p class="locationAction">Request a quote below from Hawaii-Aloha Travel:</br>
- <a id="registrationButton" href="http://hawaii-aloha.com/html/alohaconf.html">
- <span>Request a Quote!</span>
- </a>
+ <a id="registrationButton" href="http://hawaii-aloha.com/html/alohaconf.html"><span>Request a Quote!</span></a>
</p>
</div>
<div class='clear'></div>
View
@@ -2,8 +2,11 @@
<html lang="en">
<head>
<meta charset="UTF-8">
- <link rel="stylesheet" href="stylesheets/style.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 type="text/javascript">
if (typeof jQuery == 'undefined')
@@ -35,7 +38,7 @@
<li class="page-3"><a href="sponsors">Sponsors</a></li>
</ul>
<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>
<ul id="leftLinks">
<li class="page-4"><a href="training">Training</a></li>
@@ -57,10 +60,10 @@ <h1 id="title">Media</h1>
<section id="registrationAvailable">
<div id="info">
</div>
- <section id="speakers">
+ <section id="speakers" class="badges">
<h3>Badges</h3>
<div class='speaker first'>
- <p>Speaking</p>
+ <p>Speaking Badge</p>
<img src='/images/aloharuby-badge-speaker.jpg'>
<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;
@@ -69,7 +72,7 @@ <h1 id="title">Media</h1>
</div>
<div class='speaker first'>
- <p>Attending</p>
+ <p>Attending Badge</p>
<img src='/images/aloharuby-badges-attendant.jpg'>
<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;
@@ -78,7 +81,7 @@ <h1 id="title">Media</h1>
</div>
<div class='speaker last'>
- <p>Sponsoring</p>
+ <p>Sponsoring Badge</p>
<img src='/images/aloharuby-badge-sponsor.jpg'>
<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;
View
@@ -2,8 +2,11 @@
<html lang="en">
<head>
<meta charset="UTF-8">
- <link rel="stylesheet" href="stylesheets/style.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 type="text/javascript">
if (typeof jQuery == 'undefined')
@@ -35,7 +38,7 @@
<li class="page-3"><a href="sponsors">Sponsors</a></li>
</ul>
<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>
<ul id="leftLinks">
<li class="page-4"><a href="training">Training</a></li>
@@ -62,7 +65,7 @@ <h1 id="title">Program</h1>
<h3>Speakers</h3>
<div class='speaker first'>
<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="socialmedia">
<a class="twitter" href="https://twitter.com/#!/tenderlove">@tenderlove</a>
@@ -72,6 +75,7 @@ <h1 id="title">Program</h1>
</div>
<div class="speaker-content">
<div class='name'>Aaron Patterson</div>
+ <div class='company'><em>AT&amp;T Interactive</em></div>
<div class='session'><strong>Keynote</strong></div>
<p>When he isn’t ruining people’s lives by writing software like
phuby, enterprise, and neversaydie, Aaron can be found writing
@@ -86,7 +90,7 @@ <h1 id="title">Program</h1>
<div class='speaker'>
<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="socialmedia">
<a class="twitter" href="https://twitter.com/#!/chadfowler">@chadfowler</a>
@@ -96,6 +100,7 @@ <h1 id="title">Program</h1>
</div>
<div class="speaker-content">
<div class='name'>Chad Fowler</div>
+ <div class='company'><em>LivingSocial</em></div>
<div class='session'></div>
<p>VP Engineering at LivingSocial, author, technologist, consultant, speaker, teacher, musician, organizer.</p>
</div>
@@ -104,7 +109,7 @@ <h1 id="title">Program</h1>
<div class='speaker'>
<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="socialmedia">
<a class="twitter" href="https://twitter.com/#!/igrigorik">@igrigorik</a>
@@ -114,6 +119,7 @@ <h1 id="title">Program</h1>
</div>
<div class="speaker-content">
<div class='name'>Ilya Grigorik</div>
+ <div class='company'><em>Google</em></div>
<div class='session'></div>
<p>Ilya Grigorik is a developer, an open-source and Ruby evangelist,
a data-geek, and a proverbial early adopter of all things digital.
@@ -128,7 +134,7 @@ <h1 id="title">Program</h1>
<div class='speaker'>
<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="socialmedia">
<a class="twitter" href="https://twitter.com/#!/merbist">@merbist</a>
@@ -138,6 +144,7 @@ <h1 id="title">Program</h1>
</div>
<div class="speaker-content">
<div class='name'>Matt Aimonetti</div>
+ <div class='company'><em>LivingSocial</em></div>
<div class='session'></div>
<p>R&amp;D Engineer at LivingSocial - Former Sony PlayStation developer.</p>
</div>
@@ -146,7 +153,7 @@ <h1 id="title">Program</h1>
<div class='speaker'>
<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="socialmedia">
<!--<a class="twitter" href=""></a></p>-->
@@ -156,6 +163,7 @@ <h1 id="title">Program</h1>
</div>
<div class="speaker-content">
<div class='name'>Mark Bates</div>
+ <div class='company'><em>Meta42 Labs, LLC</em></div>
<div class='session'></div>
<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
@@ -177,7 +185,7 @@ <h1 id="title">Program</h1>
<div class='speaker'>
<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="socialmedia">
<a class="twitter" href="https://twitter.com/#!/JEG2">@JEG2</a>
@@ -187,6 +195,7 @@ <h1 id="title">Program</h1>
</div>
<div class="speaker-content">
<div class='name'>James Edward Gray</div>
+ <div class='company'><em>Gray Productions Software Inc.</em></div>
<div class='session'>
<strong>Session:</strong> Ten Things You Didn't Know Ruby Could Do
</div>
@@ -207,6 +216,7 @@ <h1 id="title">Program</h1>
</div>
<div class="speaker-content">
<div class='name'>Zach Holman</div>
+ <div class='company'><em>GitHub</em></div>
<div class='session'>
<strong>Session:</strong> Ruby: You've Changed, Bro.
</div>
@@ -227,6 +237,7 @@ <h1 id="title">Program</h1>
</div>
<div class="speaker-content">
<div class='name'>Wesley Beary</div>
+ <div class='company'><em>Heroku</em></div>
<div class='session'>
<strong>Session:</strong> Maintain Less, Mentor More: Community Building Techniques from Open Source
</div>
@@ -2,8 +2,11 @@
<html lang="en">
<head>
<meta charset="UTF-8">
- <link rel="stylesheet" href="stylesheets/style.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 type="text/javascript">
if (typeof jQuery == 'undefined')
@@ -35,7 +38,7 @@
<li class="page-3"><a href="sponsors">Sponsors</a></li>
</ul>
<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>
<ul id="leftLinks">
<li class="page-4"><a href="#">Training</a></li>
@@ -2,8 +2,11 @@
<html lang="en">
<head>
<meta charset="UTF-8">
- <link rel="stylesheet" href="stylesheets/style.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 type="text/javascript">
if (typeof jQuery == 'undefined')
@@ -35,7 +38,7 @@
<li class="page-3 current"><a href="sponsors">Sponsors</a></li>
</ul>
<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>
<ul id="leftLinks">
<li class="page-4"><a href="training">Training</a></li>
Oops, something went wrong.