Skip to content

Commit

Permalink
Revert "Add discord button to hero (#1155)"
Browse files Browse the repository at this point in the history
This reverts commit 04d555d.

# Conflicts:
#	index.html
  • Loading branch information
peterkos committed Feb 17, 2021
1 parent d2fdf90 commit d1fd38f
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 65 deletions.
8 changes: 3 additions & 5 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,9 @@
<!-- Background images due to easier positioning. -->
<div id="hero-text">
<p id="bh7">BRICKHACK 7</p>
<p id="dates">FEB 20-21 | RIT DIGITAL HACKATHON</p>
<div id="action-buttons">
<a id="register" href="https://apply.brickhack.io/users/sign_up">REGISTER</a>
<a id="discord" href="https://discord.gg/rXapGXsYEK">DISCORD</a>
</div>
<p id="premiere">RIT's Premiere Hackathon</p>
<p id="dates">FEB 20-21 | ROCHESTER INSTITUTE OF TECHNOLOGY</p>
<a id="register" href="https://apply.brickhack.io/users/sign_up">REGISTER</a>
</div>
</div>
<div id="desk-container" class="rellax" data-rellax-speed="0" data-rellax-desktop-speed="-8">
Expand Down
105 changes: 45 additions & 60 deletions sass/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ $title-size: 3em;
text-decoration: none;
user-select: none;
padding: 10px 20px;
border-radius: 20px;
border-radius: 50px;
display: inline-block;
color: white;
cursor: pointer;
Expand Down Expand Up @@ -191,37 +191,28 @@ nav {
// This lets the different h elements
// appear to be equally spaced.
line-height: 0.7;
margin-bottom: 40px;
margin-bottom: 30px;
}

#bh7 {
font-size: 6em;
font-size: 5.4em;
font-weight: $font-extrabold;
}

#dates {
font-size: 2em;
font-weight: $font-extrabold;
#premiere {
font-size: 2.5em;
font-weight: $font-medium;
}

#action-buttons {
display: flex;
justify-content: space-between;
width: 80%;

#register, #discord {
@include button;
font-size: 2.3em;
width: 48%;
text-align: center;
}
#dates {
font-size: 1.3em;
font-weight: $font-regular;
}

#discord {
background-color: $dark-blue;
&:hover {
background-color: lighten($dark-blue, 5%);
}
}
#register {
@include button;
padding: 10px 80px;
font-size: 2em;
}

// Hero Graphics
Expand Down Expand Up @@ -1249,6 +1240,18 @@ footer {
}

#hero {
#bh7 {
font-size: 6.4em;
}

#premiere {
font-size: 3em;
}

#dates {
font-size: 1.6em;
}

#register {
font-size: 2.3em;
}
Expand Down Expand Up @@ -1277,13 +1280,18 @@ footer {
}

#hero {

#bh7 {
font-size: 5.0em;
}

// #dates {
// font-size: 1.7em;
// }
#premiere {
font-size: 2.0em;
}

#dates {
font-size: 1.1em;
}

#shapes {
right: -100px;
Expand Down Expand Up @@ -1385,20 +1393,6 @@ footer {

@media screen and (max-width: 1220px) {

#hero {
#dates {
font-size: 1.5em;
}

#action-buttons {
width: 70%;

#register, #discord {
font-size: 1.7em;
}
}
}

#hackathon #hackathon-content #hackathon-buttons {
width: 100%;
}
Expand Down Expand Up @@ -1527,20 +1521,16 @@ footer {
font-size: 4.2em;
}

#hero-text {
margin-top: 10vh;
#premiere {
font-size: 2.0em;
}

#dates {
font-size: 1.5em;
font-size: 1.1em;
}

#action-buttons {
width: 60%;

#register, #discord {
font-size: 1.2em;
}
#hero-text {
margin-top: 10vh;
}

#desk-container {
Expand Down Expand Up @@ -1737,23 +1727,18 @@ footer {

p {
line-height: 0.4;
margin-bottom: 25px;
}

#bh7 {
font-size: 3em;
font-size: 2.4em;
}

#dates {
font-size: 1em;
#premiere {
font-size: 1.5em;
}

#action-buttons {
width: 80%;

#register, #discord {
font-size: 1.2em;
}
#dates {
font-size: 0.7em;
}

#desk-container {
Expand Down Expand Up @@ -1856,7 +1841,7 @@ footer {

@media screen and (max-width: 320px) {

#hero #dates {
#hero #premiere {
font-size: 1.2em;
}
}

0 comments on commit d1fd38f

Please sign in to comment.