Merge branch 'develop' into GalleryToNavbar_BH-49

cbaudouinjr · web-flow · commit 3311ca990680 · 2019-11-21T21:50:01.000-05:00
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -57,7 +57,7 @@ GEM
       simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.2)
     concurrent-ruby (1.1.5)
-    crass (1.0.4)
+    crass (1.0.5)
     debug_inspector (0.0.3)
     docile (1.3.1)
     dotenv (2.7.2)
@@ -99,7 +99,7 @@ GEM
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
-    loofah (2.2.3)
+    loofah (2.3.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     lumberjack (1.0.13)
@@ -125,7 +125,7 @@ GEM
     multi_xml (0.6.0)
     nenv (0.3.0)
     nio4r (2.3.1)
-    nokogiri (1.10.3)
+    nokogiri (1.10.5)
       mini_portile2 (~> 2.4.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
diff --git a/app/assets/stylesheets/home/layout.scss b/app/assets/stylesheets/home/layout.scss
@@ -37,12 +37,16 @@ body {
 }
 
 .double-section {
-  padding-bottom: 100px;
+  padding-top: 50px;
+  padding-bottom: 50px;
   display: flex;
   flex-flow: row wrap;
   max-width: 1400px;
   justify-content: space-evenly;
   align-items: center;
+  @media (min-width: 1100px) {
+    padding-top: 125px;
+  }
 }
 
 /* About section
@@ -93,6 +97,9 @@ body {
 .about__right {
   flex: 400px 1 1;
   max-width: 500px;
+  @media (max-width: 1100px) {
+    min-height: calc(85vh - 80px);
+  }
 }
 
 .about__right p {
@@ -120,15 +127,18 @@ body {
 
 .about__right-background {
   background: asset-url("home_asset_2.png") no-repeat center center;
-  width: 800px;
-  height: 1040px;
+  width: 600px;
+  height: 780px;
   position: absolute;
-  right: -35px;
+  right: -25px;
   z-index: -1;
   opacity: 0.3;
-  background-size: 700px;
+  background-size: 525px;
   margin-left: 100px;
-  margin-top: 200px;
+  margin-top: 125px;
+  @media (max-width: 1100px) {
+    display:none;
+  }
 }
 
 .about__logo {
@@ -146,13 +156,29 @@ body {
  */
 
 .video {
-  padding-top: 49px;
+  padding-top: 50px;
   padding-bottom: 50px;
   padding-right: 0;
   padding-left: 0;
+
+  width: 690px;
+  height: 390px;
+
+  @media (max-width: 680px) {
+    width: 560px;
+    height: 315px;
+  }
+
+  @media (max-width: 500px) {
+    width: 400px;
+    height: 225px;
+  }
 }
 
 .video__wrapper {
+  width: 100%;
+  height: 100%;
+
   display: flex;
   flex-flow: row wrap;
   align-items: center;
@@ -161,23 +187,8 @@ body {
 
 .video__frame {
   margin-bottom: 15px;
-  width: 560px;
-  height: 315px;
-
-  @media (max-width: 1400px) {
-    width: 690px;
-    height: 390px;
-  }
-
-  @media (max-width: 680px) {
-    width: 560px;
-    height: 315px;
-  }
-
-  @media (max-width: 600px) {
-    width: 400px;
-    height: 225px;
-  }
+  width: 100%;
+  height: 100%;
 }
 
 .video__description {
@@ -193,9 +204,9 @@ body {
   padding-bottom: 50px;
 
   @media (min-width: 1400px) {
-    width: 550px;
+    width: 500px;
     padding-right: 0;
-    padding-left: 0;
+    padding-left: 25px;
   }
 
   @media (max-width: 1400px) {
diff --git a/app/assets/stylesheets/home/nav.scss b/app/assets/stylesheets/home/nav.scss
@@ -8,6 +8,9 @@ $nav-space: 20px;
   width: 100%;
   height: 75px;
   z-index: 1;
+  @media (max-width: 850px) {
+    //position: static;
+  }
 }
 
 .nav__content{
@@ -97,3 +100,18 @@ $nav-space: 20px;
     margin-right: 100px;
   }
 }
+
+.nav__mlh{
+  display:block;
+  max-width:100px;
+  min-width:60px;
+  position:fixed;
+  right:30px;
+  top:0;
+  width:8%;
+  z-index:10000;
+
+  @media (max-width: 850px) {
+    left: 30px;
+  }
+}
diff --git a/app/assets/stylesheets/home/type.scss b/app/assets/stylesheets/home/type.scss
@@ -22,7 +22,7 @@ h2 {
 }
 
 a, a:visited {
-  text-decoration: underline;
+  text-decoration: none;
   transition: color 0.2s ease-out;
 }
 
diff --git a/app/views/layouts/_nav.html.erb b/app/views/layouts/_nav.html.erb
@@ -30,7 +30,7 @@
   </div>
 </nav>
 
-<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" style="display:block;max-width:100px;min-width:60px;position:fixed;right:30px;top:0;width:8%;z-index:10000" target="_blank">
+<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">
   <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%"/>
 </a>
 
diff --git a/app/views/layouts/_nav_coming_soon.html.erb b/app/views/layouts/_nav_coming_soon.html.erb
diff --git a/app/views/layouts/_nav_ty.html.erb b/app/views/layouts/_nav_ty.html.erb
@@ -1,11 +1,15 @@
 <%
-  pages = ['Gallery'] 
+  pages = ['Gallery', 'MLH Code of Conduct']
 %>
 
 <nav class="section nav">
   <div class="nav__links">
     <% pages.each do |page| %>
+      <% if page.eql? 'MLH Code of Conduct' %>
+        <a class="nav__link" href="https://static.mlh.io/docs/mlh-code-of-conduct.pdf">
+      <% else %>
       <a class="nav__link" href="/<%= page.downcase %>/">
+      <% end %>
         <%= page %>
       </a>
     <% end %>
diff --git a/app/views/layouts/_shared_head.html.erb b/app/views/layouts/_shared_head.html.erb
@@ -1,6 +1,6 @@
 <%
   title = "BrickHack"
-  description = "Feb 16 & 17, 2019 - 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."
+  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."
   url = "https://brickhack.io"
 %>
 <meta charset="utf-8"/>
@@ -11,7 +11,7 @@
 <meta content="<%= url %>" property="og:url"/>
 <meta content="<%= description %>" property="og:description"/>
 <meta content="<%= image_url("brickhack6_card.png") %>" property="og:image"/>
-<meta content="<%= image_url("bh-logos/brickhack-5.png") %>" property="og:image"/>
+<meta content="<%= image_url("bh-logos/brickhack-6.png") %>" property="og:image"/>
 <meta content="summary" name="twitter:card"/>
 <meta content="<%= url %>" name="twitter:url"/>
 <meta content="<%= title %>" name="twitter:title"/>
diff --git a/app/views/pages/_faq.html.erb b/app/views/pages/_faq.html.erb
@@ -2,11 +2,11 @@
 involved_link = 'mailto:logistics@coderit.org?subject=I&#39;d%20like%20to%20get%20involved with BrickHack!'
 
   faq_content = {
+    "Who can participate in BrickHack?" => "Anyone currently enrolled as a student can attend! If you don't fit that description, you're absolutely welcome to attend as a <a href=\"#{involved_link}\">mentor</a> or <a href=\"#{involved_link}\">volunteer</a>. All attendees must be 18 years or older.",
     "Do I need a team to join?" => "While teams are often recommended and sometimes more fun, they're not required. We will be hosting a teambuilding event shortly after kickoff, but feel free to invite your friends! Teams are a max of 4 people. Each person must register individually.",
     "What should I bring?" => "Bring yourself, a photo ID, clothes, toiletries, a sleeping bag/blanket, your hacker setup, and maybe an idea or two.",
-    "Who can participate in BrickHack?" => "Anyone currently enrolled as a student can attend! If you don't fit that description, you're absolutely welcome to attend as a <a href=\"#{involved_link}\">mentor</a> or <a href=\"#{involved_link}\">volunteer</a>. All attendees must be 18 years or older.",
     "Do RIT students need to apply?" => "Yes, RIT students need to apply just like everyone else.",
-    "When will I know if I got in?" => "Rolling acceptances start in late December",
+    "When will I know if I got in?" => "Rolling acceptances will start in late December.",
     "Should I bring my own bricks?" => "We've got you covered.",
     "My question isn't answered here..." => "Fret not! Feel free to reach out to us on <a href=\"https://twitter.com/brickhackrit\">Twitter</a>, <a href=\"https://www.facebook.com/brickhackrit\">Facebook</a>, or <a href=\"mailto:hello@brickhack.io\">email</a>."
   }
diff --git a/app/views/pages/comingsoon.html.erb b/app/views/pages/comingsoon.html.erb
@@ -1,22 +1,57 @@
-<% content_for(:head) do %> <%= stylesheet_link_tag 'ty.css' %>
-<% end %>
+<%= stylesheet_link_tag 'comingsoon.css' %>
 
-<%= render "layouts/nav_coming_soon" %>
+<a href="https://mlh.io/seasons/na-2019/events?utm_source=na-hackathon&utm_medium=TrustBadge&utm_campaign=2019-season&utm_content=gray" id="mlh-trust-badge" style="display:block;max-width:100px;min-width:60px;position:fixed;right:50px;top:0;width:10%;z-index:10000" target="_blank">
+  <img alt="Major League Hacking 2019 Hackathon Season" src="https://s3.amazonaws.com/logged-assets/trust-badge/2019/mlh-trust-badge-2019-gray.svg" style="width:100%"/>
+</a>
 
-<div class="section about" id="about">
-  <div class="about__wrapper">
-    <div class="about__left">
-      <div class="about__left-background"></div>
-      <%= image_tag 'bh-logos/brickhack-6.png', alt: 'BrickHack V', class: 'about__logo' %>
-    </div>
-    <div class="about__right">
-      <div class="about__right-background"></div>
-      <center><h2>BrickHack 6<br>Brick City's Premiere Hackathon</h2><br>
-      <h3>February 8th-9th, 2020<br>Gordon Field House<br>Rochester Institute of Technology</h3></center>
-      <p style = "margin-bottom: 10px"><br>Want to be notified?</p>
-      <%= btn_link_to "Notify Me", "http://eepurl.com/glscFj" %>
+<div class="page triangle-background split">
+  <div class="split-left" id="split-left">
+    <div class="center-vertical plus-nav">
+      <%= image_tag 'bh-logos/brickhack-5.svg', { id: 'logo', class: 'wow rotate-in', align: 'center'} %>
+      <br/>
+      <h2>Coming Soon</h2>
+      <p>
+        <em>Enter your email below! We'll keep you posted.</em>
+      </p>
+      <div id="mc_embed_signup">
+        <form action="//coderit.us11.list-manage.com/subscribe/post?u=122b09a8cef4c1f3888af8e40&amp;id=be625a634d" class="validate" id="mc-embedded-subscribe-form" method="post" name="mc-embedded-subscribe-form" target="_blank">
+          <div id="mc_embed_signup_scroll">
+            <div class="mc-field-groupe">
+              <input autofocus="<%= true %>" class="required email" id="mce-EMAIL" name="EMAIL" placeholder="myemail@example.com" style="width: 90%; max-width: 300px" type="email"></input>
+            </div>
+            <div class="clear" id="mce-responses">
+              <div class="response" id="mce-error-response" style="display:none"></div>
+              <div class="response" id="mce-success-response" style="display:none"></div>
+            </div>
+            <!-- real people should not fill this in and expect good things - do not remove this or risk form bot signups -->
+            <div style="position: absolute; left: -5000px;">
+              <input name="b_122b09a8cef4c1f3888af8e40_be625a634d" tabindex="-1" type="text">/</input>
+            </div>
+            <div class="clear">
+              <input class="button" id="mc-embedded-subscribe" name="subscribe" type="submit" value="Join the mailing list">/</input>
+            </div>
+          </div>
+        </form>
+      </div>
+
+      <%= btn_link_to 'Sponsor Info', image_path("BrickHack 4 Sponsorship Information.pdf"), { style: 'margin-bottom: 0px;' } %>
+
+      <br/>
+
+      <div class="social-list" style="margin-top: 30px">
+        <p style="float: left;"></p>
+        <%= link_to '<span class="fa fa-twitter-square fa-fw"></span> Twitter'.html_safe, 'https://twitter.com/brickhackrit' %>
+        <p style="float: right;"></p>
+        <%= link_to '<span class="fa fa-facebook-square fa-fw"></span> Facebook'.html_safe, 'https://www.facebook.com/brickhackrit' %>
+        <p style="float: right;"></p>
+        <%= link_to '<span class="fa fa-user-circle fa-fw"></span> CampusGroups'.html_safe, 'https://campusgroups.rit.edu/CODERIT/club_signup' %>
+      </div>
     </div>
   </div>
+
+  <div class="split split-right" id="overlay">
+    <%= image_tag 'coming_soon/asset.svg' %>
+  </div>
 </div>
 <!-- Start of HubSpot Embed Code -->
 <script defer="defer" id="hs-script-loader" src="//js.hs-scripts.com/2104052.js" type="text/javascript"></script>
diff --git a/app/views/pages/index.html.erb b/app/views/pages/index.html.erb
diff --git a/app/views/pages/thankyou.html.erb b/app/views/pages/thankyou.html.erb
diff --git a/config/routes.rb b/config/routes.rb

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ h2 {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`a, a:visited {`
`25`		`- text-decoration: underline;`
	`25`	`+ text-decoration: none;`
`26`	`26`	`transition: color 0.2s ease-out;`
`27`	`27`	`}`
`28`	`28`