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

V3 - Quick fixes to Client Case colors #922

Merged
merged 3 commits into from
Nov 29, 2024
Merged

V3 - Quick fixes to Client Case colors #922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
88c10e5
fix: simpler null check for color on customerCase
trulshj Nov 29, 2024
ddc8fae
chore: fallback if no color is supplied to Badge
trulshj Nov 29, 2024
cb09f8f
feat: apply color to fancy brackets
trulshj Nov 29, 2024
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
13 changes: 6 additions & 7 deletions src/components/badge/Badge.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,13 @@ interface IBadge {
textColor?: string;
}

const Badge = ({
children,
badgeColor = "#EAEAEA",
textColor = "#222424",
}: IBadge) => {
const DEFAULT_BADGE_COLOR = "#EAEAEA";
const DEFAULT_TEXT_COLOR = "#222424";

const Badge = ({ children, badgeColor, textColor }: IBadge) => {
const badgeColors = {
backgroundColor: badgeColor,
color: textColor,
backgroundColor: badgeColor || DEFAULT_BADGE_COLOR,
color: textColor || DEFAULT_TEXT_COLOR,
};
return (
<div className={styles.badgeWrapper} style={badgeColors}>
Expand Down
2 changes: 1 addition & 1 deletion src/components/customerCases/customerCase/CustomerCase.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ function ColoredTitle({
colorPart?: string;
color?: string;
}) {
if (colorPart === undefined || colorPart === "")
if (!colorPart)
return (
<Text type={"h1"} className={styles.mainTitle}>
{title}
Expand Down
8 changes: 6 additions & 2 deletions src/components/customerCases/customerCase/projectInfo/CustomerCaseProjectInfo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,9 @@ export default async function CustomerCaseProjectInfo({
{t("variants").toUpperCase()}
</Text>
<div className={styles.varianter}>
<Text className={styles.preFancyCharacter}>【 </Text>
<Text className={styles.preFancyCharacter}>
<span style={{ color: clientColors.color }}>【 </span>
</Text>
{consultantsFirstNames.map((name) => (
<Text
key={name}
Expand All @@ -68,7 +70,9 @@ export default async function CustomerCaseProjectInfo({
{name}
</Text>
))}
<Text className={styles.afterFancyCharacter}> 】</Text>
<Text className={styles.afterFancyCharacter}>
<span style={{ color: clientColors.color }}> 】</span>
</Text>
</div>
</div>
)}
Expand Down