Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #41 from jwang/live_site-styles

[Code Review] Updated Live site styles
  • Loading branch information...
commit 34e03d421ce6bdbf72494c227cc059ed3454085e 2 parents a9a8192 + 447ad55
John Wang authored
Showing with 193 additions and 117 deletions.
  1. +5 −2 public/cfp.html
  2. +4 −1 public/contact.html
  3. 0  public/images/{logo.png → aloharuby-logo.png}
  4. BIN  public/images/arrow.png
  5. BIN  public/images/google-icon.png
  6. BIN  public/images/icon-github.png
  7. BIN  public/images/icon-location.png
  8. BIN  public/images/icon-registration.png
  9. BIN  public/images/icon-speakers.png
  10. BIN  public/images/icon-sponsors.png
  11. BIN  public/images/icon-twitter.png
  12. BIN  public/images/icon-world.png
  13. BIN  public/images/rails.png
  14. BIN  public/images/register-button-hover.png
  15. BIN  public/images/register-button.png
  16. 0  public/images/{ → speakers}/aaron-patterson.png
  17. 0  public/images/{ → speakers}/chad-fowler.jpg
  18. 0  public/images/{ → speakers}/chad_fowler.png
  19. 0  public/images/{ → speakers}/ilya-grigorik.jpg
  20. 0  public/images/{ → speakers}/james_gray.png
  21. 0  public/images/{ → speakers}/mark_bates.jpg
  22. 0  public/images/{ → speakers}/matt-aimonetti.jpg
  23. BIN  public/images/sponsors/jumpstartlab-logo.png
  24. BIN  public/images/twitter-icon.png
  25. +5 −2 public/index.html
  26. +6 −5 public/location.html
  27. +9 −6 public/media.html
  28. +19 −8 public/program.html
  29. +5 −2 public/registration.html
  30. +5 −2 public/sponsors.html
  31. +47 −15 public/stylesheets/style.css
  32. +88 −74 public/training.html
7 public/cfp.html
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>
5 public/contact.html
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>
0  public/images/logo.png → public/images/aloharuby-logo.png
View
File renamed without changes
BIN  public/images/arrow.png
View
Deleted file not rendered
BIN  public/images/google-icon.png
View
Deleted file not rendered
BIN  public/images/icon-github.png
View
Deleted file not rendered
BIN  public/images/icon-location.png
View
Deleted file not rendered
BIN  public/images/icon-registration.png
View
Deleted file not rendered
BIN  public/images/icon-speakers.png
View
Deleted file not rendered
BIN  public/images/icon-sponsors.png
View
Deleted file not rendered
BIN  public/images/icon-twitter.png
View
Deleted file not rendered
BIN  public/images/icon-world.png
View
Deleted file not rendered
BIN  public/images/rails.png
View
Deleted file not rendered
BIN  public/images/register-button-hover.png
View
Deleted file not rendered
BIN  public/images/register-button.png
View
Deleted file not rendered
0  public/images/aaron-patterson.png → public/images/speakers/aaron-patterson.png
View
File renamed without changes
0  public/images/chad-fowler.jpg → public/images/speakers/chad-fowler.jpg
View
File renamed without changes
0  public/images/chad_fowler.png → public/images/speakers/chad_fowler.png
View
File renamed without changes
0  public/images/ilya-grigorik.jpg → public/images/speakers/ilya-grigorik.jpg
View
File renamed without changes
0  public/images/james_gray.png → public/images/speakers/james_gray.png
View
File renamed without changes
0  public/images/mark_bates.jpg → public/images/speakers/mark_bates.jpg
View
File renamed without changes
0  public/images/matt-aimonetti.jpg → public/images/speakers/matt-aimonetti.jpg
View
File renamed without changes
BIN  public/images/sponsors/jumpstartlab-logo.png
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
BIN  public/images/twitter-icon.png
View
Deleted file not rendered
7 public/index.html
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>
11 public/location.html
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>
15 public/media.html
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;
27 public/program.html
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>
7 public/registration.html
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</a></li>
7 public/sponsors.html
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 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>
62 public/stylesheets/style.css
View
@@ -220,7 +220,7 @@ div.twitter{
}
#footer div.socialMedia a.twitter{
- background: url('../images/twitter-icon.png') no-repeat 0 0;
+ background: url('../images/icons/twitter-icon.png') no-repeat 0 0;
width: 37px;
height: 0;
padding: 28px 0 0;
@@ -229,7 +229,7 @@ div.twitter{
}
#footer div.socialMedia a.googlePlus{
- background: url('../images/google-icon.png') no-repeat 0 0;
+ background: url('../images/icons/google-icon.png') no-repeat 0 0;
width: 30px;
height: 0;
padding: 30px 0 0;
@@ -332,7 +332,7 @@ div.twitter{
}
#registrationButton span, .registrationButton span {
- display: block;
+ display: block !important;
text-align: center;
font-size: 28px;
font-family: 'Museo-700', sans-serif;
@@ -424,7 +424,7 @@ div.twitter{
}
#registrationAvailable h3{
- background: url('../images/icon-registration.png') no-repeat 0 7px;
+ background: url('../images/icons/icon-registration.png') no-repeat 0 7px;
padding: 0 0 0 50px;
}
@@ -449,12 +449,12 @@ div.twitter{
}
#location h2#title{
- background: url('../images/icon-location.png') no-repeat 0 7px;
+ background: url('../images/icons/icon-location.png') no-repeat 0 7px;
padding: 0 0 0 30px;
}
a.learnMore{
- background: url('../images/arrow.png') no-repeat 95px 5px;
+ background: url('../images/icons/arrow.png') no-repeat 95px 5px;
font-size: 16px;
color: #bf7334;
text-shadow: 1px 2px 0px rgba(255,255,255, 0.4);
@@ -564,11 +564,11 @@ a.learnMore{
}
#speakerSignUp h4{
- background: url('../images/icon-speakers.png') no-repeat 0 7px;
+ background: url('../images/icons/icon-speakers.png') no-repeat 0 7px;
}
#sponsorSignUp h4, #currentSponsors h4{
- background: url('../images/icon-sponsors.png') no-repeat 0 7px;
+ background: url('../images/icons/icon-sponsors.png') no-repeat 0 7px;
}
#mainContent.sub #registrationAvailable h4{
@@ -576,10 +576,14 @@ a.learnMore{
color: #bf7334;
}
-#currentSponsors p{
+#currentSponsors p, #schedule.sidebar .sponsorInfo p{
text-align: center;
}
+#schedule.sidebar .sponsorInfo p{
+ margin: 20px 0 0;
+}
+
#currentSponsors p a{
margin: 0 auto 30px;
display: block;
@@ -651,8 +655,9 @@ a.learnMore{
#location table td.code span.line {
display: block;
font-family: monospace;
- padding-top: 2px;
+ padding-top: 5px;
line-height: 18px;
+ font-size: 14px;
}
.quote{
@@ -698,12 +703,19 @@ div.imageInfo{
.name{
font-size: 24px;
text-shadow: 1px 2px 0px rgba(255, 255, 255, 0.5);
+ padding: 0 0 5px !important;
}
.name, .session{
padding: 0 0 10px
}
+.company em{
+ padding: 0 0 10px;
+ display: block;
+ font-size: 14px;
+}
+
div.speaker-content{
float: left;
width: 380px;
@@ -722,27 +734,31 @@ div.speaker .socialmedia a{
}
div.speaker .socialmedia a.twitter{
- background: url('../images/icon-twitter.png') no-repeat left 0px;
+ background: url('../images/icons/icon-twitter.png') no-repeat left 0px;
height: 17px;
padding: 3px 0 0 28px;
margin: 0 0 6px 0px !important;
}
div.speaker .socialmedia a.github{
- background: url('../images/icon-github.png') no-repeat left 0px;
+ background: url('../images/icons/icon-github.png') no-repeat left 0px;
padding: 8px 0 0 35px;
}
div.speaker .socialmedia a.website{
- background: url('../images/icon-world.png') no-repeat 8px 0px;
+ background: url('../images/icons/icon-world.png') no-repeat 8px 0px;
}
-section#speakers{
+section#speakers, section#trainingInfo, section#speakers.badges{
width: 610px;
float: left;
margin: 20px 0 0;
}
+section#trainingInfo, section#speakers.badges{
+ margin: 0;
+}
+
aside#sidebar{
width: 260px;
float: left;
@@ -848,7 +864,10 @@ form li.section {
form li#foli141{
/*width: 100%;*/
- padding: 0 0 30px;
+ padding: 0 0 30px;
+}
+
+form div.clear.hr{
border-bottom: 2px solid rgba(143, 127, 110, .4);
}
@@ -938,6 +957,18 @@ form li.focused {
display: none !important;
}
+/***************************
+Media Page
+***************************/
+
+section#speakers.badges div.speaker img{
+ margin: 0 0 20px;
+}
+
+section#speakers.badges div.speaker.first code {
+ font-size: 14px;
+}
+
/***************************
Classes
@@ -956,6 +987,7 @@ img.speaker, .speaker-info {
}
img.speaker {
+ background: rgba(255, 255, 255, 0.65);
}
.speaker-info {
162 public/training.html
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 current"><a href="training">Training</a></li>
@@ -56,78 +59,89 @@ <h1 id="title">Training</h1>
<section id="mainContent" class="sub">
<section id="location">
- <h3 class="entry-title">Advanced Patterns with Rails</h3>
-
- <p>Welcome! First, open this page in your browser:</p>
- <p><a href="http://jumpstartlab.com/codemash-pm">http://jumpstartlab.com/codemash-pm</a></p>
- <h2>Setting Expectations</h2>
- <h3>Is this the right session for you?</h3>
- <p>You belong here if:</p>
- <ul>
- <li>You feel <em>very</em> comfortable working with Ruby and Rails</li>
- <li>You have built several Rails projects</li>
- <li>You’re interested in some new ideas</li>
- <li>You’re willing to wrestle with things that might not work the first time</li>
- </ul>
-
- <p>This is <em>not</em> a good session for you if:</p>
-
- <ul>
- <li>You’re new to Ruby/Rails</li>
- <li>You were in my session this morning</li>
- <li>You want everything to go smoothly</li>
- <li>You only came for the "worker pattern", because I decided it didn’t fit</li>
- </ul>
-
- <h3>Are you prepared?</h3>
- <p>You need:</p>
- <ul>
- <li>To join the chatroom at <a href="http://jumpstartlab.com/chat">http://jumpstartlab.com/chat</a></li>
- <li>Ruby 1.9.2 or greater</li>
- <li>Rails 3.1.3 or greater</li>
- <li>Setup the sample project</li>
- </ul>
-
- <div class="note">
- <p>Get the JSBlogger project from Github and run setup procedures:</p>
- <table>
- <tbody>
- <tr>
- <td class="code">
- <span class="line">1 <span>git clone git://github.com/JumpstartLab/jsblogger_advanced.git</span></span>
- <span class="line">2 <span>cd jsblogger_advanced</span></span>
- <span class="line">3 <span>bundle</span></span>
- <span class="line">4 <span>rake db:setup</span></span>
- <span class="line">5 <span>rake</span></span>
- </td>
- </tr>
- </tbody>
- </table>
- <p>All existing tests should pass. Optionally, run the tests continuously while developing by running <code>guard</code></p>
- </div>
-
- <p>You can also run the tests continuously as we make changes by starting <code>guard</code></p>
-
- <h2>The Plan</h2>
- <p>We’re going to approach this in four segments of about one hour each.</p>
-
- <h3>Decorator Pattern with Draper</h3>
- <p>Open the tutorial at <a href="http://tutorials.jumpstartlab.com/topics/decorators.html">http://tutorials.jumpstartlab.com/topics/decorators.html</a></p>
-
- <h3>Slimming Controllers</h3>
- <p>Open the tutorial at <a href="http://tutorials.jumpstartlab.com/topics/controllers/slimming_controllers.html">http://tutorials.jumpstartlab.com/topics/controllers/slimming_controllers.html</a></p>
-
- <h3>Facade Pattern</h3>
- <p>Open the tutorial at <a href="http://tutorials.jumpstartlab.com/topics/models/facade_pattern.html">http://tutorials.jumpstartlab.com/topics/models/facade_pattern.html</a></p>
-
- <h3>Better Models with Modules</h3>
- <p>Open the tutorial at <a href="http://tutorials.jumpstartlab.com/topics/models/modules.html">http://tutorials.jumpstartlab.com/topics/models/modules.html</a></p>
-
- <h2>Contributing</h2>
- <p>You’re strongly invited to help improve these tutorials, even while we’re running the session. All the text is available on Github, so you can edit it right in the browser. Hit the "Feedback" tab on the left side of any page.</p>
-
- <p>Enjoy!</p>
-
+ <h3 class="entry-title">Training Session: Advanced Patterns with Rails</h3>
+
+ <section id="trainingInfo">
+ <p>Welcome! First, open this page in your browser:</p>
+ <p><a href="http://jumpstartlab.com/codemash-pm">http://jumpstartlab.com/codemash-pm</a></p>
+ <h2>Setting Expectations</h2>
+ <h3>Is this the right session for you?</h3>
+ <p>You belong here if:</p>
+ <ul>
+ <li>You feel <em>very</em> comfortable working with Ruby and Rails</li>
+ <li>You have built several Rails projects</li>
+ <li>You’re interested in some new ideas</li>
+ <li>You’re willing to wrestle with things that might not work the first time</li>
+ </ul>
+
+ <p>This is <em>not</em> a good session for you if:</p>
+
+ <ul>
+ <li>You’re new to Ruby/Rails</li>
+ <li>You were in my session this morning</li>
+ <li>You want everything to go smoothly</li>
+ <li>You only came for the "worker pattern", because I decided it didn’t fit</li>
+ </ul>
+
+ <h3>Are you prepared?</h3>
+ <p>You need:</p>
+ <ul>
+ <li>To join the chatroom at <a href="http://jumpstartlab.com/chat">http://jumpstartlab.com/chat</a></li>
+ <li>Ruby 1.9.2 or greater</li>
+ <li>Rails 3.1.3 or greater</li>
+ <li>Setup the sample project</li>
+ </ul>
+
+ <div class="note">
+ <p>Get the JSBlogger project from Github and run setup procedures:</p>
+ <table>
+ <tbody>
+ <tr>
+ <td class="code">
+ <span class="line">1 <span>git clone git://github.com/JumpstartLab/jsblogger_advanced.git</span></span>
+ <span class="line">2 <span>cd jsblogger_advanced</span></span>
+ <span class="line">3 <span>bundle</span></span>
+ <span class="line">4 <span>rake db:setup</span></span>
+ <span class="line">5 <span>rake</span></span>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ <p>All existing tests should pass. Optionally, run the tests continuously while developing by running <code>guard</code></p>
+ </div>
+
+ <p>You can also run the tests continuously as we make changes by starting <code>guard</code></p>
+
+ <h2>The Plan</h2>
+ <p>We’re going to approach this in four segments of about one hour each.</p>
+
+ <h3>Decorator Pattern with Draper</h3>
+ <p>Open the tutorial at <a href="http://tutorials.jumpstartlab.com/topics/decorators.html">http://tutorials.jumpstartlab.com/topics/decorators.html</a></p>
+
+ <h3>Slimming Controllers</h3>
+ <p>Open the tutorial at <a href="http://tutorials.jumpstartlab.com/topics/controllers/slimming_controllers.html">http://tutorials.jumpstartlab.com/topics/controllers/slimming_controllers.html</a></p>
+
+ <h3>Facade Pattern</h3>
+ <p>Open the tutorial at <a href="http://tutorials.jumpstartlab.com/topics/models/facade_pattern.html">http://tutorials.jumpstartlab.com/topics/models/facade_pattern.html</a></p>
+
+ <h3>Better Models with Modules</h3>
+ <p>Open the tutorial at <a href="http://tutorials.jumpstartlab.com/topics/models/modules.html">http://tutorials.jumpstartlab.com/topics/models/modules.html</a></p>
+
+ <h2>Contributing</h2>
+ <p>You’re strongly invited to help improve these tutorials, even while we’re running the session. All the text is available on Github, so you can edit it right in the browser. Hit the "Feedback" tab on the left side of any page.</p>
+
+ <p>Enjoy!</p>
+ </section>
+ <aside id="schedule" class="sidebar">
+ <h3>Sponsored by:</h3>
+ <div class="sponsorInfo">
+ <p>
+ <a href='http://jumpstartlab.com/' alt="JumpstartLab">
+ <img src='/images/sponsors/jumpstartlab-logo.png' />
+ </a>
+ </p>
+ </div>
+ </aside>
<div class='clear'></div>
</section>
</section><!-- End of Main Content -->
Please sign in to comment.
Something went wrong with that request. Please try again.