Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove the airships, change a typo and some wording #3

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,3 @@ DEPENDENCIES
middleman (~> 3.3.12)
middleman-deploy (~> 1.0)
middleman-livereload (~> 3.1.0)

BUNDLED WITH
1.10.1
5 changes: 2 additions & 3 deletions source/2015/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8" />
<!--This is the 4th Baltimore Hackaton correct?-->
<title>The Forth Baltimore Hackathon</title>
<title>The Fourth Baltimore Hackathon</title>
<!--Bootstrap CDN-->
<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css" rel="stylesheet">
<!--Splash Page Styles-->
Expand Down Expand Up @@ -35,7 +34,7 @@ <h1 class="year text-center">20<span class="one">1</span>5</h1>
<div class="col-md-12">
<h2 class="title text-center"><span class="anchors">9</span> Baltimore Hackathon <span class="anchors">9</span></h2>
</div>
</div>
</div>
<div class="row row-email-container">
<div class="col-sm-6 col-sm-offset-3">
<p class="text-left">Keep me posted!</p>
Expand Down
8 changes: 4 additions & 4 deletions source/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<div class="col-md-12">
<img id="title-img" src="./images/splashpage/logo_title.png" />
</div>
</div>
</div>
<div class="row row-email-container">
<div class="col-sm-6 col-sm-offset-3">
<p class="text-left">Keep me posted!</p>
Expand All @@ -37,9 +37,9 @@
</div>
<div id="ribbon" class="text-center">
<img src="./2014/images/wing-timepiece.png" />
<span>Curious about the previous competitions? Check out the sites for the
<a href="2010/">First</a>, <a href="2012/">Second</a> or the <a href="2014/">Third</a> Hackathon.
</span>
<span>Curious about the previous competitions? Check out the sites for the
<a href="2010/">First</a>, <a href="2012/">Second</a> or <a href="2014/">Third</a> Hackathon.
</span>
<img src="./2014/images/wing-timepiece.png" />
</div>
</div>
Expand Down
7 changes: 3 additions & 4 deletions source/javascripts/floatingBoats.js
Original file line number Diff line number Diff line change
@@ -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() {
Expand All @@ -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();
});

Expand Down Expand Up @@ -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,
Expand Down