Skip to content

Commit 990ee41

Browse files
committed
Merge branch 'develop' into bh-1033
Signed-off-by: Peter Kos <pkos91@icloud.com> # Conflicts: # index.html # sass/main.scss
2 parents 0b8e3ee + e7246a9 commit 990ee41

2 files changed

Lines changed: 34 additions & 25 deletions

File tree

index.html

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -135,12 +135,16 @@ <h2>What is a Hackathon?</h2>
135135
<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>
136136
<p>Come spend 24 hours with us at BrickHack and dedicate time to learn, collaborate, build, and innovate.</p>
137137
</div>
138-
<a href="https://mlh.io/" id="mlh" target="_blank" rel="noopener noreferrer">
139-
<div>
138+
<div id="hackathon-buttons">
139+
<a href="https://mlh.io/" id="mlh" target="_blank" rel="noopener noreferrer">
140140
<i class="fas fa-arrow-right"></i>
141-
<p>Visit Major League Hacking</p>
142-
</div>
143-
</a>
141+
<p>Visit Major League Hacking (MLH)</p>
142+
</a>
143+
<a href="javascript:void(0);" id="gallery" rel="noopener noreferrer">
144+
<i class="fas fa-tools"></i>
145+
<p>Gallery (coming soon!)</p>
146+
</a>
147+
</div>
144148
</div>
145149
</section>
146150
<section id="schedule" class="section-pad">

sass/main.scss

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -410,29 +410,34 @@ nav {
410410
}
411411
}
412412

413-
#mlh {
414-
@include button;
415-
@include button-effect($light-blue);
416-
background-color: $light-blue;
417-
margin: 0 auto;
418-
padding: 30px;
419-
border-radius: 20px;
413+
#hackathon-buttons {
414+
display: flex;
415+
flex-direction: column;
416+
margin: 0px auto;
417+
align-items: flex-start;
420418

421-
i, p {
422-
display: inline;
423-
}
419+
#mlh, #gallery {
420+
@include button;
421+
@include button-effect($light-blue);
422+
display: flex;
423+
align-items: center;
424+
background-color: $light-blue;
425+
margin: 24px 0px;
426+
padding: 30px;
427+
border-radius: $img-border-radius;
428+
width: 100%;
424429

425-
p {
426-
font-size: 1.2em;
427-
font-weight: $font-medium;
428-
}
430+
p {
431+
margin: 0px;
432+
font-size: 1.2em;
433+
font-weight: $font-medium;
434+
}
429435

430-
// TODO: Needs better alignment.
431-
i {
432-
font-size: 1.6em;
433-
color: $red;
434-
vertical-align: text-bottom;
435-
padding-right: 10px;
436+
i.fa-arrow-right, i.fa-tools {
437+
font-size: 1.6em;
438+
color: $red;
439+
padding-right: 10px;
440+
}
436441
}
437442
}
438443
}

0 commit comments

Comments
 (0)