Skip to content

Commit d85fe5f

Browse files
author
Luke Bowerman
authored
Use fonts.brand for Legend & MenuGroupLabel (#1553)
1 parent 2cc96cc commit d85fe5f

File tree

6 files changed

+14
-13
lines changed

6 files changed

+14
-13
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
3333
- `HoverDisclosure` toggles visibility with css rather than inserting elements into the DOM
3434
- `InputSearch` `onChange` callback argument is now a string rather than an event
3535
- `InputTimeSelect` supports 20- and 60-minute intervals
36+
- `Legend` now applies font-family `brand`
37+
- `MenuGroupLabel` now applies font-family `brand`
3638
- `Span` replaced all library-internal usage of `Text` with `Span`
3739
- `TreeItem` now supports text truncation behavior
3840
- `TreeItem` now wraps long text pleasantly

packages/components/src/Form/Fieldset/__snapshots__/Fieldset.test.tsx.snap

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,10 @@ exports[`Fieldset 1`] = `
3434
}
3535
3636
.c2 {
37-
font-family: 'Roboto','Noto Sans JP','Noto Sans CJK KR','Noto Sans Arabic UI','Noto Sans Devanagari UI','Noto Sans Hebrew','Noto Sans Thai UI','Helvetica','Arial',sans-serif;
37+
font-family: Roboto,'Noto Sans JP','Noto Sans CJK KR','Noto Sans Arabic UI','Noto Sans Devanagari UI','Noto Sans Hebrew','Noto Sans Thai UI','Helvetica','Arial',sans-serif;
3838
color: #343C42;
3939
padding: 0rem;
40+
font-family: Roboto,'Noto Sans JP','Noto Sans CJK KR','Noto Sans Arabic UI','Noto Sans Devanagari UI','Noto Sans Hebrew','Noto Sans Thai UI','Helvetica','Arial',sans-serif;
4041
font-size: 1rem;
4142
font-weight: 600;
4243
}
@@ -250,6 +251,7 @@ exports[`Fieldset 1`] = `
250251
<legend
251252
className="c2"
252253
color="text4"
254+
fontFamily="brand"
253255
fontSize="medium"
254256
fontWeight="semiBold"
255257
>

packages/components/src/Form/Legend/Legend.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ export const Legend = styled.legend<LegendProps>`
4949

5050
Legend.defaultProps = {
5151
color: 'text4',
52+
fontFamily: 'brand',
5253
fontSize: 'medium',
5354
fontWeight: 'semiBold',
5455
padding: 'none',

packages/components/src/Form/Legend/__snapshots__/Legend.test.tsx.snap

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,18 @@
22

33
exports[`A Legend 1`] = `
44
.c0 {
5-
font-family: 'Roboto','Noto Sans JP','Noto Sans CJK KR','Noto Sans Arabic UI','Noto Sans Devanagari UI','Noto Sans Hebrew','Noto Sans Thai UI','Helvetica','Arial',sans-serif;
5+
font-family: Roboto,'Noto Sans JP','Noto Sans CJK KR','Noto Sans Arabic UI','Noto Sans Devanagari UI','Noto Sans Hebrew','Noto Sans Thai UI','Helvetica','Arial',sans-serif;
66
color: #343C42;
77
padding: 0rem;
8+
font-family: Roboto,'Noto Sans JP','Noto Sans CJK KR','Noto Sans Arabic UI','Noto Sans Devanagari UI','Noto Sans Hebrew','Noto Sans Thai UI','Helvetica','Arial',sans-serif;
89
font-size: 1rem;
910
font-weight: 600;
1011
}
1112
1213
<legend
1314
className="c0"
1415
color="text4"
16+
fontFamily="brand"
1517
fontSize="medium"
1618
fontWeight="semiBold"
1719
>

packages/components/src/Menu/MenuGroupLabel.tsx

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,7 @@ export const MenuGroupLabel: FC = ({ children }) => {
4242
render the shadow.
4343
*/}
4444
<div ref={labelShimRef} style={{ height: '0' }} />
45-
<Heading
46-
as="h2"
47-
fontFamily="body"
48-
fontSize="small"
49-
fontWeight="semiBold"
50-
pl="medium"
51-
>
45+
<Heading as="h2" fontSize="small" fontWeight="semiBold" pl="medium">
5246
{children}
5347
</Heading>
5448
</MenuGroupLabelWrapper>

packages/components/src/Menu/__snapshots__/MenuGroup.test.tsx.snap

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ exports[`MenuGroup - JSX label 1`] = `
1111
}
1212
1313
.c3 {
14-
font-family: 'Roboto','Noto Sans JP','Noto Sans CJK KR','Noto Sans Arabic UI','Noto Sans Devanagari UI','Noto Sans Hebrew','Noto Sans Thai UI','Helvetica','Arial',sans-serif;
14+
font-family: Roboto,'Noto Sans JP','Noto Sans CJK KR','Noto Sans Arabic UI','Noto Sans Devanagari UI','Noto Sans Hebrew','Noto Sans Thai UI','Helvetica','Arial',sans-serif;
1515
font-size: 0.875rem;
1616
font-weight: 600;
1717
line-height: 1.25rem;
@@ -143,7 +143,7 @@ exports[`MenuGroup - JSX label 1`] = `
143143
/>
144144
<h2
145145
className="c2 c3"
146-
fontFamily="body"
146+
fontFamily="brand"
147147
fontSize="small"
148148
fontWeight="semiBold"
149149
>
@@ -214,7 +214,7 @@ exports[`MenuGroup - label 1`] = `
214214
}
215215
216216
.c3 {
217-
font-family: 'Roboto','Noto Sans JP','Noto Sans CJK KR','Noto Sans Arabic UI','Noto Sans Devanagari UI','Noto Sans Hebrew','Noto Sans Thai UI','Helvetica','Arial',sans-serif;
217+
font-family: Roboto,'Noto Sans JP','Noto Sans CJK KR','Noto Sans Arabic UI','Noto Sans Devanagari UI','Noto Sans Hebrew','Noto Sans Thai UI','Helvetica','Arial',sans-serif;
218218
font-size: 0.875rem;
219219
font-weight: 600;
220220
line-height: 1.25rem;
@@ -346,7 +346,7 @@ exports[`MenuGroup - label 1`] = `
346346
/>
347347
<h2
348348
className="c2 c3"
349-
fontFamily="body"
349+
fontFamily="brand"
350350
fontSize="small"
351351
fontWeight="semiBold"
352352
>

0 commit comments

Comments
 (0)