Skip to content

Commit

Permalink
update content and styles
Browse files Browse the repository at this point in the history
  • Loading branch information
burnto committed Mar 29, 2012
1 parent 5bc2110 commit 612ad75
Show file tree
Hide file tree
Showing 6 changed files with 76 additions and 50 deletions.
1 change: 1 addition & 0 deletions .rvmrc
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1 @@
rvm ruby-1.9.2-p180@bpf
4 changes: 2 additions & 2 deletions site/index.html
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<html> <html>
<head> <head>
<title>Brent Fitzgerald</title> <title>Brent Fitzgerald</title>
<meta content='Designer/developer at Sifteo, co-founder of Taco Lab, friend of plants and bicycles.' name='description' /> <meta content='Digitally inclined humanoid, friend of plants.' name='description' />
<meta content='brent fitzgerald, taco lab, tacolab, mit, media lab, sifteo, siftables, design, technology, digital, network, physical language workshop, plw' name='keywords' /> <meta content='brent fitzgerald, card.io, lumber labs, mobile payments, taco lab, tacolab, mit, media lab, sifteo, siftables, design, technology, digital, network, physical language workshop, plw' name='keywords' />
<link href='favicon16.png' rel='shortcut icon' /> <link href='favicon16.png' rel='shortcut icon' />
<link href='http://fonts.googleapis.com/css?family=Droid+Sans:regular,bold' rel='stylesheet' type='text/css' /> <link href='http://fonts.googleapis.com/css?family=Droid+Sans:regular,bold' rel='stylesheet' type='text/css' />
<link href="/stylesheets/screen.css" media="all" rel="stylesheet" type="text/css"/> <link href="/stylesheets/screen.css" media="all" rel="stylesheet" type="text/css"/>
Expand Down
9 changes: 8 additions & 1 deletion site/stylesheets/screen.css
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -3,13 +3,20 @@
html, body { html, body {
margin: 0; margin: 0;
padding: 0; padding: 0;
font-family: 'Droid Sans', sans-serif; font-family: 'PT Sans', sans-serif;
line-height: 150%; line-height: 150%;
color: black; color: black;
font-size: 16px; font-size: 16px;
background-color: #f0f0f0; background-color: #f0f0f0;
} }


#page {
margin: 0 auto;
width: 70%;
max-width: 800px;
min-width: 300px;
}

/* line 13 */ /* line 13 */
h2 { h2 {
line-height: 140%; line-height: 140%;
Expand Down
8 changes: 4 additions & 4 deletions src/layouts/default.haml
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
%html %html
%head %head
%title Brent Fitzgerald %title Brent Fitzgerald
%meta{:content => "Designer/developer at Sifteo, co-founder of Taco Lab, friend of plants and bicycles.", %meta{:content => @content || "Constructor of software, Director of Engineering at card.io, friends of plants",
:name => "description"} :name => "description"}
%meta{:content => "brent fitzgerald, taco lab, tacolab, mit, media lab, sifteo, siftables, design, technology, digital, network, physical language workshop, plw", %meta{:content => "brent fitzgerald, taco lab, tacolab, mit, media lab, stanford, symbolic systems, sifteo, siftables, design, technology, digital, network, physical language workshop, plw",
:name => "keywords"} :name => "keywords"}

%link{:href => "favicon16.png", :rel => "shortcut icon"}/ %link{:href => "favicon16.png", :rel => "shortcut icon"}/
%link{:href => "http://fonts.googleapis.com/css?family=Droid+Sans:regular,bold", :rel => "stylesheet", :type => "text/css"} %link{:href => "http://fonts.googleapis.com/css?family=PT+Sans:400,700", :rel => "stylesheet", :type => "text/css"}
-#%link{:href => "http://fonts.googleapis.com/css?family=Droid+Serif:regular,italic,bold,bolditalic", :rel => "stylesheet", :type => "text/css"}
= stylesheets = stylesheets
%body %body
#page #page
Expand Down
52 changes: 40 additions & 12 deletions src/pages/index.haml
Original file line number Original file line Diff line number Diff line change
@@ -1,17 +1,45 @@
:ruby

#bio #bio
%section %section
%h1
Brent Fitzgerald
%p %p
Hi, my name is I'm the Director of Engineering at
%strong Brent Fitzgerald.
I'm a member of the founding team at
= succeed "," do = succeed "," do
%a{:href => "http://sifteo.com/"} Sifteo %a{:href => "https://www.card.io/"} card.io
where I design and develop the software for Sifteo cubes &ndash; electronic, interactive tiles for play and learning. where I'm part of an awesome small team designing and developing the future of payments.
%p Previously:
%ul
%li
Director of Software for
= link_to "Sifteo", "http://sifteo.com"
%li
Co-founder of
= link_to "Taco Lab", "http://tacolab.com/"
%li
Design Chief &amp; Developer at
= link_to "Swivel", "http://www.crunchbase.com/company/swivel"
%li
Graduate Student Researcher at the
= link_to "MIT Media Lab", "http://media.mit.edu/"
in the
= link_to "Physical Language Workshop", "http://plw.media.mit.edu/"
%li
Designer at the
= link_to "Stanford School of Medicine", "http://med.stanford.edu/"
%li
Hapless undergraduate in
= link_to "Symbolic Systems", "http://symsys.stanford.edu/"
at
= link_to "Stanford", "http://www.stanford.edu/"
%li
Born &amp; raised in
= link_to "Mill Valley, CA", "http://www.youtube.com/watch?v=w-YaWE0zu-c"
%p.links %p.links
= link_to "github", "http://github.com/burnto" Follow or contact me:
= link_to "linkedin", "http://www.linkedin.com/in/brentfitzgerald" = link_to "Twitter", "http://twitter.com/burnto"
= link_to "facebook", "http://www.facebook.com/brent.fitzgerald" |
= link_to "twitter", "http://twitter.com/burnto" = link_to "LinkedIn", "http://www.linkedin.com/in/brentfitzgerald"
= link_to "flickr", "http://flickr.com/photos/burnto" |
= link_to "delicious", "http://delicious.com/burnto" = link_to "github", "http://github.com/burnto"

52 changes: 21 additions & 31 deletions src/stylesheets/screen.scss
Original file line number Original file line Diff line number Diff line change
@@ -1,25 +1,23 @@
/* Generated by Font Squirrel (http://www.fontsquirrel.com) on October 21, 2010 03:26:28 AM America/New_York */


html, body { html, body {
margin: 0; margin: 10px;
padding: 0; padding: 0;
font-family: 'Droid Sans', sans-serif; font-family: 'PT Sans', sans-serif;
line-height: 150%; line-height: 32px;
color: black; color: black;
font-size: 16px; font-size: 20px;
background-color: #f0f0f0; background-color: white;
} }


h2 { h2 {
line-height: 140%; line-height: 140%;
} }


#page { #page {
margin: 30px; margin: 80px auto;
} width: 100%;

max-width: 800px;
#page header { min-width: 300px;
margin: 50px 5px;
} }


#portfolio section { #portfolio section {
Expand All @@ -39,7 +37,7 @@ h2 {
width: 610px; width: 610px;
border: 1px solid #ccc; border: 1px solid #ccc;


box-shadow: 0 3px 7px #888; box-shadow: 0 3px 7px #888;
-moz-box-shadow: 0 3px 7px #888; -moz-box-shadow: 0 3px 7px #888;
-webkit-box-shadow: 0 3px 7px #888; -webkit-box-shadow: 0 3px 7px #888;
} }
Expand Down Expand Up @@ -77,7 +75,7 @@ h2 {
} }





.content { .content {
padding-top: 10px; padding-top: 10px;
margin-left: 640px; margin-left: 640px;
Expand All @@ -86,31 +84,23 @@ h2 {


} }
} }
#bio {
width: 50em;
.links a {
margin-right: 10px;
}
}


/*#content { p, ul {
width: 66%; margin: 0 0 10px 0;
max-width: 32em;
} }
*/
p { li {
margin: 0 0 .5em 0; margin: 0;
/* font-family: 'Droid Serif', serif;*/
} }


a { a {
color: #666; color: #777;
text-decoration: underline; text-decoration: none;
} }


p a:hover { a:hover {
color: black; color: white;
background-color: yellow; background-color: #00ccff;
text-decoration: none; text-decoration: none;
} }


Expand Down

0 comments on commit 612ad75

Please sign in to comment.