Skip to content

Various general section tweaks #1020

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 11, 2020
Merged

Various general section tweaks #1020

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1a5517b
Fix width of general cols to be 60/40
peterkos Dec 11, 2020
5de974b
Fix button link thing
peterkos Dec 11, 2020
08fdc2d
Factor button effect out for (most) place exc card
peterkos Dec 11, 2020
451ff1c
Merge branch 'develop' into bh-1017
peterkos Dec 11, 2020
95ff84c
Merge branch 'develop' into bh-1017
peterkos Dec 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,12 @@ <h2>What is a Hackathon?</h2>
<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>
<p>Come spend 24 hours with us at BrickHack and dedicate time to learn, collaborate, build, and innovate.</p>
</div>
<div id="mlh">
<i class="fas fa-arrow-right"></i>
<a href="https://mlh.io/" target="_blank" rel="noopener noreferrer">Visit Major League Hacking (MLH)</a>
</div>
<a href="https://mlh.io/" id="mlh" target="_blank" rel="noopener noreferrer">
<div>
<i class="fas fa-arrow-right"></i>
<p>Visit Major League Hacking (MLH)</p>
</div>
</a>
</div>
</section>
<section id="schedule">
Expand Down
33 changes: 21 additions & 12 deletions sass/main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,13 @@ $event-count: 6;
display: inline-block;
color: white;
cursor: pointer;
@include button-effect($red);
}

@mixin button-effect($color) {
transition: 0.2s all;
&:hover {
background-color: lighten($red, 5%);
background-color: lighten($color, 5%);
}
&:active {
transform: translateY(4px);
Expand Down Expand Up @@ -290,13 +294,17 @@ nav {
}

.slick-arrow {
margin-top: 70px;
margin-top: 50px;
width: 60px;
height: 60px;
background-color: $blue;
border: 2px solid #A3A9CA;
box-sizing: border-box;
border-radius: 50%;

// slick-theme has a transform we don't need!
transform: none;
@include button-effect($blue);
}

// Make sure these appear over the slides!
Expand Down Expand Up @@ -339,25 +347,24 @@ nav {
padding: $section-padding;
align-items: center;

div {
width: 40%;
#hackathon-text {
width: 60%;
}
}

#mlh {
@include button;
@include button-effect($light-blue);
background-color: $light-blue;
display: inline-block;
width: auto;
height: auto;
margin: 0 auto;
padding: 30px;
border-radius: 20px;

&:hover {
background-color: lighten($light-blue, 5%);
i, p {
display: inline;
}

a {
p {
font-size: 1.2em;
font-weight: $font-medium;
}
Expand All @@ -367,6 +374,7 @@ nav {
font-size: 1.6em;
color: $red;
vertical-align: text-bottom;
padding-right: 10px;
}
}
}
Expand Down Expand Up @@ -399,8 +407,9 @@ nav {
margin-bottom: $card-m;
border-radius: 7px;
background-color: $light-blue;
&:hover {
background-color: lighten($light-blue, 5%);
@include button-effect($light-blue);
&:active {
transform: none;
}
.accordion-header {
background-color: transparent;
Expand Down