Skip to content
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

fix: issue with missing container for employee card after merge conflict #945

Merged
merged 1 commit into from
Dec 4, 2024
Merged

fix: issue with missing container for employee card after merge conflict #945

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
88 changes: 45 additions & 43 deletions src/components/employeeCard/EmployeeCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,52 +24,54 @@ export default function EmployeeCard({
employee.name &&
employee.email && (
<div className={styles.employeeWrapper}>
<Link
href={`/${language}/${employeePageSlug}/${aliasFromEmail(employee.email)}`}
>
<div className={styles.employeeImage}>
<Image
src={employee.imageUrl}
alt={employee.name}
style={{ objectFit: "cover" }}
fill={true}
sizes="280px"
/>
</div>
</Link>
<div className={styles.employeeInfoWrapper}>
<Text type="h4" as="h3">
<Link
href={`/${language}/${employeePageSlug}/${aliasFromEmail(employee.email)}`}
className={styles.employeeNameLink}
>
{employee.name}
</Link>
</Text>

<div className={styles.employeeRole}>
{employee.competences.map((competence) => (
<Text
className={styles.employeeRoleDot}
type="labelRegular"
key={competence}
as="span"
<div className={styles.employeeWrapper__inner}>
<Link
href={`/${language}/${employeePageSlug}/${aliasFromEmail(employee.email)}`}
>
<div className={styles.employeeImage}>
<Image
src={employee.imageUrl}
alt={employee.name}
style={{ objectFit: "cover" }}
fill={true}
sizes="280px"
/>
</div>
</Link>
<div className={styles.employeeInfoWrapper}>
<Text type="h4" as="h3">
<Link
href={`/${language}/${employeePageSlug}/${aliasFromEmail(employee.email)}`}
className={styles.employeeNameLink}
>
{competence}
</Text>
))}
</div>
{employee.name}
</Link>
</Text>

<div className={styles.employeeRole}>
{employee.competences.map((competence) => (
<Text
className={styles.employeeRoleDot}
type="labelRegular"
key={competence}
as="span"
>
{competence}
</Text>
))}
</div>

<Text type="bodyExtraSmall" className={styles.employeeEmail}>
<a href={`mailto:${employee.email}`}>{employee.email}</a>
</Text>
{employee.telephone && (
<Text type="bodyExtraSmall" className={styles.employeePhone}>
<a href={`tel:${employee.telephone}`}>
{formatPhoneNumber(employee.telephone)}
</a>
<Text type="bodyExtraSmall" className={styles.employeeEmail}>
<a href={`mailto:${employee.email}`}>{employee.email}</a>
</Text>
)}
{employee.telephone && (
<Text type="bodyExtraSmall" className={styles.employeePhone}>
<a href={`tel:${employee.telephone}`}>
{formatPhoneNumber(employee.telephone)}
</a>
</Text>
)}
</div>
</div>
</div>
)
Expand Down
2 changes: 1 addition & 1 deletion src/components/sections/contact-box/contact-box.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
color: var(--_contactBox__color);
}
.contactBox__inner--light {
--_contactBox__background: var(--background-bg-light-primary);
--_contactBox__background: var(--background-bg-light-secondary);
--_contactBox__color: var(--text-primary);
}

Expand Down
Loading