Skip to content

Commit 5411fd9

Browse files
steveklabniksteveklabnik
committed
Merge remote branch 'ml/master'
2 parents da8f449 + f01d4b5 commit 5411fd9

14 files changed

Lines changed: 195 additions & 7 deletions

File tree

‎Gemfile‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ gem "database_cleaner", "=0.5.2"
2020
gem "rack-flash", "=0.1.1"
2121
gem "rdiscount", "=1.6.5"
2222
gem "autotest"
23-
gem "autotest-fsevent"
24-
gem "autotest-growl"
23+
if RUBY_PLATFORM =~ /darwin/
24+
gem "autotest-fsevent"
25+
gem "autotest-growl"
26+
end
2527
gem "bson_ext", ">=1.0.4"
2628
gem "launchy"

‎features/step_definitions/user_steps.rb‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

‎hackety.rb‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,11 @@
3434

3535
#this will be used to make sass work
3636
Dir.glob("#{File.expand_path(File.dirname(__FILE__))}/views/stylesheets/*.sass").each do |sheet|
37-
get "/stylesheets/#{sheet}.css" do
37+
sheet =~ /\/([^\/]*).sass/
38+
sheet_name = $1
39+
get "/stylesheets/#{sheet_name}.css" do
3840
content_type 'text/css', :charset => 'utf-8'
39-
sass :"stylesheets/#{sheet}"
41+
sass :"stylesheets/#{sheet_name}"
4042
end
4143
end
4244

‎public/images/hackety_screenshot.png‎

42.5 KB
Loading

‎public/images/hackymouse.gif‎

7.86 KB
Loading

‎public/images/hhhello.png‎

294 KB
Loading

‎public/images/logo.png‎

5.46 KB
Loading

‎public/images/shoes-icon.png‎

3.24 KB
Loading

‎public/stylesheets/site.css‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
div#content {
2+
border-style:solid;
3+
border: 1px:
4+
}

‎views/index.haml‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1-
Download Hackety
1+
%h1 Hackety Hack: the coder's starter kit
2+
%h2 Want to learn how to program computers?
3+
%p Hackety Hack is easy, simple, and free.
4+
%p Click the Shoes logo to grab Shoes, and the Hackety Logo to download v0.9.3:
5+
%br
6+
%p
7+
%a{:href => "http://wiki.github.com/shoes/shoes/recentbuilds"}
8+
%img{:src => "images/shoes-icon.png", :alt => "shoes"}
9+
%img{:src => "images/logo.png", :alt => "logo"}
10+
%p
11+
Download Hackety
12+
%br
13+
%p
14+
Already know how to code? You'll want to
15+
%a{:href => "http://wiki.github.com/hacketyhack/hacketyhack/"}click here
16+
%br
17+
%p
18+
%img{:src => "images/hackety_screenshot.png", :alt => "screenshot"}
19+
220

3-
%a{ :href => "/forums"} Forums

0 commit comments

Comments
 (0)