Skip to content

Fix/directors grid layout #68

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
JayJ104 merged 5 commits into from
Feb 16, 2025
Merged

Fix/directors grid layout #68

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
363503c
Implemented 4 directors per row design
haylietan Feb 15, 2025
46bb22e
Removed border and moved technical up
haylietan Feb 15, 2025
6aa79b2
Updated tablet to 3 directors per row
haylietan Feb 15, 2025
737ba1d
Fixed line in cloud background
haylietan Feb 15, 2025
5d1ab0b
fixed horizontal margins for directors section
JayJ104 Feb 16, 2025
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
8 changes: 7 additions & 1 deletion app/(pages)/about-us/_components/CloudBackground/CloudBackground.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,12 @@
background-image:
url('/images/cloud_background/TopClouds.svg'),
url('/images/cloud_background/Sand.svg'),
linear-gradient(to bottom, var(--sky-background) 0%, #D5FCD1 100%);
linear-gradient(to bottom,
white 0%,
white 5%,
var(--sky-background) 10%,
#D5FCD1 100%,
);
background-repeat: no-repeat, no-repeat, no-repeat;
background-size: contain, contain, cover; /* Clouds: Contain | Sand: Cover | Gradient: Cover */
background-position: top center, bottom center, center;
Expand All @@ -15,6 +20,7 @@
height: 1976px; /* Full screen height */
width: 100%;
position: relative;
margin-top: -5px;

.child1 {
background-image: url('/images/cloud_background/LeftClouds.svg');
Expand Down
247 changes: 241 additions & 6 deletions app/(pages)/about-us/_components/OurTeam/OurTeam.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
$bg-color: #FFFFFF;
@import '@globals/styles/mixins.scss';

.ourTeam{
display: flex;
flex-direction: column;
background-color: $bg-color;
background-color: var(--background-light);
align-items: center;

&_container{
Expand All @@ -24,7 +24,7 @@ $bg-color: #FFFFFF;
margin-bottom: 48px;

h1{
color: #123041;
color: var(--sea-background);
font-family: Metropolis;
font-size: 40px;
font-style: normal;
Expand Down Expand Up @@ -109,11 +109,246 @@ $bg-color: #FFFFFF;

&_team{
display: grid;
grid-template-columns: repeat(auto-fit, minmax(240px, 1fr));
gap: 48.5px;
// border: 1px solid red;
grid-template-columns: repeat(4, 1fr); // Always four columns
gap: 4%;
}
}

}

@include tablet {
.ourTeam{
display: flex;
flex-direction: column;
background-color: var(--background-light);
align-items: center;

&_container{
display: flex;
flex-direction: column;
justify-content: center;
width: 100%;
height: 100%;
// max-width: 1440px;
padding: 0% 13%;

&_title{
display: flex;
flex-direction: column;
gap: 16px;
margin-bottom: 48px;

h1{
color: var(--sea-background);
font-family: Metropolis;
font-size: 40px;
font-style: normal;
font-weight: 700;
line-height: normal;
letter-spacing: 0.8px;
}

p{
color: #123041;
text-shadow: 0px 4px 50px rgba(47, 172, 184, 0.15);
font-family: Metropolis;
font-size: 16px;
font-style: normal;
font-weight: 400;
line-height: 150%; /* 24px */
letter-spacing: 0.32px;
}
}

&_embla {
width: 100%;

&_filterButtons{
display: flex;
flex-direction: row;
justify-content: flex-start;
align-items: center;
gap: 16px;
margin-bottom: 48px;
// border: 1px solid black;

&_button{
display: flex;
flex-direction: row;
height: 48px;
padding: 12px 24px;
justify-content: center;
align-items: center;
gap: 10px;
border-radius: 100px;
background: #DCE0E3;
cursor: pointer;

p{
color: #123041;
text-align: center;
font-family: "Metropolis";
font-size: 15px;
font-style: normal;
font-weight: 700;
line-height: normal;
letter-spacing: 0.36px;
}

&.active{
display: flex;
flex-direction: row;
height: 48px;
padding: 12px 24px;
justify-content: center;
align-items: center;
gap: 10px;
border-radius: 100px;
background: var(--text-dark);

p{
color: var(--text-light);
text-align: center;
font-family: "Metropolis";
font-size: 18px;
font-style: normal;
font-weight: 700;
line-height: normal;
letter-spacing: 0.36px;
}
}
}
}
}


&_team{
display: grid;
grid-template-columns: repeat(3, 1fr); // Always four columns
gap: 3%;
padding-bottom: 2%;
}
}

}
}

@include phone {
.ourTeam{
display: flex;
flex-direction: column;
background-color: var(--background-light);
align-items: center;

&_container{
display: flex;
flex-direction: column;
justify-content: center;
width: 100%;
height: 100%;
// max-width: 1440px;
padding: 0% 13%;

// border: 1px solid black;

&_title{
display: flex;
flex-direction: column;
gap: 16px;
margin-bottom: 48px;

h1{
color: var(--sea-background);
font-family: Metropolis;
font-size: 40px;
font-style: normal;
font-weight: 700;
line-height: normal;
letter-spacing: 0.8px;
}

p{
color: #123041;
text-shadow: 0px 4px 50px rgba(47, 172, 184, 0.15);
font-family: Metropolis;
font-size: 16px;
font-style: normal;
font-weight: 400;
line-height: 150%; /* 24px */
letter-spacing: 0.32px;
}
}

&_embla {
width: 100%;

&_filterButtons{
display: flex;
flex-direction: row;
justify-content: flex-start;
align-items: center;
gap: 16px;
margin-bottom: 48px;
// border: 1px solid black;

&_button{
display: flex;
flex-direction: row;
height: 48px;
padding: 12px 24px;
justify-content: center;
align-items: center;
gap: 10px;
border-radius: 100px;
background: #DCE0E3;
cursor: pointer;

p{
color: #123041;
text-align: center;
font-family: "Metropolis";
font-size: 18px;
font-style: normal;
font-weight: 700;
line-height: normal;
letter-spacing: 0.36px;
}

&.active{
display: flex;
flex-direction: row;
height: 48px;
padding: 12px 24px;
justify-content: center;
align-items: center;
gap: 10px;
border-radius: 100px;
background: #123041;

p{
color: #FFFFFF;
text-align: center;
font-family: "Metropolis";
font-size: 18px;
font-style: normal;
font-weight: 700;
line-height: normal;
letter-spacing: 0.36px;
}
}
}
}
}


&_team{
display: grid;
grid-template-columns: repeat(auto-fit, minmax(240px, 1fr));
gap: 48.5px;
// border: 1px solid red;
}
}

}
}

2 changes: 1 addition & 1 deletion app/(pages)/about-us/_components/OurTeam/OurTeam.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,12 @@ export default function OurTeam() {

const teamNames = [
'Design',
'Technical',
'External',
'Finance',
'Marketing',
'Operations',
'Sponsorship',
'Technical',
];

return (
Expand Down
1 change: 1 addition & 0 deletions app/(pages)/about-us/_components/OurTeam/_components/ProfileCard.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@import '@globals/styles/mixins.scss';
.profile_card{
gap: 8px;
display: flex;
Expand Down