Skip to content

Commit ae94420

Browse files
committed
chore: switch font from Jakarta to Inter
1 parent 0afd99b commit ae94420

File tree

4 files changed

+10
-9
lines changed

4 files changed

+10
-9
lines changed

src/ui/button.test.tsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ describe('Button component ', () => {
8383
const button = screen.getByTestId('button');
8484
// TODO: should be fixed to use haveStyle instead of comparing the class name
8585
const expectedStyle =
86-
'font-[600] font-jakarta text-white dark:text-black text-xl';
86+
'font-inter font-semibold text-white dark:text-black text-xl';
8787
const receivedStyle =
8888
button.props.children[0].props.children.props.className;
8989
expect(receivedStyle).toContain(expectedStyle);
@@ -93,7 +93,7 @@ describe('Button component ', () => {
9393
const button = screen.getByTestId('button');
9494

9595
const expectedStyle =
96-
'font-[600] font-jakarta text-secondary-600 text-base';
96+
'font-inter font-semibold text-secondary-600 text-base';
9797
const receivedStyle =
9898
button.props.children[0].props.children.props.className;
9999
expect(receivedStyle).toContain(expectedStyle);
@@ -102,7 +102,8 @@ describe('Button component ', () => {
102102
render(<Button testID="button" label="Submit" disabled />);
103103
const button = screen.getByTestId('button');
104104

105-
const expectedStyle = 'font-[600] font-jakarta text-base text-neutral-600';
105+
const expectedStyle =
106+
'font-inter font-semibold text-base text-neutral-600 dark:text-neutral-600';
106107
const receivedStyle =
107108
button.props.children[0].props.children.props.className;
108109
expect(receivedStyle).toContain(expectedStyle);

src/ui/button.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import { tv } from 'tailwind-variants';
66

77
const button = tv({
88
slots: {
9-
container: 'flex flex-row items-center justify-center rounded-md my-2 px-4',
10-
label: 'text-base font-[600] font-jakarta',
11-
indicator: 'text-white h-6',
9+
container: 'my-2 flex flex-row items-center justify-center rounded-md px-4',
10+
label: 'font-inter text-base font-semibold',
11+
indicator: 'h-6 text-white',
1212
},
1313

1414
variants: {

src/ui/input.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ import { Text } from './text';
1717
const inputTv = tv({
1818
slots: {
1919
container: 'mb-2',
20-
label: 'text-grey-100 dark:text-neutral-100 text-lg mb-1',
20+
label: 'text-grey-100 mb-1 text-lg dark:text-neutral-100',
2121
input:
22-
'mt-0 border-[0.5px] font-jakarta text-base leading-5 font-[500] px-4 py-3 rounded-xl bg-neutral-100 border-neutral-300 dark:border-neutral-700 dark:bg-neutral-800 dark:text-white',
22+
'mt-0 rounded-xl border-[0.5px] border-neutral-300 bg-neutral-100 px-4 py-3 font-inter text-base font-medium leading-5 dark:border-neutral-700 dark:bg-neutral-800 dark:text-white',
2323
},
2424

2525
variants: {

src/ui/text.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export const Text = ({
2121
const textStyle = React.useMemo(
2222
() =>
2323
twMerge(
24-
'text-base text-black dark:text-white font-jakarta font-normal',
24+
'text-base text-black dark:text-white font-inter font-normal',
2525
className
2626
),
2727
[className]

0 commit comments

Comments
 (0)