Skip to content

Commit 9bcd2f8

Browse files
author
Jakob Edding
authored
Merge pull request #14 from jak-ing/flos-changes
Visual and Navigation improvements
2 parents d61e8a2 + 2e46509 commit 9bcd2f8

File tree

13 files changed

+327
-100
lines changed

13 files changed

+327
-100
lines changed

hhpi2016.html renamed to 2016/index.html

Lines changed: 32 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
11
<!DOCTYPE html>
2-
<!-- saved from url=(0025)https://2016.hackhpi.org/ -->
32
<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
43

54

6-
<title>hackHPI</title>
5+
<title>HackHPI 2016 - Data Analytics and Machine Learning Hackathon</title>
76

87
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
98

10-
<link rel="stylesheet" type="text/css" href="./hackhpi_assets/fonts.css">
11-
<link rel="stylesheet" type="text/css" href="./hackhpi_assets/icons.css">
9+
<link rel="stylesheet" type="text/css" href="../hackhpi_assets/fonts.css">
10+
<link rel="stylesheet" type="text/css" href="../hackhpi_assets/icons.css">
1211

13-
<link rel="stylesheet" type="text/css" href="./hackhpi_assets/bootstrap.css">
14-
<link rel="stylesheet" type="text/css" href="./hackhpi_assets/style.css">
15-
<link rel="stylesheet" type="text/css" href="./hackhpi_assets/style-2016.css">
12+
<link rel="stylesheet" type="text/css" href="../hackhpi_assets/bootstrap.css">
13+
<link rel="stylesheet" type="text/css" href="../hackhpi_assets/style.css">
14+
<link rel="stylesheet" type="text/css" href="../hackhpi_assets/style-2016.css">
1615

17-
<link rel="icon" type="image/png" href="https://2016.hackhpi.org/site/templates/images/favicon.png">
18-
<title>HackHPI - HackHPI</title>
16+
<link rel="icon" type="image/png" href="../hackhpi_assets/favicon_2016.png">
1917
<meta name="keywords" content="">
2018
<meta name="description" content="As machine learning has become more than a buzzword in the last few years we decided to organize a hackathon devoted to this topic.">
2119
<meta name="image" content="http://hackhpi.org/site/templates/images/facebook-preview.png">
@@ -53,14 +51,14 @@
5351
<nav class="container-fluid visible-md-block visible-lg-block" id="main-nav" style="top: 0px;">
5452
<div class="container">
5553
<ul>
56-
<li><a class="scroll-link" data-target="intro" href="https://2016.hackhpi.org/#intro">About</a></li>
57-
<li><a class="scroll-link" data-target="schedule" href="https://2016.hackhpi.org/#schedule">Schedule</a></li>
58-
<li><a class="scroll-link" data-target="location" href="https://2016.hackhpi.org/#location">Venue</a></li>
59-
<li><a class="scroll-link" data-target="faq" href="https://2016.hackhpi.org/#faq">FAQ</a></li>
60-
<li><a class="scroll-link" data-target="team" href="https://2016.hackhpi.org/#team">Team</a></li>
61-
<li><a class="scroll-link" data-target="sponsors" href="https://2016.hackhpi.org/#sponsors">Sponsors</a></li>
62-
<li><a class="scroll-link" data-target="ticket" href="https://2016.hackhpi.org/#ticket">Tickets</a></li>
63-
<li><a class="scroll-link" data-target="get-in-touch" href="https://2016.hackhpi.org/#get-in-touch">Contact</a></li>
54+
<li><a class="scroll-link" data-target="intro" href="#intro">About</a></li>
55+
<li><a class="scroll-link" data-target="schedule" href="#schedule">Schedule</a></li>
56+
<li><a class="scroll-link" data-target="location" href="#location">Venue</a></li>
57+
<li><a class="scroll-link" data-target="faq" href="#faq">FAQ</a></li>
58+
<li><a class="scroll-link" data-target="team" href="#team">Team</a></li>
59+
<li><a class="scroll-link" data-target="sponsors" href="#sponsors">Sponsors</a></li>
60+
<li><a class="scroll-link" data-target="ticket" href="#ticket">Tickets</a></li>
61+
<li><a class="scroll-link" data-target="get-in-touch" href="#get-in-touch">Contact</a></li>
6462
</ul>
6563
</div>
6664
</nav>
@@ -71,7 +69,7 @@
7169
<!--<a href="http://mlh.io" target="_blank" class="banner mlh"></a>-->
7270
<div class="row">
7371
<div class="col-md-8 col-md-offset-2 text-center">
74-
<a href="https://2016.hackhpi.org/" class="logo"></a>
72+
<a href="#" class="logo"></a>
7573

7674
<!--<div id="countdown"></div>-->
7775

@@ -96,7 +94,7 @@ <h1>What to expect at HackHPI 2016</h1>
9694

9795
<p>Interested? Come and share your dedication and skills with others, exchange knowledge and accomplish great things!</p> </div>
9896
<div class="col-md-7">
99-
<img src="./hackhpi_assets/intro-bg-2016.jpg" class="top50 img-responsive visible-md-block visible-lg-block">
97+
<img src="../hackhpi_assets/intro-bg-2016.jpg" class="top50 img-responsive visible-md-block visible-lg-block">
10098
</div>
10199
</div>
102100
</div>
@@ -129,7 +127,7 @@ <h2 class="text-colored">Sunday, 12th of June</h2>
129127
<div class="row">
130128
<div class="col-md-4 col-sm-6">
131129
<div class="location-card">
132-
<img src="./hackhpi_assets/dsc0016_neu.jpg" class="img-responsive">
130+
<img src="../hackhpi_assets/dsc0016_neu.jpg" class="img-responsive">
133131
<div class="text">
134132
<h3>HPI School of&nbsp;<br>
135133
Design Thinking</h3>
@@ -175,7 +173,7 @@ <h2 class="text-colored">How should I prepare?</h2>
175173
<p>Bring your laptop and charger, comfortable clothes and above all motivation to hack.</p>
176174
</div><div class="faq-question">
177175
<h2 class="text-colored">How can I apply?</h2>
178-
<p><a href="https://2016.hackhpi.org/#ticket">Click here!</a></p>
176+
<p><a href="#ticket">Click here!</a></p>
179177
</div> </div>
180178
<div class="col-md-5 col-md-offset-1">
181179
<div class="faq-question">
@@ -243,7 +241,7 @@ <h3 class="text-colored text-center">Giga</h3>
243241
</div>
244242
<div class="row sponsors-giga">
245243
<div class="col-md-12">
246-
<a href="http://sap.com/" target="_blank"><img src="./hackhpi_assets/sap.png"></a><a href="http://ibm.com/" target="_blank"><img src="./hackhpi_assets/ibmbluemix.png"></a><a href="http://wikidata.org/" target="_blank"><img src="./hackhpi_assets/wikidata.png"></a> </div>
244+
<a href="http://sap.com/" target="_blank"><img src="../hackhpi_assets/sap.png"></a><a href="http://ibm.com/" target="_blank"><img src="../hackhpi_assets/ibmbluemix.png"></a><a href="http://wikidata.org/" target="_blank"><img src="../hackhpi_assets/wikidata.png"></a> </div>
247245
</div>
248246

249247
<div class="row">
@@ -253,7 +251,7 @@ <h3 class="text-colored text-center">Mega</h3>
253251
</div>
254252
<div class="row sponsors-mega">
255253
<div class="col-md-12">
256-
<a href="http://dubsmash.com/" target="_blank"><img src="./hackhpi_assets/dubsmash.png"></a><a href="http://twilio.com/" target="_blank"><img src="./hackhpi_assets/twilio-2016.png"></a><a href="http://idealo.de/" target="_blank"><img src="./hackhpi_assets/idealo.png"></a> </div>
254+
<a href="http://dubsmash.com/" target="_blank"><img src="../hackhpi_assets/dubsmash.png"></a><a href="http://twilio.com/" target="_blank"><img src="../hackhpi_assets/twilio-2016.png"></a><a href="http://idealo.de/" target="_blank"><img src="../hackhpi_assets/idealo.png"></a> </div>
257255
</div>
258256

259257
<div class="row">
@@ -263,7 +261,7 @@ <h3 class="text-colored text-center">Kilo</h3>
263261
</div>
264262
<div class="row sponsors-kilo">
265263
<div class="col-md-12">
266-
<a href="http://remerge.io/" target="_blank"><img src="./hackhpi_assets/remerge.png"></a> </div>
264+
<a href="http://remerge.io/" target="_blank"><img src="../hackhpi_assets/remerge.png"></a> </div>
267265
</div>
268266

269267

@@ -275,7 +273,7 @@ <h3 class="text-colored text-center">Price</h3>
275273
</div>
276274
<div class="row sponsors-kilo">
277275
<div class="col-md-12">
278-
<a href="http://4scotty.com/" target="_blank"><img src="./hackhpi_assets/4scotty-logo.png"></a><a href="https://de.udacity.com/" target="_blank"><img src="./hackhpi_assets/udacity.png"></a> </div>
276+
<a href="http://4scotty.com/" target="_blank"><img src="../hackhpi_assets/4scotty-logo.png"></a><a href="https://de.udacity.com/" target="_blank"><img src="../hackhpi_assets/udacity.png"></a> </div>
279277
</div>
280278

281279

@@ -287,7 +285,7 @@ <h3 class="text-colored text-center">Supporter</h3>
287285
</div>
288286
<div class="row sponsors-kilo">
289287
<div class="col-md-12">
290-
<a href="http://www.isskindiss.de/" target="_blank"><img src="./hackhpi_assets/isskindiss.png"><br><span>Official food supporter</span></a><a href="https://github.com/" target="_blank"><img src="./hackhpi_assets/github.png"><br><span>Official&nbsp;technical supporter</span></a> </div>
288+
<a href="http://www.isskindiss.de/" target="_blank"><img src="../hackhpi_assets/isskindiss.png"><br><span>Official food supporter</span></a><a href="https://github.com/" target="_blank"><img src="../hackhpi_assets/github.png"><br><span>Official&nbsp;technical supporter</span></a> </div>
291289
</div>
292290

293291
<div class="row">
@@ -310,7 +308,7 @@ <h1>Get your ticket</h1>
310308
<div class="row">
311309
<div class="col-md-12">
312310
<!--http://eventbrite.com/tickets-external?eid=19275761321&amp;ref=etckt-->
313-
<iframe src="./hackhpi_assets/tickets-external.html" frameborder="0" height="540" width="100%" vspace="0" hspace="0" marginheight="5" marginwidth="5" scrolling="auto" allowtransparency="true" style="height: 540px!important; width:100%;"></iframe>
311+
<iframe src="../hackhpi_assets/tickets-external.html" frameborder="0" height="540" width="100%" vspace="0" hspace="0" marginheight="5" marginwidth="5" scrolling="auto" allowtransparency="true" style="height: 540px!important; width:100%;"></iframe>
314312
</div>
315313
</div>
316314
</div>
@@ -336,12 +334,12 @@ <h1>Get in touch</h1>
336334
<div class="container">
337335
<div class="row">
338336
<div class="col-md-3">
339-
<a href="https://2016.hackhpi.org/"><img src="./hackhpi_assets/logo-2016.png" class="logo img-responsive"></a>
337+
<a href="#"><img src="../hackhpi_assets/logo-2016.png" class="logo img-responsive"></a>
340338
</div>
341339
<div class="col-md-3">
342340
<span class="column-title">HackHPI</span>
343341
<ul>
344-
<li><a href="https://2016.hackhpi.org/">Journey</a></li>
342+
<li><a href="#">Journey</a></li>
345343
<li><a href="https://mlh.io/" target="_blank">Major League Hacking</a></li>
346344
<li><a href="http://static.mlh.io/docs/mlh-code-of-conduct.pdf" target="_blank">MLH Code of Conduct</a></li>
347345
</ul>
@@ -357,18 +355,18 @@ <h1>Get in touch</h1>
357355
<div class="col-md-3">
358356
<span class="column-title">More</span>
359357
<ul>
360-
<li><a href="https://2016.hackhpi.org/press/">Press</a></li>
358+
<li><a href="../../press.html">Press</a></li>
361359
<li><a href="mailto:[email protected]">Contact</a></li>
362-
<li><a href="https://2016.hackhpi.org/imprint/">Imprint / Privacy</a></li>
360+
<li><a href="../../imprint.html">Imprint / Privacy</a></li>
363361
</ul>
364362
</div>
365363
</div>
366364
</div>
367365
</footer>
368366

369-
<script type="text/javascript" src="./hackhpi_assets/jquery.min.js"></script>
370-
<script type="text/javascript" src="./hackhpi_assets/jquery.countdown.min.js"></script>
371-
<script type="text/javascript" src="./hackhpi_assets/app.js"></script>
367+
<script type="text/javascript" src="../hackhpi_assets/jquery.min.js"></script>
368+
<script type="text/javascript" src="../hackhpi_assets/jquery.countdown.min.js"></script>
369+
<script type="text/javascript" src="../hackhpi_assets/app.js"></script>
372370

373371

374372
</body></html>

0 commit comments

Comments
 (0)