Merge remote branch 'lindseyb/master'

steveklabnik · steveklabnik · commit 3af7f4378349 · 2010-09-21T17:04:51.000-04:00
diff --git a/Gemfile b/Gemfile
@@ -21,6 +21,7 @@ gem "rack-flash"
 gem "rdiscount"
 gem "autotest"
 gem "i18n"
+
 if RUBY_PLATFORM =~ /darwin/
 	gem "autotest-fsevent"
 	gem "autotest-growl"
diff --git a/views/index.haml b/views/index.haml
@@ -1,21 +1,24 @@
-%h1 Hackety Hack: the little coder's starter kit
-%h2 Want to learn how to program?
-%p Hackety Hack is the easiest way to learn computer programming.
-%p Click the Shoes logo to grab Shoes, and the Hackety Logo to download v1.0-pre:
-%br
-%p
-  %a{:href => "http://shoes.heroku.com/downloads"}
-    %img{:src => "images/shoes-icon.png", :alt => "shoes"}
-  %a{:href => "http://github.com/downloads/hacketyhack/hacketyhack/hacketyhack-v1.0-pre.shy"}
-    %img{:src => "images/logo.png", :alt => "logo"}
+%div
+  %h1 Hackety Hack: the little coder's starter kit
+  %h2 Want to learn how to program?
+  %p Hackety Hack is the easiest way to learn computer programming.
+  %p Click the Shoes logo to grab Shoes, and the Hackety Logo to download v1.0-pre:
   %br
-  %p Then just choose 'open an app' and open the .shy!
-  %hr
   %p
-    Already know how to code? You'll want to
-    %a{:href => "http://wiki.github.com/hacketyhack/hacketyhack/"}click here
-  %br
-  %p
-    %img{:src => "images/hackety_screenshot.png", :alt => "screenshot"}
+    %a{:href => "http://shoes.heroku.com/downloads"}
+      %img{:src => "images/shoes-icon.png", :alt => "shoes"}
+    %a{:href => "http://github.com/downloads/hacketyhack/hacketyhack/hacketyhack-v1.0-pre.shy"}
+      %img{:src => "images/logo.png", :alt => "logo"}
+    %br
+    %p Then just choose 'open an app' and open the .shy!
+    %hr
+    %p
+      Already know how to code? You'll want to
+      %a{:href => "http://wiki.github.com/hacketyhack/hacketyhack/"}click here
+    %br
+    %p
+      %img{:src => "images/hackety_screenshot.png", :alt => "screenshot"}
+%div{:style => "padding-top:1em"}
+  <iframe src="http://www.facebook.com/plugins/likebox.php?href=http%3A%2F%2Fwww.facebook.com%2Fpages%2FHackety-Hack%2F155257947836619&amp;width=292&amp;connections=10&amp;stream=true&amp;header=true&amp;height=587" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:292px; height:587px;" allowTransparency="true"></iframe>
 
 
diff --git a/views/layout.haml b/views/layout.haml
@@ -7,7 +7,7 @@
 		%link{:rel => "stylesheet", :href => "/stylesheets/ruby.css", :type => 'text/css'}
 		:javascript
 			var _gaq = _gaq || [];
-			_gaq.push(['_setAccount', 'UA-10499799']);
+			_gaq.push(['_setAccount', 'UA-10499799-1']);
 			_gaq.push(['_trackPageview']);
 
 			(function() {
diff --git a/views/stylesheets/site.sass b/views/stylesheets/site.sass
@@ -79,7 +79,8 @@ blockquote
 
 .comment
 	p
-		margin-left: 4em
+		margin-left: 5em
+		padding-bottom: 1em
 
 p.help
 	margin-top: .5em

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,8 @@ blockquote`
`79`	`79`
`80`	`80`	`.comment`
`81`	`81`	`p`
`82`		`- margin-left: 4em`
	`82`	`+ margin-left: 5em`
	`83`	`+ padding-bottom: 1em`
`83`	`84`
`84`	`85`	`p.help`
`85`	`86`	`margin-top: .5em`