Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
Binary file added assets/leadership/abhaya.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/leadership/kevin.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/leadership/makenna.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/leadership/mark.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/leadership/may.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/leadership/michael.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/leadership/michael.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/leadership/mira.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/leadership/og/abhaya.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/leadership/og/kevin.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/leadership/og/makenna.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/leadership/og/mark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/leadership/og/may.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/leadership/og/michael.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/leadership/og/mira.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/leadership/og/olivia.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/leadership/og/pardeep.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/leadership/og/peter.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/leadership/olivia.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/leadership/pardeep.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/leadership/peter.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 10 additions & 10 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -142,69 +142,69 @@ <h1>Leadership Team</h1>
<div id="leaders">
<div class="leader">
<div class="leader-tape"></div>
<img src="https://via.placeholder.com/150.png"/>
<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="https://via.placeholder.com/150.png"/>
<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="https://via.placeholder.com/150.png"/>
<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="https://via.placeholder.com/150.png"/>
<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="https://via.placeholder.com/150.png"/>
<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="https://via.placeholder.com/150.png"/>
<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="https://via.placeholder.com/150.png"/>
<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="https://via.placeholder.com/150.png"/>
<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="https://via.placeholder.com/150.png"/>
<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="https://via.placeholder.com/150.png"/>
<img src="./assets/leadership/pardeep.jpg" alt="Pardeep's photo"/>
<p>Pardeep Singh</p>
<p>Sponsorship</p>
<p>Director</p>
Expand Down
18 changes: 8 additions & 10 deletions sass/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ $nav-height: 90px;

$section-padding: 140px;

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

$wire-height: 15px;

// Just to make it more semantic
Expand Down Expand Up @@ -211,13 +214,6 @@ nav {
margin: 0 auto;
padding-top: $section-padding;

// Temp for debugging numbers
// FIXME: Dont pull a byebug :)
h2 {
text-align: center;
margin-top: -20px;
}

.slick-list {
// Slider depends on having the overflow-x hidden,
// CSS (per spec) doesn't allow separate overflow-y and x.
Expand Down Expand Up @@ -366,7 +362,7 @@ nav {
#leaders {
// Grid is easier than flex here
display: grid;
grid-template-columns: repeat(5, 150px);
grid-template-columns: repeat(5, $leadership-size);
gap: 30px;
justify-items: center;
justify-content: center;
Expand All @@ -375,21 +371,23 @@ nav {

.leader {

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

img {
border-radius: 20px;
width: $leadership-size;
height: $leadership-size;
}

.leader-tape {
position: relative;
margin: 0px auto -10px auto;
height: 20px;
width: 50%;
background-color: rgba($red, 50%);
background-color: rgba($red, 60%);
}
}
}
Expand Down