Skip to content

Commit fca10c0

Browse files
cbaudouinjrcbaudouinjr
authored
Merge pull request #879 from codeRIT/develop
Event Closure
2 parents 52f0e7d + 97b02ad commit fca10c0

9 files changed

Lines changed: 66 additions & 34 deletions

File tree

‎app/assets/images/home_asset_1_2.png‎

24 KB
Loading

‎app/assets/images/ricky-goodbye.gif‎

6.61 MB
Loading

‎app/assets/stylesheets/home/layout.scss‎

Lines changed: 34 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,18 @@ body {
114114
background-size: 700px;
115115

116116
@media (max-width: 1100px) {
117-
/*background-image: asset-url("home/about-background-bricks-double.svg");*/
118-
height: 1200px;
117+
background: asset-url("home_asset_1_2.png") no-repeat left;
118+
height: 200%;
119+
width: 100%;
119120
opacity: 0.15;
121+
margin-top: 100px;
120122
}
121123
@media (max-width: 480px) {
122-
margin-top: 40px;
124+
background-size: 450px;
125+
margin-top: 0px;
126+
}
127+
@media (max-width: 400px) {
128+
margin-top: 50px;
123129
}
124130
}
125131

@@ -150,6 +156,18 @@ body {
150156
}
151157
}
152158

159+
.ricky__sticker {
160+
width: 500px;
161+
padding: 0 0px 0px;
162+
box-sizing: border-box;
163+
margin-top: -40px;
164+
margin-bottom: 10px;
165+
166+
@media (max-width: 480px) {
167+
width: 300px;
168+
}
169+
}
170+
153171
/* Video section
154172
*/
155173

@@ -280,10 +298,6 @@ body {
280298
}
281299
}
282300

283-
.sponsor a {
284-
display:block {}
285-
}
286-
287301
.sponsor__wrapper {
288302
margin: 0 auto;
289303
max-width: 1000px;
@@ -447,3 +461,16 @@ body {
447461
margin-bottom: 1em;
448462
}
449463
}
464+
465+
.goodbye__text__nonmobile{
466+
display: flex;
467+
@media (max-width: 480px) {
468+
display: none;
469+
}
470+
}
471+
472+
.goodbye__text__mobile{
473+
@media (min-width: 480px) {
474+
display: none;
475+
}
476+
}

‎app/assets/stylesheets/home/nav.scss‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ $nav-space-tablet: 15px;
2424
font-weight: bold;
2525
padding-right: 5%;
2626
@media (max-width: 1100px) {
27-
padding-top: 40px;
27+
padding-top: 30px;
2828
padding-bottom: 20px;
2929
}
3030
}
@@ -120,8 +120,9 @@ $nav-space-tablet: 15px;
120120
.nav__signup__button{
121121
position: fixed;
122122
right: 140px;
123+
width: 115px;
123124
@media (max-width: 850px) {
124125
left: 120px;
125-
top: 30px;
126+
top: 15px;
126127
}
127128
}

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

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
<%
2-
pages = ['Gallery', 'MLH Code of Conduct']
2+
pages = ['']
33
%>
44

5-
<nav class="section nav">
6-
<div class="nav__links">
7-
<% pages.each do |page| %>
8-
<% if page.eql? 'MLH Code of Conduct' %>
9-
<a class="nav__link" href="https://static.mlh.io/docs/mlh-code-of-conduct.pdf">
10-
<% else %>
11-
<a class="nav__link" href="/<%= page.downcase %>/">
5+
<nav class="nav">
6+
<div class="nav__content">
7+
<div class="nav__links">
8+
<% 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">
11+
<% else %>
12+
<a class="nav__link" href="/<%= page.downcase %>/">
13+
<% end %>
14+
<%= page %>
15+
</a>
1216
<% end %>
13-
<%= page %>
14-
</a>
15-
<% end %>
17+
</div>
1618
</div>
17-
<div class="nav__buttons"></div>
1819
</nav>
1920

2021
<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"

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<%= stylesheet_link_tag 'home.css' %>
33
<% end %>
44

5-
<%= render "layouts/nav" %>
6-
75
<% register_link = "https://apply.brickhack.io".freeze %>
86
<% volunteer_link = "https://forms.gle/4id7fkjxpAooh59B7".freeze %>
97

8+
<%= render "layouts/nav" %>
9+
1010
<div class="section about" id="about">
1111
<div class="about__wrapper">
1212
<div class="about__left">
@@ -235,10 +235,8 @@
235235
</div>
236236
</div>
237237

238-
239238
<div class="section footer-break"></div>
240239

241-
242240
<div class="section footer">
243241
<div class="footer__rit">
244242
<%= link_to 'https://rit.edu' do %>

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

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<% content_for(:head) do %> <%= stylesheet_link_tag 'ty.css' %>
1+
<% content_for(:head) do %>
2+
<%= stylesheet_link_tag 'home.css' %>
23
<% end %>
34

45
<%= render "layouts/nav_ty" %>
@@ -7,17 +8,21 @@
78
<div class="about__wrapper">
89
<div class="about__left">
910
<div class="about__left-background"></div>
10-
<%= image_tag 'bh-logos/brickhack-6.png', alt: 'BrickHack V', class: 'about__logo' %>
11+
<%= image_tag 'ricky-goodbye.gif', alt: 'Bye Ricky', class: 'ricky__sticker' %>
12+
<div class="goodbye__text__mobile"
13+
<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" %>
16+
</div>
1117
</div>
12-
<div class="about__right">
18+
<div class="about__right goodbye__text__nonmobile">
1319
<div class="about__right-background"></div>
14-
<center><h2>BrickHack 6<br>Brick City's Premiere Hackathon</h2><br>
15-
<h3>February 8th-9th, 2020<br>Gordon Field House<br>Rochester Institute of Technology</h3></center>
16-
<p style = "margin-bottom: 10px"><br>Want to be notified?</p>
17-
<%= btn_link_to "Notify Me", "http://eepurl.com/glscFj" %>
20+
<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>
1823
</div>
1924
</div>
2025
</div>
2126
<!-- Start of HubSpot Embed Code -->
2227
<script defer="defer" id="hs-script-loader" src="//js.hs-scripts.com/2104052.js" type="text/javascript"></script>
23-
<!-- End of HubSpot Embed Code -->
28+
<!-- End of HubSpot Embed Code -->

‎config/routes.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@
1010
# Homepage
1111

1212
# root to: 'pages#index'
13-
root to: 'pages#index'
13+
root to: 'pages#thankyou'
1414
end

‎vendor/cache/rack-2.0.7.gem‎

-249 KB
Binary file not shown.

0 commit comments

Comments
 (0)