Skip to content

Commit 5dfa47e

Browse files
peterkospeterkos
committed
Merge branch 'develop' into bh-1034
# Conflicts: # index.html # sass/main.scss
2 parents 794cba4 + 76314db commit 5dfa47e

6 files changed

Lines changed: 579 additions & 230 deletions

File tree

‎assets/desk1-mobile.svg‎

Lines changed: 0 additions & 108 deletions
This file was deleted.

‎assets/logo.svg‎

Lines changed: 41 additions & 8 deletions
Loading

‎assets/wire.svg‎

Lines changed: 9 additions & 0 deletions
Loading

‎index.html‎

Lines changed: 28 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
<head>
44
<title>BrickHack 7</title>
55
<meta charset="utf-8"/>
6-
<!-- Disabled, see Issue #1027 -->
7-
<!-- <meta name="viewport" content="width=device-width, initial-scale=1"> -->
6+
<meta name="viewport" content="width=device-width, initial-scale=1">
87
<meta name="keywords" content="hackathons, hackathon, hack-a-thon, programming, hardware, development, design, rit"/>
98
<meta name="theme-color" content="#000000"/>
109

@@ -28,8 +27,8 @@
2827
<body>
2928
<nav>
3029
<div class="left">
31-
<a href="https://brickhack.io">
32-
<img id="logo" src="assets/logo.svg" alt="BrickHack 7 Logo" />
30+
<a id="logo" href="https://brickhack.io">
31+
<img src="assets/logo.svg" alt="BrickHack 7 Logo" />
3332
</a>
3433
<a class="link" href="#hackathon-content">GENERAL</a>
3534
<a class="link" href="#faq">FAQ</a>
@@ -43,20 +42,25 @@
4342
</a>
4443
</div>
4544
</nav>
46-
<section id="hero">
47-
<!-- Background images due to easier positioning. -->
48-
<div id="desk"></div>
49-
<div id="shelf"></div>
50-
<div id="hero-text">
51-
<p id="bh7">BRICKHACK 7</p>
52-
<p id="premiere">RIT's Premiere Hackathon</p>
53-
<p id="dates">FEB 20-21 | ROCHESTER INSTITUTE OF TECHNOLOGY</p>
54-
<a id="register" href="https://apply.brickhack.io/users/sign_up">REGISTER</a>
45+
<section id="hero" class="section-pad-left">
46+
<div id="desk-container">
47+
<div id="desk"></div>
48+
<div id="wire"></div>
5549
</div>
50+
<div id="shelf"></div>
5651
<div id="shapes"></div>
52+
<div id="hero-content">
53+
<!-- Background images due to easier positioning. -->
54+
<div id="hero-text">
55+
<p id="bh7">BRICKHACK 7</p>
56+
<p id="premiere">RIT's Premiere Hackathon</p>
57+
<p id="dates">FEB 20-21 | ROCHESTER INSTITUTE OF TECHNOLOGY</p>
58+
<a id="register" href="https://apply.brickhack.io/users/sign_up">REGISTER</a>
59+
</div>
60+
</div>
5761
</section>
5862
<section id="hackathon">
59-
<div class="carousel">
63+
<div class="carousel section-pad-top">
6064
<div class="slide">
6165
<div class="wire"></div>
6266
<div class="front-clip"></div>
@@ -128,26 +132,26 @@
128132
<span id="close"><i id="close" class="fas fa-times"></i></span>
129133
<img id="modal-content" alt="image from carousel">
130134
</div>
131-
<div id="hackathon-content">
135+
<div id="hackathon-content" class="section-pad">
132136
<div id="hackathon-text">
133-
<h2>What is a Hackathon?</h2>
137+
<h1>What is a Hackathon?</h1>
134138
<p>A Hackathon is an invention marathon. Any student can attend! Really, any student... and it's completely free.</p>
135139
<p>Students work in teams and mentors are present to offer help. Sponsors attend to help, recruit, and promote their products. Teams compete in different categories and prizes are awarded, but everyone learns and everyone wins!</p>
136140
<p>Come spend 24 hours with us at BrickHack and dedicate time to learn, collaborate, build, and innovate.</p>
137141
</div>
138142
<div id="hackathon-buttons">
139-
<a href="https://mlh.io/" id="mlh" target="_blank" rel="noopener noreferrer">
143+
<a href="https://mlh.io/" target="_blank" rel="noopener noreferrer">
140144
<i class="fas fa-arrow-right"></i>
141-
<p>Visit Major League Hacking (MLH)</p>
145+
<p>Visit Major League Hacking</p>
142146
</a>
143-
<a href="javascript:void(0);" id="gallery" rel="noopener noreferrer">
147+
<a href="javascript:void(0);" rel="noopener noreferrer">
144148
<i class="fas fa-tools"></i>
145149
<p>Gallery (coming soon!)</p>
146150
</a>
147151
</div>
148152
</div>
149153
</section>
150-
<section id="schedule">
154+
<section id="schedule" class="section-pad">
151155
<h1>Schedule</h1>
152156
<p>More events coming soon!</p>
153157
<div id="schedule-block">
@@ -205,7 +209,7 @@ <h6 class="name">SUNDAY</h6>
205209
</div>
206210
</div>
207211
</section>
208-
<section id="faq">
212+
<section id="faq" class="section-pad">
209213
<div id="faq-wrapper">
210214
<h1>Frequently Asked Questions</h1>
211215
<div id="faq-cards">
@@ -300,9 +304,9 @@ <h1>Frequently Asked Questions</h1>
300304
</div>
301305
</section>
302306
<section id="leadership">
303-
<div id="leadership-content">
307+
<div id="leadership-content" class="section-pad">
304308
<h1>Leadership Team</h1>
305-
<div id="leaders">
309+
<div id="leaders" class="section-pad-top">
306310
<div class="leader">
307311
<div class="leader-tape"></div>
308312
<img src="./assets/leadership/michael.jpg" alt="Michael's photo"/>
@@ -372,7 +376,7 @@ <h1>Leadership Team</h1>
372376
<div id="footer-content">
373377
<div>
374378
<h2>contact us</h2>
375-
<p>hello@coderit.org</p>
379+
<p><a href="mailto:hello@coderit.org">hello@coderit.org</a></p>
376380
</div>
377381
<div>
378382
<a href="https://twitter.com/coderit" target="_blank">

‎index.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ $(document).ready(function() {
2727
slidesToShow: 3,
2828
slidesToScroll: 2,
2929
cssEase: 'ease-in-out',
30-
autoplay: true,
30+
autoplay: false,
3131
autoplaySpeed: 2000,
3232
speed: 1000,
3333
responsive: [
3434
{
35-
breakpoint: 1100,
35+
breakpoint: 1500,
3636
settings: {
3737
centerMode: true
3838
}

0 commit comments

Comments
 (0)