Skip to content

Commit 2b34801

Browse files
cbaudouinjrcbaudouinjr
authored
Merge pull request #882 from codeRIT/develop
Post-Event
2 parents fca10c0 + 6689be9 commit 2b34801

4 files changed

Lines changed: 44 additions & 15 deletions

File tree

‎app/views/layouts/_nav_ty.html.erb‎

Lines changed: 42 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,56 @@
11
<%
2-
pages = ['']
2+
simplified_nav = false if !defined?(simplified_nav)
3+
if simplified_nav
4+
pages = ['Home']
5+
else
6+
pages = ['Devpost']
7+
end
38
%>
49

510
<nav class="nav">
611
<div class="nav__content">
712
<div class="nav__links">
813
<% pages.each do |page| %>
9-
<% if page.eql? 'MLH Code of Conduct' %>
10-
<a class="nav__link" href="https://static.mlh.io/docs/mlh-code-of-conduct.pdf">
14+
<% if simplified_nav %>
15+
<a class="nav__link" href="/">
16+
<%= page %>
17+
</a>
18+
<% elsif page == 'Gallery' %>
19+
<a class="nav__link" href="/gallery/">
20+
<%= page %>
21+
</a>
22+
<% elsif page == 'Devpost' %>
23+
<a class="nav__link" href="https://brickhack6.devpost.com">
24+
<%= page %>
25+
</a>
1126
<% else %>
12-
<a class="nav__link" href="/<%= page.downcase %>/">
27+
<a class="nav__link" href="#<%= page.downcase %>">
28+
<%= page %>
29+
</a>
1330
<% end %>
14-
<%= page %>
15-
</a>
1631
<% end %>
1732
</div>
1833
</div>
1934
</nav>
2035

21-
<a id="mlh-trust-badge" style="display:block;max-width:100px;min-width:60px;position:fixed;right:50px;top:0;width:10%;z-index:10000"
22-
href="https://mlh.io/seasons/na-2020/events?utm_source=na-hackathon&utm_medium=TrustBadge&utm_campaign=2020-season&utm_content=gray" target="_blank">
23-
<img src="https://s3.amazonaws.com/logged-assets/trust-badge/2020/mlh-trust-badge-2020-gray.svg" alt="Major League Hacking 2020 Hackathon Season" style="width:100%"></a>
36+
<a href="https://mlh.io/seasons/na-2020/events?utm_source=na-hackathon&utm_medium=TrustBadge&utm_campaign=2020-season&utm_content=gray" id="mlh-trust-badge" class = "nav__mlh" target="_blank">
37+
<img alt="Major League Hacking 2020 Hackathon Season" src="https://s3.amazonaws.com/logged-assets/trust-badge/2020/mlh-trust-badge-2020-gray.svg" style="width:100%"/>
38+
</a>
39+
40+
<!-- mobile nav
41+
<nav class="mobile">
42+
<i class="fa fa-bars mob-nav-header" id="hamburger-menu"></i>
43+
<h2 class="mob-nav-header" style="font-size: 24px; text-align: left; color: white; padding:0; margin: 0; position: relative; top: -5px; font-weight: 300">BrickHack</h2>
44+
<div id="mobile-nav">
45+
<div class="nav-links">
46+
<a class="active" href="#">BrickHack</a>
47+
<% pages.each do |page| %>
48+
<a href="#<%= page.downcase %>">
49+
<%= page %>
50+
</a>
51+
<% end %>
52+
<%= link_to 'Sign Up', 'https://apply.brickhack.io', class: 'mobile' %>
53+
</div>
54+
</div>
55+
</nav>
56+
-->

‎app/views/layouts/_shared_head.html.erb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<%
22
title = "BrickHack"
3-
description = "Feb 8 & 9, 2020 - RIT's premiere collegiate hackathon devoted to bringing 600 designers, developers, and all sorts of makers together for 24 hours to create something from nothing."
3+
description = "RIT's premiere collegiate hackathon devoted to bringing 600 designers, developers, and all sorts of makers together for 24 hours to create something from nothing."
44
url = "https://brickhack.io"
55
%>
66
<meta charset="utf-8"/>

‎app/views/layouts/application.html.erb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<html>
33
<head>
4-
<title><%= yield(:title).presence || "BrickHack 6 – Feb 8-9, 2020" %></title>
4+
<title><%= yield(:title).presence || "BrickHack" %></title>
55
<%= render "layouts/shared_head" %>
66
<%= stylesheet_link_tag "application", :media => "all" %>
77
<%= yield(:head) %>

‎app/views/pages/thankyou.html.erb‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,11 @@
1111
<%= image_tag 'ricky-goodbye.gif', alt: 'Bye Ricky', class: 'ricky__sticker' %>
1212
<div class="goodbye__text__mobile"
1313
<center><h2>Thanks for a great BrickHack! <br> See you next year!</h2></center>
14-
<p style = "margin-bottom: 10px">Join our mailing list!</p>
15-
<%= btn_link_to "Subscribe", "http://eepurl.com/glscFj" %>
1614
</div>
1715
</div>
1816
<div class="about__right goodbye__text__nonmobile">
1917
<div class="about__right-background"></div>
2018
<center><h2>Thanks for a great BrickHack! <br> See you next year!</h2></center>
21-
<h3 style = "margin-bottom: 10px">For issues with travel please contact:</h3>
22-
<a href="mailto:travel@coderit.org" style="color: orange;">travel@coderit.org</a>
2319
</div>
2420
</div>
2521
</div>

0 commit comments

Comments
 (0)