Skip to content
This repository
Browse code

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 32 changed files with 193 additions and 117 deletions. Show diff stats Hide diff stats

  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
@@ -4,6 +4,9 @@
4 4 <meta charset="UTF-8">
5 5 <link rel="stylesheet" href="stylesheets/wufoo.css" />
6 6 <link rel="stylesheet" href="stylesheets/style.css" />
  7 +
  8 + <!-- Icons -->
  9 + <link rel="shortcut icon" href="images/icons/favicon.ico">
7 10 <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>
8 11 <script type="text/javascript">
9 12 if (typeof jQuery == 'undefined')
@@ -35,7 +38,7 @@
35 38 <li class="page-3 current"><a href="sponsors">Sponsors</a></li>
36 39 </ul>
37 40 <a id="logo" class="home" href="index.html" title="Return to the homepage">
38   - <img src="images/logo.png" alt="Aloha Ruby Conference" />
  41 + <img src="images/aloharuby-logo.png" alt="Aloha Ruby Conference" />
39 42 </a>
40 43 <ul id="leftLinks">
41 44 <li class="page-4"><a href="training">Training</a></li>
@@ -156,7 +159,7 @@ <h3 id="title153">Speaker Info</h3>
156 159 </div>
157 160 <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>
158 161 </li>
159   -
  162 + <div class="clear hr"></div>
160 163 <li id="foli152" class="notranslate section">
161 164 <section>
162 165 <h3 id="title152">Talk Info</h3>
5 public/contact.html
@@ -4,6 +4,9 @@
4 4 <meta charset="UTF-8">
5 5 <link rel="stylesheet" href="stylesheets/wufoo.css" />
6 6 <link rel="stylesheet" href="stylesheets/style.css" />
  7 +
  8 + <!-- Icons -->
  9 + <link rel="shortcut icon" href="images/icons/favicon.ico">
7 10 <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>
8 11 <script type="text/javascript">
9 12 if (typeof jQuery == 'undefined')
@@ -35,7 +38,7 @@
35 38 <li class="page-3"><a href="sponsors">Sponsors</a></li>
36 39 </ul>
37 40 <a id="logo" class="home" href="index.html" title="Return to the homepage">
38   - <img src="images/logo.png" alt="Aloha Ruby Conference" />
  41 + <img src="images/aloharuby-logo.png" alt="Aloha Ruby Conference" />
39 42 </a>
40 43 <ul id="leftLinks">
41 44 <li class="page-4"><a href="training">Training</a></li>
0  public/images/logo.png → public/images/aloharuby-logo.png
File renamed without changes
BIN  public/images/arrow.png
BIN  public/images/google-icon.png
BIN  public/images/icon-github.png
BIN  public/images/icon-location.png
BIN  public/images/icon-registration.png
BIN  public/images/icon-speakers.png
BIN  public/images/icon-sponsors.png
BIN  public/images/icon-twitter.png
BIN  public/images/icon-world.png
BIN  public/images/rails.png
BIN  public/images/register-button-hover.png
BIN  public/images/register-button.png
0  public/images/aaron-patterson.png → public/images/speakers/aaron-patterson.png
File renamed without changes
0  public/images/chad-fowler.jpg → public/images/speakers/chad-fowler.jpg
File renamed without changes
0  public/images/chad_fowler.png → public/images/speakers/chad_fowler.png
File renamed without changes
0  public/images/ilya-grigorik.jpg → public/images/speakers/ilya-grigorik.jpg
File renamed without changes
0  public/images/james_gray.png → public/images/speakers/james_gray.png
File renamed without changes
0  public/images/mark_bates.jpg → public/images/speakers/mark_bates.jpg
File renamed without changes
0  public/images/matt-aimonetti.jpg → public/images/speakers/matt-aimonetti.jpg
File renamed without changes
BIN  public/images/sponsors/jumpstartlab-logo.png
BIN  public/images/twitter-icon.png
7 public/index.html
@@ -2,8 +2,11 @@
2 2 <html lang="en">
3 3 <head>
4 4 <meta charset="UTF-8">
5   - <link rel="stylesheet" href="stylesheets/style.css" />
6 5 <link rel="stylesheet" href="stylesheets/wufoo.css" />
  6 + <link rel="stylesheet" href="stylesheets/style.css" />
  7 +
  8 + <!-- Icons -->
  9 + <link rel="shortcut icon" href="images/icons/favicon.ico">
7 10 <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>
8 11 <script type="text/javascript">
9 12 if (typeof jQuery == 'undefined')
@@ -35,7 +38,7 @@
35 38 <li class="page-3"><a href="sponsors">Sponsors</a></li>
36 39 </ul>
37 40 <a id="logo" class="home" href="index.html" title="Return to the homepage">
38   - <img src="images/logo.png" alt="Aloha Ruby Conference" />
  41 + <img src="images/aloharuby-logo.png" alt="Aloha Ruby Conference" />
39 42 </a>
40 43 <ul id="leftLinks">
41 44 <li class="page-4"><a href="training">Training</a></li>
11 public/location.html
@@ -2,8 +2,11 @@
2 2 <html lang="en">
3 3 <head>
4 4 <meta charset="UTF-8">
5   - <link rel="stylesheet" href="stylesheets/style.css" />
6 5 <link rel="stylesheet" href="stylesheets/wufoo.css" />
  6 + <link rel="stylesheet" href="stylesheets/style.css" />
  7 +
  8 + <!-- Icons -->
  9 + <link rel="shortcut icon" href="images/icons/favicon.ico">
7 10 <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>
8 11 <script type="text/javascript">
9 12 if (typeof jQuery == 'undefined')
@@ -35,7 +38,7 @@
35 38 <li class="page-3"><a href="sponsors">Sponsors</a></li>
36 39 </ul>
37 40 <a id="logo" class="home" href="index.html" title="Return to the homepage">
38   - <img src="images/logo.png" alt="Aloha Ruby Conference" />
  41 + <img src="images/aloharuby-logo.png" alt="Aloha Ruby Conference" />
39 42 </a>
40 43 <ul id="leftLinks">
41 44 <li class="page-4"><a href="training">Training</a></li>
@@ -94,9 +97,7 @@ <h1 id="title">Location</h1>
94 97 </div>
95 98 <div class="quote">
96 99 <p class="locationAction">Request a quote below from Hawaii-Aloha Travel:</br>
97   - <a id="registrationButton" href="http://hawaii-aloha.com/html/alohaconf.html">
98   - <span>Request a Quote!</span>
99   - </a>
  100 + <a id="registrationButton" href="http://hawaii-aloha.com/html/alohaconf.html"><span>Request a Quote!</span></a>
100 101 </p>
101 102 </div>
102 103 <div class='clear'></div>
15 public/media.html
@@ -2,8 +2,11 @@
2 2 <html lang="en">
3 3 <head>
4 4 <meta charset="UTF-8">
5   - <link rel="stylesheet" href="stylesheets/style.css" />
6 5 <link rel="stylesheet" href="stylesheets/wufoo.css" />
  6 + <link rel="stylesheet" href="stylesheets/style.css" />
  7 +
  8 + <!-- Icons -->
  9 + <link rel="shortcut icon" href="images/icons/favicon.ico">
7 10 <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>
8 11 <script type="text/javascript">
9 12 if (typeof jQuery == 'undefined')
@@ -35,7 +38,7 @@
35 38 <li class="page-3"><a href="sponsors">Sponsors</a></li>
36 39 </ul>
37 40 <a id="logo" class="home" href="index.html" title="Return to the homepage">
38   - <img src="images/logo.png" alt="Aloha Ruby Conference" />
  41 + <img src="images/aloharuby-logo.png" alt="Aloha Ruby Conference" />
39 42 </a>
40 43 <ul id="leftLinks">
41 44 <li class="page-4"><a href="training">Training</a></li>
@@ -57,10 +60,10 @@ <h1 id="title">Media</h1>
57 60 <section id="registrationAvailable">
58 61 <div id="info">
59 62 </div>
60   - <section id="speakers">
  63 + <section id="speakers" class="badges">
61 64 <h3>Badges</h3>
62 65 <div class='speaker first'>
63   - <p>Speaking</p>
  66 + <p>Speaking Badge</p>
64 67 <img src='/images/aloharuby-badge-speaker.jpg'>
65 68 <p><code>
66 69 &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>
69 72 </div>
70 73
71 74 <div class='speaker first'>
72   - <p>Attending</p>
  75 + <p>Attending Badge</p>
73 76 <img src='/images/aloharuby-badges-attendant.jpg'>
74 77 <p><code>
75 78 &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>
78 81 </div>
79 82
80 83 <div class='speaker last'>
81   - <p>Sponsoring</p>
  84 + <p>Sponsoring Badge</p>
82 85 <img src='/images/aloharuby-badge-sponsor.jpg'>
83 86 <p><code>
84 87 &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
@@ -2,8 +2,11 @@
2 2 <html lang="en">
3 3 <head>
4 4 <meta charset="UTF-8">
5   - <link rel="stylesheet" href="stylesheets/style.css" />
6 5 <link rel="stylesheet" href="stylesheets/wufoo.css" />
  6 + <link rel="stylesheet" href="stylesheets/style.css" />
  7 +
  8 + <!-- Icons -->
  9 + <link rel="shortcut icon" href="images/icons/favicon.ico">
7 10 <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>
8 11 <script type="text/javascript">
9 12 if (typeof jQuery == 'undefined')
@@ -35,7 +38,7 @@
35 38 <li class="page-3"><a href="sponsors">Sponsors</a></li>
36 39 </ul>
37 40 <a id="logo" class="home" href="index.html" title="Return to the homepage">
38   - <img src="images/logo.png" alt="Aloha Ruby Conference" />
  41 + <img src="images/aloharuby-logo.png" alt="Aloha Ruby Conference" />
39 42 </a>
40 43 <ul id="leftLinks">
41 44 <li class="page-4"><a href="training">Training</a></li>
@@ -62,7 +65,7 @@ <h1 id="title">Program</h1>
62 65 <h3>Speakers</h3>
63 66 <div class='speaker first'>
64 67 <div class="imageInfo">
65   - <img src='/images/aaron-patterson.png' class='speaker' width='150' height='150' />
  68 + <img src='/images/speakers/aaron-patterson.png' class='speaker' width='150' height='150' />
66 69 <div class="clear"></div>
67 70 <div class="socialmedia">
68 71 <a class="twitter" href="https://twitter.com/#!/tenderlove">@tenderlove</a>
@@ -72,6 +75,7 @@ <h1 id="title">Program</h1>
72 75 </div>
73 76 <div class="speaker-content">
74 77 <div class='name'>Aaron Patterson</div>
  78 + <div class='company'><em>AT&amp;T Interactive</em></div>
75 79 <div class='session'><strong>Keynote</strong></div>
76 80 <p>When he isn’t ruining people’s lives by writing software like
77 81 phuby, enterprise, and neversaydie, Aaron can be found writing
@@ -86,7 +90,7 @@ <h1 id="title">Program</h1>
86 90
87 91 <div class='speaker'>
88 92 <div class="imageInfo">
89   - <img src='/images/chad_fowler.png' class='speaker' width='150' height='150' />
  93 + <img src='/images/speakers/chad_fowler.png' class='speaker' width='150' height='150' />
90 94 <div class="clear"></div>
91 95 <div class="socialmedia">
92 96 <a class="twitter" href="https://twitter.com/#!/chadfowler">@chadfowler</a>
@@ -96,6 +100,7 @@ <h1 id="title">Program</h1>
96 100 </div>
97 101 <div class="speaker-content">
98 102 <div class='name'>Chad Fowler</div>
  103 + <div class='company'><em>LivingSocial</em></div>
99 104 <div class='session'></div>
100 105 <p>VP Engineering at LivingSocial, author, technologist, consultant, speaker, teacher, musician, organizer.</p>
101 106 </div>
@@ -104,7 +109,7 @@ <h1 id="title">Program</h1>
104 109
105 110 <div class='speaker'>
106 111 <div class="imageInfo">
107   - <img src='/images/ilya-grigorik.jpg' class='speaker' width='150' height='150' />
  112 + <img src='/images/speakers/ilya-grigorik.jpg' class='speaker' width='150' height='150' />
108 113 <div class="clear"></div>
109 114 <div class="socialmedia">
110 115 <a class="twitter" href="https://twitter.com/#!/igrigorik">@igrigorik</a>
@@ -114,6 +119,7 @@ <h1 id="title">Program</h1>
114 119 </div>
115 120 <div class="speaker-content">
116 121 <div class='name'>Ilya Grigorik</div>
  122 + <div class='company'><em>Google</em></div>
117 123 <div class='session'></div>
118 124 <p>Ilya Grigorik is a developer, an open-source and Ruby evangelist,
119 125 a data-geek, and a proverbial early adopter of all things digital.
@@ -128,7 +134,7 @@ <h1 id="title">Program</h1>
128 134
129 135 <div class='speaker'>
130 136 <div class="imageInfo">
131   - <img src='/images/matt-aimonetti.jpg' class='speaker' width='150' height='150' />
  137 + <img src='/images/speakers/matt-aimonetti.jpg' class='speaker' width='150' height='150' />
132 138 <div class="clear"></div>
133 139 <div class="socialmedia">
134 140 <a class="twitter" href="https://twitter.com/#!/merbist">@merbist</a>
@@ -138,6 +144,7 @@ <h1 id="title">Program</h1>
138 144 </div>
139 145 <div class="speaker-content">
140 146 <div class='name'>Matt Aimonetti</div>
  147 + <div class='company'><em>LivingSocial</em></div>
141 148 <div class='session'></div>
142 149 <p>R&amp;D Engineer at LivingSocial - Former Sony PlayStation developer.</p>
143 150 </div>
@@ -146,7 +153,7 @@ <h1 id="title">Program</h1>
146 153
147 154 <div class='speaker'>
148 155 <div class="imageInfo">
149   - <img src='/images/mark_bates.jpg' class='speaker' width='150' height='150' />
  156 + <img src='/images/speakers/mark_bates.jpg' class='speaker' width='150' height='150' />
150 157 <div class="clear"></div>
151 158 <div class="socialmedia">
152 159 <!--<a class="twitter" href=""></a></p>-->
@@ -156,6 +163,7 @@ <h1 id="title">Program</h1>
156 163 </div>
157 164 <div class="speaker-content">
158 165 <div class='name'>Mark Bates</div>
  166 + <div class='company'><em>Meta42 Labs, LLC</em></div>
159 167 <div class='session'></div>
160 168 <p>Mark Bates is the founder and chief architect of the Boston, MA based consulting
161 169 company, Meta42 Labs. Mark spends his days focusing on new application development
@@ -177,7 +185,7 @@ <h1 id="title">Program</h1>
177 185
178 186 <div class='speaker'>
179 187 <div class="imageInfo">
180   - <img src='/images/james_gray.png' class='speaker' width='150' height='150' />
  188 + <img src='/images/speakers/james_gray.png' class='speaker' width='150' height='150' />
181 189 <div class="clear"></div>
182 190 <div class="socialmedia">
183 191 <a class="twitter" href="https://twitter.com/#!/JEG2">@JEG2</a>
@@ -187,6 +195,7 @@ <h1 id="title">Program</h1>
187 195 </div>
188 196 <div class="speaker-content">
189 197 <div class='name'>James Edward Gray</div>
  198 + <div class='company'><em>Gray Productions Software Inc.</em></div>
190 199 <div class='session'>
191 200 <strong>Session:</strong> Ten Things You Didn't Know Ruby Could Do
192 201 </div>
@@ -207,6 +216,7 @@ <h1 id="title">Program</h1>
207 216 </div>
208 217 <div class="speaker-content">
209 218 <div class='name'>Zach Holman</div>
  219 + <div class='company'><em>GitHub</em></div>
210 220 <div class='session'>
211 221 <strong>Session:</strong> Ruby: You've Changed, Bro.
212 222 </div>
@@ -227,6 +237,7 @@ <h1 id="title">Program</h1>
227 237 </div>
228 238 <div class="speaker-content">
229 239 <div class='name'>Wesley Beary</div>
  240 + <div class='company'><em>Heroku</em></div>
230 241 <div class='session'>
231 242 <strong>Session:</strong> Maintain Less, Mentor More: Community Building Techniques from Open Source
232 243 </div>
7 public/registration.html
@@ -2,8 +2,11 @@
2 2 <html lang="en">
3 3 <head>
4 4 <meta charset="UTF-8">
5   - <link rel="stylesheet" href="stylesheets/style.css" />
6 5 <link rel="stylesheet" href="stylesheets/wufoo.css" />
  6 + <link rel="stylesheet" href="stylesheets/style.css" />
  7 +
  8 + <!-- Icons -->
  9 + <link rel="shortcut icon" href="images/icons/favicon.ico">
7 10 <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>
8 11 <script type="text/javascript">
9 12 if (typeof jQuery == 'undefined')
@@ -35,7 +38,7 @@
35 38 <li class="page-3"><a href="sponsors">Sponsors</a></li>
36 39 </ul>
37 40 <a id="logo" class="home" href="index.html" title="Return to the homepage">
38   - <img src="images/logo.png" alt="Aloha Ruby Conference" />
  41 + <img src="images/aloharuby-logo.png" alt="Aloha Ruby Conference" />
39 42 </a>
40 43 <ul id="leftLinks">
41 44 <li class="page-4"><a href="#">Training</a></li>
7 public/sponsors.html
@@ -2,8 +2,11 @@
2 2 <html lang="en">
3 3 <head>
4 4 <meta charset="UTF-8">
5   - <link rel="stylesheet" href="stylesheets/style.css" />
6 5 <link rel="stylesheet" href="stylesheets/wufoo.css" />
  6 + <link rel="stylesheet" href="stylesheets/style.css" />
  7 +
  8 + <!-- Icons -->
  9 + <link rel="shortcut icon" href="images/icons/favicon.ico">
7 10 <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>
8 11 <script type="text/javascript">
9 12 if (typeof jQuery == 'undefined')
@@ -35,7 +38,7 @@
35 38 <li class="page-3 current"><a href="sponsors">Sponsors</a></li>
36 39 </ul>
37 40 <a id="logo" class="home" href="index.html" title="Return to the homepage">
38   - <img src="images/logo.png" alt="Aloha Ruby Conference" />
  41 + <img src="images/aloharuby-logo.png" alt="Aloha Ruby Conference" />
39 42 </a>
40 43 <ul id="leftLinks">
41 44 <li class="page-4"><a href="training">Training</a></li>
62 public/stylesheets/style.css
@@ -220,7 +220,7 @@ div.twitter{
220 220 }
221 221
222 222 #footer div.socialMedia a.twitter{
223   - background: url('../images/twitter-icon.png') no-repeat 0 0;
  223 + background: url('../images/icons/twitter-icon.png') no-repeat 0 0;
224 224 width: 37px;
225 225 height: 0;
226 226 padding: 28px 0 0;
@@ -229,7 +229,7 @@ div.twitter{
229 229 }
230 230
231 231 #footer div.socialMedia a.googlePlus{
232   - background: url('../images/google-icon.png') no-repeat 0 0;
  232 + background: url('../images/icons/google-icon.png') no-repeat 0 0;
233 233 width: 30px;
234 234 height: 0;
235 235 padding: 30px 0 0;
@@ -332,7 +332,7 @@ div.twitter{
332 332 }
333 333
334 334 #registrationButton span, .registrationButton span {
335   - display: block;
  335 + display: block !important;
336 336 text-align: center;
337 337 font-size: 28px;
338 338 font-family: 'Museo-700', sans-serif;
@@ -424,7 +424,7 @@ div.twitter{
424 424 }
425 425
426 426 #registrationAvailable h3{
427   - background: url('../images/icon-registration.png') no-repeat 0 7px;
  427 + background: url('../images/icons/icon-registration.png') no-repeat 0 7px;
428 428 padding: 0 0 0 50px;
429 429 }
430 430
@@ -449,12 +449,12 @@ div.twitter{
449 449 }
450 450
451 451 #location h2#title{
452   - background: url('../images/icon-location.png') no-repeat 0 7px;
  452 + background: url('../images/icons/icon-location.png') no-repeat 0 7px;
453 453 padding: 0 0 0 30px;
454 454 }
455 455
456 456 a.learnMore{
457   - background: url('../images/arrow.png') no-repeat 95px 5px;
  457 + background: url('../images/icons/arrow.png') no-repeat 95px 5px;
458 458 font-size: 16px;
459 459 color: #bf7334;
460 460 text-shadow: 1px 2px 0px rgba(255,255,255, 0.4);
@@ -564,11 +564,11 @@ a.learnMore{
564 564 }
565 565
566 566 #speakerSignUp h4{
567   - background: url('../images/icon-speakers.png') no-repeat 0 7px;
  567 + background: url('../images/icons/icon-speakers.png') no-repeat 0 7px;
568 568 }
569 569
570 570 #sponsorSignUp h4, #currentSponsors h4{
571   - background: url('../images/icon-sponsors.png') no-repeat 0 7px;
  571 + background: url('../images/icons/icon-sponsors.png') no-repeat 0 7px;
572 572 }
573 573
574 574 #mainContent.sub #registrationAvailable h4{
@@ -576,10 +576,14 @@ a.learnMore{
576 576 color: #bf7334;
577 577 }
578 578
579   -#currentSponsors p{
  579 +#currentSponsors p, #schedule.sidebar .sponsorInfo p{
580 580 text-align: center;
581 581 }
582 582
  583 +#schedule.sidebar .sponsorInfo p{
  584 + margin: 20px 0 0;
  585 +}
  586 +
583 587 #currentSponsors p a{
584 588 margin: 0 auto 30px;
585 589 display: block;
@@ -651,8 +655,9 @@ a.learnMore{
651 655 #location table td.code span.line {
652 656 display: block;
653 657 font-family: monospace;
654   - padding-top: 2px;
  658 + padding-top: 5px;
655 659 line-height: 18px;
  660 + font-size: 14px;
656 661 }
657 662
658 663 .quote{
@@ -698,12 +703,19 @@ div.imageInfo{
698 703 .name{
699 704 font-size: 24px;
700 705 text-shadow: 1px 2px 0px rgba(255, 255, 255, 0.5);
  706 + padding: 0 0 5px !important;
701 707 }
702 708
703 709 .name, .session{
704 710 padding: 0 0 10px
705 711 }
706 712
  713 +.company em{
  714 + padding: 0 0 10px;
  715 + display: block;
  716 + font-size: 14px;
  717 +}
  718 +
707 719 div.speaker-content{
708 720 float: left;
709 721 width: 380px;
@@ -722,27 +734,31 @@ div.speaker .socialmedia a{
722 734 }
723 735
724 736 div.speaker .socialmedia a.twitter{
725   - background: url('../images/icon-twitter.png') no-repeat left 0px;
  737 + background: url('../images/icons/icon-twitter.png') no-repeat left 0px;
726 738 height: 17px;
727 739 padding: 3px 0 0 28px;
728 740 margin: 0 0 6px 0px !important;
729 741 }
730 742
731 743 div.speaker .socialmedia a.github{
732   - background: url('../images/icon-github.png') no-repeat left 0px;
  744 + background: url('../images/icons/icon-github.png') no-repeat left 0px;
733 745 padding: 8px 0 0 35px;
734 746 }
735 747
736 748 div.speaker .socialmedia a.website{
737   - background: url('../images/icon-world.png') no-repeat 8px 0px;
  749 + background: url('../images/icons/icon-world.png') no-repeat 8px 0px;
738 750 }
739 751
740   -section#speakers{
  752 +section#speakers, section#trainingInfo, section#speakers.badges{
741 753 width: 610px;
742 754 float: left;
743 755 margin: 20px 0 0;
744 756 }
745 757
  758 +section#trainingInfo, section#speakers.badges{
  759 + margin: 0;
  760 +}
  761 +
746 762 aside#sidebar{
747 763 width: 260px;
748 764 float: left;
@@ -848,7 +864,10 @@ form li.section {
848 864
849 865 form li#foli141{
850 866 /*width: 100%;*/
851   - padding: 0 0 30px;
  867 + padding: 0 0 30px;
  868 +}
  869 +
  870 +form div.clear.hr{
852 871 border-bottom: 2px solid rgba(143, 127, 110, .4);
853 872 }
854 873
@@ -938,6 +957,18 @@ form li.focused {
938 957 display: none !important;
939 958 }
940 959
  960 +/***************************
  961 +Media Page
  962 +***************************/
  963 +
  964 +section#speakers.badges div.speaker img{
  965 + margin: 0 0 20px;
  966 +}
  967 +
  968 +section#speakers.badges div.speaker.first code {
  969 + font-size: 14px;
  970 +}
  971 +
941 972
942 973 /***************************
943 974 Classes
@@ -956,6 +987,7 @@ img.speaker, .speaker-info {
956 987 }
957 988
958 989 img.speaker {
  990 + background: rgba(255, 255, 255, 0.65);
959 991 }
960 992
961 993 .speaker-info {
162 public/training.html
@@ -2,8 +2,11 @@
2 2 <html lang="en">
3 3 <head>
4 4 <meta charset="UTF-8">
5   - <link rel="stylesheet" href="stylesheets/style.css" />
6 5 <link rel="stylesheet" href="stylesheets/wufoo.css" />
  6 + <link rel="stylesheet" href="stylesheets/style.css" />
  7 +
  8 + <!-- Icons -->
  9 + <link rel="shortcut icon" href="images/icons/favicon.ico">
7 10 <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>
8 11 <script type="text/javascript">
9 12 if (typeof jQuery == 'undefined')
@@ -35,7 +38,7 @@
35 38 <li class="page-3"><a href="sponsors">Sponsors</a></li>
36 39 </ul>
37 40 <a id="logo" class="home" href="index.html" title="Return to the homepage">
38   - <img src="images/logo.png" alt="Aloha Ruby Conference" />
  41 + <img src="images/aloharuby-logo.png" alt="Aloha Ruby Conference" />
39 42 </a>
40 43 <ul id="leftLinks">
41 44 <li class="page-4 current"><a href="training">Training</a></li>
@@ -56,78 +59,89 @@ <h1 id="title">Training</h1>
56 59
57 60 <section id="mainContent" class="sub">
58 61 <section id="location">
59   - <h3 class="entry-title">Advanced Patterns with Rails</h3>
60   -
61   - <p>Welcome! First, open this page in your browser:</p>
62   - <p><a href="http://jumpstartlab.com/codemash-pm">http://jumpstartlab.com/codemash-pm</a></p>
63   - <h2>Setting Expectations</h2>
64   - <h3>Is this the right session for you?</h3>
65   - <p>You belong here if:</p>
66   - <ul>
67   - <li>You feel <em>very</em> comfortable working with Ruby and Rails</li>
68   - <li>You have built several Rails projects</li>
69   - <li>You’re interested in some new ideas</li>
70   - <li>You’re willing to wrestle with things that might not work the first time</li>
71   - </ul>
72   -
73   - <p>This is <em>not</em> a good session for you if:</p>
74   -
75   - <ul>
76   - <li>You’re new to Ruby/Rails</li>
77   - <li>You were in my session this morning</li>
78   - <li>You want everything to go smoothly</li>
79   - <li>You only came for the "worker pattern", because I decided it didn’t fit</li>
80   - </ul>
81   -
82   - <h3>Are you prepared?</h3>
83   - <p>You need:</p>
84   - <ul>
85   - <li>To join the chatroom at <a href="http://jumpstartlab.com/chat">http://jumpstartlab.com/chat</a></li>
86   - <li>Ruby 1.9.2 or greater</li>
87   - <li>Rails 3.1.3 or greater</li>
88   - <li>Setup the sample project</li>
89   - </ul>
90   -
91   - <div class="note">
92   - <p>Get the JSBlogger project from Github and run setup procedures:</p>
93   - <table>
94   - <tbody>
95   - <tr>
96   - <td class="code">
97   - <span class="line">1 <span>git clone git://github.com/JumpstartLab/jsblogger_advanced.git</span></span>
98   - <span class="line">2 <span>cd jsblogger_advanced</span></span>
99   - <span class="line">3 <span>bundle</span></span>
100   - <span class="line">4 <span>rake db:setup</span></span>
101   - <span class="line">5 <span>rake</span></span>
102   - </td>
103   - </tr>
104   - </tbody>
105   - </table>
106   - <p>All existing tests should pass. Optionally, run the tests continuously while developing by running <code>guard</code></p>
107   - </div>
108   -
109   - <p>You can also run the tests continuously as we make changes by starting <code>guard</code></p>
110   -
111   - <h2>The Plan</h2>
112   - <p>We’re going to approach this in four segments of about one hour each.</p>
113   -
114   - <h3>Decorator Pattern with Draper</h3>
115   - <p>Open the tutorial at <a href="http://tutorials.jumpstartlab.com/topics/decorators.html">http://tutorials.jumpstartlab.com/topics/decorators.html</a></p>
116   -
117   - <h3>Slimming Controllers</h3>
118   - <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>
119   -
120   - <h3>Facade Pattern</h3>
121   - <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>
122   -
123   - <h3>Better Models with Modules</h3>
124   - <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>
125   -
126   - <h2>Contributing</h2>
127   - <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>
128   -
129   - <p>Enjoy!</p>
130   -
  62 + <h3 class="entry-title">Training Session: Advanced Patterns with Rails</h3>
  63 +
  64 + <section id="trainingInfo">
  65 + <p>Welcome! First, open this page in your browser:</p>
  66 + <p><a href="http://jumpstartlab.com/codemash-pm">http://jumpstartlab.com/codemash-pm</a></p>
  67 + <h2>Setting Expectations</h2>
  68 + <h3>Is this the right session for you?</h3>
  69 + <p>You belong here if:</p>
  70 + <ul>
  71 + <li>You feel <em>very</em> comfortable working with Ruby and Rails</li>
  72 + <li>You have built several Rails projects</li>
  73 + <li>You’re interested in some new ideas</li>
  74 + <li>You’re willing to wrestle with things that might not work the first time</li>
  75 + </ul>
  76 +
  77 + <p>This is <em>not</em> a good session for you if:</p>
  78 +
  79 + <ul>
  80 + <li>You’re new to Ruby/Rails</li>
  81 + <li>You were in my session this morning</li>
  82 + <li>You want everything to go smoothly</li>
  83 + <li>You only came for the "worker pattern", because I decided it didn’t fit</li>
  84 + </ul>
  85 +
  86 + <h3>Are you prepared?</h3>
  87 + <p>You need:</p>
  88 + <ul>
  89 + <li>To join the chatroom at <a href="http://jumpstartlab.com/chat">http://jumpstartlab.com/chat</a></li>
  90 + <li>Ruby 1.9.2 or greater</li>
  91 + <li>Rails 3.1.3 or greater</li>
  92 + <li>Setup the sample project</li>
  93 + </ul>
  94 +
  95 + <div class="note">
  96 + <p>Get the JSBlogger project from Github and run setup procedures:</p>
  97 + <table>
  98 + <tbody>
  99 + <tr>
  100 + <td class="code">
  101 + <span class="line">1 <span>git clone git://github.com/JumpstartLab/jsblogger_advanced.git</span></span>
  102 + <span class="line">2 <span>cd jsblogger_advanced</span></span>
  103 + <span class="line">3 <span>bundle</span></span>
  104 + <span class="line">4 <span>rake db:setup</span></span>
  105 + <span class="line">5 <span>rake</span></span>
  106 + </td>
  107 + </tr>
  108 + </tbody>
  109 + </table>
  110 + <p>All existing tests should pass. Optionally, run the tests continuously while developing by running <code>guard</code></p>
  111 + </div>
  112 +
  113 + <p>You can also run the tests continuously as we make changes by starting <code>guard</code></p>
  114 +
  115 + <h2>The Plan</h2>
  116 + <p>We’re going to approach this in four segments of about one hour each.</p>
  117 +
  118 + <h3>Decorator Pattern with Draper</h3>
  119 + <p>Open the tutorial at <a href="http://tutorials.jumpstartlab.com/topics/decorators.html">http://tutorials.jumpstartlab.com/topics/decorators.html</a></p>
  120 +
  121 + <h3>Slimming Controllers</h3>
  122 + <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>
  123 +
  124 + <h3>Facade Pattern</h3>
  125 + <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>
  126 +
  127 + <h3>Better Models with Modules</h3>
  128 + <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>
  129 +
  130 + <h2>Contributing</h2>
  131 + <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>
  132 +
  133 + <p>Enjoy!</p>
  134 + </section>
  135 + <aside id="schedule" class="sidebar">
  136 + <h3>Sponsored by:</h3>
  137 + <div class="sponsorInfo">
  138 + <p>
  139 + <a href='http://jumpstartlab.com/' alt="JumpstartLab">
  140 + <img src='/images/sponsors/jumpstartlab-logo.png' />
  141 + </a>
  142 + </p>
  143 + </div>
  144 + </aside>
131 145 <div class='clear'></div>
132 146 </section>
133 147 </section><!-- End of Main Content -->

0 comments on commit 34e03d4

Please sign in to comment.
Something went wrong with that request. Please try again.