Skip to content

Commit

Permalink
Fix note text colors (#4822)
Browse files Browse the repository at this point in the history
  • Loading branch information
Cloud11PL authored and poulch committed Apr 24, 2024
1 parent 965d27c commit 5cd49f6
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 6 deletions.
5 changes: 5 additions & 0 deletions .changeset/nervous-ducks-fix.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"saleor-dashboard": patch
---

History component's texts will now have unified colors
14 changes: 8 additions & 6 deletions src/components/Timeline/TimelineNote.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { GiftCardEventFragment, OrderEventFragment } from "@dashboard/graphql";
import { getUserInitials, getUserName } from "@dashboard/misc";
import { Card, CardContent, Typography } from "@material-ui/core";
import { Card, CardContent } from "@material-ui/core";
import { makeStyles } from "@saleor/macaw-ui";
import { vars } from "@saleor/macaw-ui-next";
import { Text, vars } from "@saleor/macaw-ui-next";
import React from "react";

import { DateTime } from "../Date";
Expand Down Expand Up @@ -64,7 +64,7 @@ const NoteMessage: React.FC<NoteMessageProps> = ({ message }) => (
return <br key={`break-${string}`} />;
}

return <Typography key={`note-${string}`}>{string}</Typography>;
return <Text key={`note-${string}`}>{string}</Text>;
})}
</>
);
Expand Down Expand Up @@ -116,10 +116,12 @@ export const TimelineNote: React.FC<TimelineNoteProps> = ({
<div className={classes.root}>
<TimelineAvatar user={user} app={app} className={classes.avatar} />
<div className={classes.title}>
<Typography>{userDisplayName}</Typography>
<Typography>
<Text variant="body" size="small">
{userDisplayName}
</Text>
<Text variant="body" size="small" color="default2" whiteSpace="nowrap">
<DateTime date={date} plain={hasPlainDate} />
</Typography>
</Text>
</div>
<Card className={classes.card} elevation={16}>
<CardContent className={classes.cardContent}>
Expand Down

0 comments on commit 5cd49f6

Please sign in to comment.