From efa2b4e61ca58c427782eccbc3cb40a71c2559a6 Mon Sep 17 00:00:00 2001 From: Chris Guzman Date: Mon, 1 Jun 2015 20:40:17 -0400 Subject: [PATCH] Remove the airships, change a typo and some wording --- Gemfile.lock | 3 --- source/2015/index.html | 5 ++--- source/index.html.erb | 8 ++++---- source/javascripts/floatingBoats.js | 7 +++---- 4 files changed, 9 insertions(+), 14 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index ff923a5..0a57fda 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -138,6 +138,3 @@ DEPENDENCIES middleman (~> 3.3.12) middleman-deploy (~> 1.0) middleman-livereload (~> 3.1.0) - -BUNDLED WITH - 1.10.1 diff --git a/source/2015/index.html b/source/2015/index.html index 2337b34..a7beea3 100644 --- a/source/2015/index.html +++ b/source/2015/index.html @@ -2,8 +2,7 @@ - - The Forth Baltimore Hackathon + The Fourth Baltimore Hackathon @@ -35,7 +34,7 @@

2015

9 Baltimore Hackathon 9

- +

Keep me posted!

diff --git a/source/index.html.erb b/source/index.html.erb index ba0cdfd..59d0e8d 100644 --- a/source/index.html.erb +++ b/source/index.html.erb @@ -19,7 +19,7 @@
-
+

Keep me posted!

@@ -37,9 +37,9 @@
- Curious about the previous competitions? Check out the sites for the - First, Second or the Third Hackathon. - + Curious about the previous competitions? Check out the sites for the + First, Second or Third Hackathon. +
diff --git a/source/javascripts/floatingBoats.js b/source/javascripts/floatingBoats.js index 7eb9391..a3e9893 100644 --- a/source/javascripts/floatingBoats.js +++ b/source/javascripts/floatingBoats.js @@ -1,9 +1,9 @@ var rate = 50, cloud_files = [ 'pirate_ship.png', 'wave.png', 'pirate_ship.png', 'wave.png' ], files = ['airship-boat.png'], -floaters = {}, +floaters = {}, floatCount = 0, -wWidth, +wWidth, wHeight; function animate() { @@ -18,8 +18,6 @@ $(window).load(function() { iWidth = window.innerWidth; for( var i = 50; i > 0; i-- ) clouds(); - for( var i= 5; i > 0; i-- ) - dirigibles(); animate(); }); @@ -62,6 +60,7 @@ function create_floater( file, className, x, y, delta ) { return elem; } +// Not being used function dirigibles() { var idx = Math.floor( Math.random() * files.length ); height = 200,