Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
22 changes: 21 additions & 1 deletion bhclub.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
</div>
<div>
<a class="social-link" href="https://discord.gg/gNJXjvzkuB" target="_blank">Discord</a>
<a class="social-link" href="#" target="_blank">CampusGroups</a>

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think Michael said in the BrickHack server that we don't need to include a CampusGroups link if you don't want to.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At this point I'm leaving decision of what links are actually included for the final pr (#1206), since we have about five different lists and I've already got a ton of merge conflicts with this and the about pr

<a class="social-link" href="#" target="_blank">GitHub</a>
<a class="social-link" href="#" target="_blank">Twitter</a>
<a class="social-link" href="#" target="_blank">Instagram</a>
Expand All @@ -52,7 +53,26 @@ <h1>Events</h1>
<h1>Teams</h1>
</section>
<section id="contact">
<h1>Contact</h1>
<div>
<h1>Contact</h1>
<p>Have any questions? Feel free to reach out to us at <a href="mailto:[email protected]">[email protected]</a></p>
<p>You can also sign up to receive newsletters <a href="./index.html">here</a>.</p>
</div>
<div id="footer">
<a id="footer-logo" href="#landing"><img src="./assets/logo.svg"></a>
<div>
<p>Rochester Institute of Technology</p>
<p>1 Lomb Memorial Dr, Rochester, NY 14623</p>
</div>
<div id="socials">
<a class="social-link" href="https://discord.gg/gNJXjvzkuB" target="_blank">Discord</a>
<a class="social-link" href="#" target="_blank">CampusGroups</a>
<a class="social-link" href="#" target="_blank">GitHub</a>
<a class="social-link" href="#" target="_blank">Twitter</a>
<a class="social-link" href="#" target="_blank">Instagram</a>
<a class="social-link" href="#" target="_blank">Facebook</a>
</div>
</div>
</section>
</main>
<!-- This is where Parcel imports are located! (SASS, etc.) -->
Expand Down
81 changes: 72 additions & 9 deletions sass/bhclub.scss
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,24 @@ a {
}
}

.social-link {
font-size: 1.125rem;
margin: 10px 0;
}

h1 {
font-size: 4.5rem;
font-weight: normal;
padding-bottom: 50px;
}

p {
font-size: 1.75rem;
padding-bottom: 15px;
}

p:last-child {
padding-bottom: 0;
}

// Buttons
Expand Down Expand Up @@ -104,25 +119,72 @@ nav {
font-size: 1.5rem;
margin: 10px 0;
}

.social-link {
font-size: 1.125rem;
margin: 10px 0;
}
}

// Main Content
main {
padding: 3.5rem;
padding: 1.75rem 3.5rem;
padding-left: calc(25% + 3.5rem); // pushes it outside of the nav while allowing for backgrounds to stretch underneath
}

section {
padding: 5rem 0;
padding: 1.75rem 0;
min-height: 100vh;
display: flex;
flex-flow: column nowrap;
justify-content: center;
}

// Contact Section / Footer
#contact > div {
margin-top: auto;
}

#footer {
display: flex;
flex-flow: row nowrap;
justify-content: space-around;
align-items: flex-start;

div {
padding-left: 2rem;
}

#footer-logo img {
width: 100px;
}

#socials {
display: flex;
flex-flow: row wrap;
width: 60%;

.social-link {
padding-right: 1rem;
}
}
}

// Tablet Styling
@media screen and (max-width: 1075px) {
// Contact Section / Footer
#footer {
flex-flow: column nowrap;

div {
padding-left: 0rem;
padding-top: 1rem;
}

#socials {
width: 100%;
}
}
}

// Desktop Styling
@media screen and (max-width: 750px) {
// Mobile Styling
@media screen and (max-width: 800px) {
// Navigation
nav {
width: 100%;
height: auto;
Expand Down Expand Up @@ -160,6 +222,7 @@ section {
}
}

// Main content
main {
padding-left: 3.5rem;
}
Expand Down