Skip to content

Added new members to hexagons #157

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
trumanjchan merged 1 commit into from
Apr 20, 2021
Merged

Added new members to hexagons #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 src/assets/images/abdus.png
View file
Open in desktop
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 src/assets/images/betsy.png
View file
Open in desktop
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 src/assets/images/salvador.png
View file
Open in desktop
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 src/assets/images/virginia.png
View file
Open in desktop
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 src/assets/images/winston.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
89 changes: 89 additions & 0 deletions src/assets/team.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ import JET from "./images/jet.jpg";
import JOSEPH from "./images/joseph.jpg";
import SEAN from "./images/sean.jpg";
import GEHAD from "./images/gehad.jpg";
import ABDUS from "./images/abdus.png";
import BETSY from "./images/betsy.png";
import SALVADOR from "./images/salvador.png";
import VIRGINIA from "./images/virginia.png";
import WINSTON from "./images/winston.png";

const team = [
{
Expand Down Expand Up @@ -88,6 +93,90 @@ const team = [
src: GEHAD,
desc: "HackMerced Rep",
},
{
firstName: "Virginia",
lastName: "Manandeg",
url: "https://www.linkedin.com/in/virginia-manandeg/",
src: VIRGINIA,
desc: "Co-Director of Marketing",
},
{
firstName: "Alyssa",
lastName: "Estrella",
url: "https://www.linkedin.com/in/alyssa-estrella-25359119a/",
src: GEHAD,
desc: "Director of Finance",
},
{
firstName: "Salvador",
lastName: "Rodriguez",
url: "https://www.linkedin.com/in/salvador-erodriguez/",
src: SALVADOR,
desc: "Co-Director of Marketing",
},
{
firstName: "Kiana",
lastName: "Ha",
url: "https://www.linkedin.com/in/kianaha/",
src: GEHAD,
desc: "Design",
},
{
firstName: "Shawn",
lastName: "Duong",
url: "https://www.linkedin.com/in/shawndxyz/",
src: GEHAD,
desc: "Logistics",
},
{
firstName: "Winston",
lastName: "Lou",
url: "https://www.linkedin.com/in/winstonlou/",
src: WINSTON,
desc: "Engineering",
},
{
firstName: "Betsy",
lastName: "Avila",
url: "https://www.linkedin.com/in/betsyava/",
src: BETSY,
desc: "Engineering",
},
{
firstName: "Abdus",
lastName: "Samee",
url: "https://www.linkedin.com/in/abdus-samee-19990128/",
src: ABDUS,
desc: "Engineering",
},
{
firstName: "Francisco",
lastName: "Lira",
url: "https://www.linkedin.com/in/lirafrancisco/",
src: GEHAD,
desc: "Design",
},
{
firstName: "Rohit",
lastName: "Vemuri",
url: "https://www.linkedin.com/in/rohit-vemuri-31a2221b3/",
src: GEHAD,
desc: "Engineering",
},
{
firstName: "Shakti",
lastName: "Vishwakarma",
url: "https://www.linkedin.com/in/shaktipro/",
src: GEHAD,
desc: "Engineering",
},
{
firstName: "Erick",
lastName: "Vargas",
url: "https://www.linkedin.com/in/erick-vargas-74a555190/",
src: GEHAD,
desc: "Engineering",
},
];

export default team;
63 changes: 43 additions & 20 deletions src/pages/Home/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,8 +643,7 @@
&__text {
display: none;
}
&__picture:hover + &__text,
&__text:hover {
&__picture:hover + &__text, &__text:hover {
display: block;
position: absolute;
top: 50%;
Expand Down Expand Up @@ -697,36 +696,60 @@

/* Manually push first row to center */
&:nth-child(1) {
margin-left: 15.6%;
margin-left: 8%;
}

/* Translates each child in the second row to the right a little bit, and moves them down. */
&:nth-child(5),
/* Translates the second row up, into interlocking position. */
&:nth-child(6),
&:nth-child(7) {
&:nth-child(7),
&:nth-child(8),
&:nth-child(9), {
margin-top: -3.35%;
}

/* 5th child (2nd row): Move into interlocking position, which moves the rest of the children in the row. */
&:nth-child(5) {
margin-left: 23.46%;
/* Moves second row children to the right, into interlocking position. */
&:nth-child(6) {
margin-left: 16%;
}

/* Forces 8th child to go to the next row, by adding padding on the right of hexagon 7. */
&:nth-child(7) {
margin-right: 25%;
/* Manually push third row to center. */
&:nth-child(10) {
margin-left: 8%;
}

/* Manually push second row to center */
&:nth-child(8) {
margin-left: 15.46%;
/* Translates the third row up, into interlocking position. */
&:nth-child(10),
&:nth-child(11),
&:nth-child(12),
&:nth-child(13),
&:nth-child(14), {
margin-top: -3.35%;
}

/* Translates each child in the second row to the right a little bit, and moves them down. */
&:nth-child(8),
&:nth-child(9),
&:nth-child(10),
&:nth-child(11) {
/* Moves fourth row children to the right, into interlocking position. */
&:nth-child(15) {
margin-left: 16%;
}

/* Translates the fourth row up, into interlocking position. */
&:nth-child(15),
&:nth-child(16),
&:nth-child(17),
&:nth-child(18), {
margin-top: -3.35%;
}

/* Manually push fifth row to center. */
&:nth-child(19) {
margin-left: 8%;
}

/* Translates the fifth row up, into interlocking position. */
&:nth-child(19),
&:nth-child(20),
&:nth-child(21),
&:nth-child(22),
&:nth-child(23), {
margin-top: -3.35%;
}
}
Expand Down