Permalink
Browse files

Added Speaker companies

- added speaker's companies & styled
- added white background to speaker images so the png's blend in properly (spec. Wesley's photo)
  • Loading branch information...
micjamking committed Mar 19, 2012
1 parent 94e1029 commit 17b64eb3fa0d387442c3dab2a9e1be3ec18f0055
Showing with 16 additions and 0 deletions.
  1. +8 −0 public/program.html
  2. +8 −0 public/stylesheets/style.css
View
@@ -75,6 +75,7 @@ <h3>Speakers</h3>
</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
@@ -99,6 +100,7 @@ <h3>Speakers</h3>
</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>
@@ -117,6 +119,7 @@ <h3>Speakers</h3>
</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.
@@ -141,6 +144,7 @@ <h3>Speakers</h3>
</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>
@@ -159,6 +163,7 @@ <h3>Speakers</h3>
</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
@@ -190,6 +195,7 @@ <h3>Speakers</h3>
</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>
@@ -210,6 +216,7 @@ <h3>Speakers</h3>
</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>
@@ -230,6 +237,7 @@ <h3>Speakers</h3>
</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>
@@ -698,12 +698,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;
@@ -956,6 +963,7 @@ img.speaker, .speaker-info {
}
img.speaker {
+ background: rgba(255, 255, 255, 0.65);
}
.speaker-info {

0 comments on commit 17b64eb

Please sign in to comment.