Skip to content

Commit

Permalink
fix merge bug
Browse files Browse the repository at this point in the history
  • Loading branch information
hemarina committed Sep 21, 2023
1 parent bdd3375 commit c609c0c
Showing 1 changed file with 10 additions and 15 deletions.
25 changes: 10 additions & 15 deletions website/src/components/gallery/ShowcaseCard/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -183,12 +183,7 @@ function ShowcaseMultipleWebsites(
);
}
}
</FluentUILink>
);
}
}

function ShowcaseMultipleAuthors({ user }: { user: User }) {
function ShowcaseMultipleAuthors({ user }: { user: User }) {
const authors = user.author;
const websites = user.website;
Expand Down Expand Up @@ -393,7 +388,7 @@ function ShowcaseCard({ user }: { user: User }) {
</div>
<img src={star} alt="Star" height={16} />
<div
className={customStyles.text}
className={styles.text}
style={{
color: "#11910D",
fontWeight: "600",
Expand All @@ -410,7 +405,7 @@ function ShowcaseCard({ user }: { user: User }) {
}}
/>
<div
className={customStyles.text}
className={styles.text}
style={{
color: "#F7630C",
fontWeight: "600",
Expand All @@ -432,7 +427,7 @@ function ShowcaseCard({ user }: { user: User }) {
>
<FluentUILink
href={source}
className={customStyles.cardTitle}
className={styles.cardTitle}
target="_blank"
>
{user.title}
Expand All @@ -446,13 +441,13 @@ function ShowcaseCard({ user }: { user: User }) {
columnGap: "3px",
}}
>
<div className={customStyles.cardTextBy}>by</div>
<div className={styles.cardTextBy}>by</div>
<div style={{ fontSize: "12px" }}>
<ShowcaseMultipleAuthors user={user} />
</div>
</div>
<div
className={customStyles.cardDescription}
className={styles.cardDescription}
style={{
paddingTop: "10px",
overflow: "hidden",
Expand All @@ -479,7 +474,7 @@ function ShowcaseCard({ user }: { user: User }) {
style={{ paddingTop: "10px", position: "absolute", bottom: "0px" }}
>
<div
className={customStyles.cardTag}
className={styles.cardTag}
style={{
display: "flex",
overflow: "hidden",
Expand Down Expand Up @@ -544,7 +539,7 @@ function closeCard(parentDiv) {
}

export function ShowcaseContributionCard(): React.ReactElement {
const customStyles = useStyles();
const styles = useStyles();
// access localStorage until window is defined
if (
typeof window !== "undefined" &&
Expand All @@ -554,7 +549,7 @@ export function ShowcaseContributionCard(): React.ReactElement {
}
return (
<Card
className={customStyles.card}
className={styles.card}
id="contributionCard"
style={{ padding: "24px", borderRadius: "8px" }}
>
Expand Down Expand Up @@ -676,7 +671,7 @@ function ShowcaseCardPanel({ user }: { user: User }) {
linkInMenu: "",
overflowMenuButton: "",
};
const customStyles = useStyles();
const styles = useStyles();
return (
<div>
<div
Expand All @@ -687,7 +682,7 @@ function ShowcaseCardPanel({ user }: { user: User }) {
padding: "10px 0",
}}
>
<div className={customStyles.cardTextBy}>by</div>
<div className={styles.cardTextBy}>by</div>
<div style={{ fontSize: "14px", fontWeight: "400" }}>
<ShowcaseMultipleAuthors user={user} />
</div>
Expand Down

0 comments on commit c609c0c

Please sign in to comment.