Skip to content

Leadershp spacing tweaks #1012

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 7 commits into from
Dec 11, 2020
Merged

Leadershp spacing tweaks #1012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c530dd8
Tweak leadership position spacing
peterkos Dec 11, 2020
9e052be
Some minor tweaks for leadership
peterkos Dec 11, 2020
5268457
Test remove director name
peterkos Dec 11, 2020
3d1b894
Merge branch 'develop' into bh-1011
peterkos Dec 11, 2020
b56ae81
Padding and container tweaks for leadership
peterkos Dec 11, 2020
62c9075
Merge branch 'bh-1011' of https://github.com/codeRIT/brickhack.io int…
peterkos Dec 11, 2020
d65950c
Merge branch 'develop' into bh-1011
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
133 changes: 63 additions & 70 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,76 +277,69 @@ <h1>Frequently Asked Questions</h1>
</div>
</section>
<section id="leadership">
<h1>Leadership Team</h1>
<div id="leaders">
<div class="leader">
<div class="leader-tape"></div>
<img src="./assets/leadership/michael.jpg" alt="Michael's photo"/>
<p>Michael</p>
<p>Van Leeuwen</p>
<p>President</p>
</div>
<div class="leader">
<div class="leader-tape"></div>
<img src="./assets/leadership/abhaya.jpg" alt="Abhaya's photo"/>
<p>Abhaya Tamrakar</p>
<p>BrickHack</p>
<p>Director</p>
</div>
<div class="leader">
<div class="leader-tape"></div>
<img src="./assets/leadership/may.jpg" alt="May's photo"/>
<p>May Ren</p>
<p>Design</p>
<p>Director</p>
</div>
<div class="leader">
<div class="leader-tape"></div>
<img src="./assets/leadership/peter.jpg" alt="Peter's photo"/>
<p>Peter Kos</p>
<p>Engineering</p>
<p>Director</p>
</div>
<div class="leader">
<div class="leader-tape"></div>
<img src="./assets/leadership/mark.jpg" alt="Mark's photo"/>
<p>Mark Maluenda</p>
<p>Community</p>
<p>Outreach Director</p>
</div>
<div class="leader">
<div class="leader-tape"></div>
<img src="./assets/leadership/olivia.jpg" alt="Olivia's photo"/>
<p>Olivia Simmons</p>
<p>Logistics</p>
<p>Co-Director</p>
</div>
<div class="leader">
<div class="leader-tape"></div>
<img src="./assets/leadership/makenna.jpg" alt="Makenna's photo"/>
<p>Makenna M.</p>
<p>Logistics</p>
<p>Co-Director</p>
</div>
<div class="leader">
<div class="leader-tape"></div>
<img src="./assets/leadership/mira.jpg" alt="Mira's photo"/>
<p>Mira Antolovich</p>
<p>Logistics</p>
<p>Co-Director</p>
</div>
<div class="leader">
<div class="leader-tape"></div>
<img src="./assets/leadership/kevin.jpg" alt="Kevin's photo"/>
<p>Kevin Zhou</p>
<p>Treasurer</p>
</div>
<div class="leader">
<div class="leader-tape"></div>
<img src="./assets/leadership/pardeep.jpg" alt="Pardeep's photo"/>
<p>Pardeep Singh</p>
<p>Sponsorship</p>
<p>Director</p>
<div id="leadership-content">
<h1>Leadership Team</h1>
<div id="leaders">
<div class="leader">
<div class="leader-tape"></div>
<img src="./assets/leadership/michael.jpg" alt="Michael's photo"/>
<p>Michael Van Leeuwen</p>
<p>President</p>
</div>
<div class="leader">
<div class="leader-tape"></div>
<img src="./assets/leadership/abhaya.jpg" alt="Abhaya's photo"/>
<p>Abhaya Tamrakar</p>
<p>BrickHack</p>
</div>
<div class="leader">
<div class="leader-tape"></div>
<img src="./assets/leadership/may.jpg" alt="May's photo"/>
<p>May Ren</p>
<p>Design</p>
</div>
<div class="leader">
<div class="leader-tape"></div>
<img src="./assets/leadership/peter.jpg" alt="Peter's photo"/>
<p>Peter Kos</p>
<p>Engineering</p>
</div>
<div class="leader">
<div class="leader-tape"></div>
<img src="./assets/leadership/mark.jpg" alt="Mark's photo"/>
<p>Mark Maluenda</p>
<p>Community Outreach</p>
</div>
<div class="leader">
<div class="leader-tape"></div>
<img src="./assets/leadership/olivia.jpg" alt="Olivia's photo"/>
<p>Olivia Simmons</p>
<p>Logistics</p>
</div>
<div class="leader">
<div class="leader-tape"></div>
<img src="./assets/leadership/makenna.jpg" alt="Makenna's photo"/>
<p>Makenna M.</p>
<p>Logistics</p>
</div>
<div class="leader">
<div class="leader-tape"></div>
<img src="./assets/leadership/mira.jpg" alt="Mira's photo"/>
<p>Mira Antolovich</p>
<p>Logistics</p>
</div>
<div class="leader">
<div class="leader-tape"></div>
<img src="./assets/leadership/kevin.jpg" alt="Kevin's photo"/>
<p>Kevin Zhou</p>
<p>Treasurer</p>
</div>
<div class="leader">
<div class="leader-tape"></div>
<img src="./assets/leadership/pardeep.jpg" alt="Pardeep's photo"/>
<p>Pardeep Singh</p>
<p>Sponsorship</p>
</div>
</div>
</div>
</section>
Expand Down
48 changes: 41 additions & 7 deletions sass/main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,12 @@ $nav-height: 90px;
$section-padding: 140px;

$img-border-radius: 20px;
$leadership-size: 220px;

$wire-height: 15px;

$leadership-size: 220px;
$leadership-size-mobile: 180px;

// Just to make it more semantic
$font-extrabold: 700;
$font-bold: 600;
Expand Down Expand Up @@ -557,32 +559,33 @@ nav {
}

#leadership {
padding: $section-padding;
background-color: $light-blue;

h1 {
font-size: $title-size;
}

#leadership-content {
padding: $section-padding;
}

#leaders {
// Grid is easier than flex here
display: grid;
grid-template-columns: repeat(5, $leadership-size);
gap: 30px;
gap: 50px;
justify-items: center;
justify-content: center;

margin-top: 40px;

.leader {

width: $leadership-size;
text-align: center;
margin-left: auto;
margin-right: auto;

img {
border-radius: 20px;
border-radius: $img-border-radius;
width: $leadership-size;
height: $leadership-size;
}
Expand All @@ -594,6 +597,10 @@ nav {
width: 50%;
background-color: rgba($red, 60%);
}

.nowrap {
white-space: nowrap;
}
}
}
}
Expand Down Expand Up @@ -629,11 +636,38 @@ footer {
}
}

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

section {
// padding: $section-padding / 2;
}

// Scaling idea, key is clip
#shelf {
width: 800px;
overflow: clip;
}

#leadership #leaders {
justify-content: space-between;
grid-template-columns: repeat(5, $leadership-size-mobile);
width: 100%;
gap: 30px;

.leader {
width: $leadership-size-mobile;

img {
width: $leadership-size-mobile;
height: $leadership-size-mobile;
}
}
}
}

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

#leadership #leaders {
justify-content: space-between;
}
}