Skip to content

Cleanup #117

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Jun 4, 2019
Merged

Cleanup #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5971870
removed live site link
simonstadlinger Jun 2, 2019
527e754
replaced bfdw logo with bfdw text
simonstadlinger Jun 2, 2019
37d978f
added redirect from live site to main page
simonstadlinger Jun 3, 2019
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
Binary file added hackhpi_assets/2019-partners/brotfuerdiewelt-nologojusttext.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 8 additions & 15 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,11 @@
<li><a class="scroll-link" data-target="intro" href="#intro">About</a></li>
<li><a class="scroll-link" data-target="sponsors" href="#sponsors">Partners</a></li>
<li><a class="scroll-link" data-target="location" href="#location">Venue</a></li>
<li><a class="scroll-link" data-target="ticket" href="#ticket">Tickets</a></li>
<!--<li><a class="scroll-link" data-target="ticket" href="#ticket">Tickets</a></li>-->
<li><a class="scroll-link" data-target="schedule" href="#schedule">Schedule</a></li>
<li><a class="scroll-link" data-target="faq" href="#faq">FAQ</a></li>
<li><a class="scroll-link" data-target="team" href="#team">Team</a></li>
<li><a class="scroll-link" data-target="get-in-touch" href="#get-in-touch">Contact</a></li>
<li><a class="badge badge-pill live" href="/live">LIVE</a></li>
</ul>
</div>
</nav>
Expand All @@ -73,13 +72,6 @@
<section class="container-fluid bg-grey triangle" id="intro">
<div class="container">
<div class="row">
<div class="col-md-12">
<p class="text-center" style="margin-bottom: 20px;">
<span style="font-size: 1.5em">Looking for the live page?</span><br>
<a id="applyNowButton" class="btn" href="/live"><span>LIVE PAGE</span></a>

</p>
</div>
<h1>What to expect at HackHPI 2019</h1>
<p>
Humanity has come far, but there remain many issues and injustices in society.
Expand Down Expand Up @@ -152,7 +144,7 @@ <h1 class="text-center">Partners</h1>
</a>

<a href="https://www.brot-fuer-die-welt.de/" class="sponsor" target="_blank">
<img src="./hackhpi_assets/2019-partners/brotfuerdiewelt.png">
<img src="./hackhpi_assets/2019-partners/brotfuerdiewelt-nologojusttext.png">
</a>
</div>
</div>
Expand Down Expand Up @@ -229,6 +221,7 @@ <h5>University of Potsdam</h5>
<img alt='Static Mapbox map of the HPI School of Design Thinking' src='https://api.mapbox.com/styles/v1/mapbox/streets-v10/static/13.12402,52.39181,15.5,0,0/1280x766?access_token=pk.eyJ1IjoiZmxvaHBpIiwiYSI6ImNqaHZvMzAzbTB3MWszbHFrdm9uMWE3bHQifQ.zmMV_rvJn9WmgaDTPIniGw' >
</div>
</section>
<!--
<section class="container-fluid triangle" id="ticket">
<div class="container">
<div class="row">
Expand All @@ -239,24 +232,24 @@ <h1>Ticket Application Form</h1>
<div class="col-md-12">
<p class="text-center" style="margin-bottom: 20px;">
<span style="font-size: 1.5em">Sign up period closes soon! Last chance to apply!</span><br>
<!-- or join our mailing list.<br><br>
See you at HackHPI 2019 ;-)-->
or join our mailing list.<br><br>
See you at HackHPI 2019 ;-)
<a id="applyNowButton" class="btn" href="https://docs.google.com/forms/d/e/1FAIpQLScLE8fb3xmQtswcie_Usz_GXgPOppHcS9sWCL70hSg5mmtZjQ/viewform?usp=sf_link" target="_blank"><span>Click here to apply now</span></a>

</p>
</div>
</div>
</section>
</section>-->
<section class="container-fluid bg-grey triangle" id="schedule">
<div class="container">
<div class="row">
<div class="col-md-12">
<!--<div class="col-md-12">
<p class="text-center" style="margin-bottom: 20px;">
<span style="font-size: 1.5em">Looking for the live page?</span><br>
<a id="applyNowButton" class="btn" href="/live"><span>LIVE PAGE</span></a>

</p>
</div>
</div>-->
<div class="col-md-12">
<h1>Schedule</h1>
</div>
Expand Down
6 changes: 5 additions & 1 deletion live/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,10 @@
<meta name="twitter:url" content="https://live.hackhpi.org/">
<meta name="twitter:description" content="Be a social hero! Come join our Hackathon about://social.good on 18th and 19th of May 2019 at Hasso Platter Institut">
<meta name="twitter:image" content="../hackhpi_assets/facebook-preview.png">


<script type="text/javascript">
window.location.href = "../index.html";
</script>
</head>

<body>
Expand Down Expand Up @@ -735,6 +738,7 @@ <h2>Hardware</h2>
<script type="text/javascript" src="./live_files/jquery.min.js"></script>
<script type="text/javascript" src="./live_files/jquery.countdown.min.js"></script>
<script type="text/javascript" src="./live_files/app.js"></script>



</body>
Expand Down
2 changes: 1 addition & 1 deletion partner-information.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ <h3>mTomady</h3>

<div class="row sponsor-information">
<div class="col-md-4">
<img src="./hackhpi_assets/2019-partners/brotfuerdiewelt.png" class="img-responsive">
<img src="./hackhpi_assets/2019-partners/brotfuerdiewelt-nologojusttext.png" class="img-responsive">
</div>

<div class="col-md-8">
Expand Down