Skip to content

Commit 41b5be8

Browse files
committed
Use CSS design tokens instead of Text component
1 parent f3ec6b6 commit 41b5be8

4 files changed

Lines changed: 19 additions & 20 deletions

File tree

‎packages/admin-ui/src/breadcrumbs/index.tsx‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33
*/
44
import { Link } from '@wordpress/route';
55
import { __ } from '@wordpress/i18n';
6-
import { Text } from '@wordpress/ui';
7-
import { __experimentalHStack as HStack } from '@wordpress/components';
6+
import {
7+
__experimentalHeading as Heading,
8+
__experimentalHStack as HStack,
9+
} from '@wordpress/components';
810

911
/**
1012
* Internal dependencies
@@ -22,23 +24,16 @@ const BreadcrumbItem = ( {
2224
if ( ! to ) {
2325
return (
2426
<li>
25-
<Text
26-
className="admin-ui-page__header-title"
27-
// eslint-disable-next-line jsx-a11y/heading-has-content -- content provided via render prop
28-
render={ <h1 /> }
29-
variant="heading-lg"
30-
>
27+
<Heading level={ 1 } truncate>
3128
{ label }
32-
</Text>
29+
</Heading>
3330
</li>
3431
);
3532
}
3633

3734
return (
3835
<li>
39-
<Link to={ to }>
40-
<Text variant="heading-lg">{ label }</Text>
41-
</Link>
36+
<Link to={ to }>{ label }</Link>
4237
</li>
4338
);
4439
};

‎packages/admin-ui/src/breadcrumbs/style.scss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
@use "@wordpress/base-styles/variables";
22

33
.admin-ui-breadcrumbs__list {
4+
// @TODO: use Text component from UI when available.
5+
font-family: var(--wpds-font-family-heading);
46
font-size: var(--wpds-font-size-lg);
7+
font-weight: var(--wpds-font-weight-medium);
8+
line-height: var(--wpds-font-line-height-lg);
59
list-style: none;
610
padding: 0;
711
margin: 0;

‎packages/admin-ui/src/page/header.tsx‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* WordPress dependencies
33
*/
4-
import { Stack, Text } from '@wordpress/ui';
4+
import { Stack } from '@wordpress/ui';
55

66
/**
77
* Internal dependencies
@@ -41,13 +41,9 @@ export default function Header( {
4141
/>
4242
) }
4343
{ title && (
44-
<Text
45-
className="admin-ui-page__header-title"
46-
render={ <HeadingTag /> }
47-
variant="heading-lg"
48-
>
44+
<HeadingTag className="admin-ui-page__header-title">
4945
{ title }
50-
</Text>
46+
</HeadingTag>
5147
) }
5248
{ breadcrumbs }
5349
{ badges }

‎packages/admin-ui/src/page/style.scss‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,13 @@
1919
}
2020

2121
.admin-ui-page__header-title {
22+
// @TODO: use Text component from UI when available.
23+
font-family: var(--wpds-font-family-heading);
24+
font-size: var(--wpds-font-size-lg);
25+
font-weight: var(--wpds-font-weight-medium);
26+
line-height: var(--wpds-font-line-height-lg);
2227
margin: 0;
2328
overflow: hidden;
24-
font-size: var(--wpds-font-size-lg);
2529
}
2630

2731
.admin-ui-page__sidebar-toggle-slot:empty {

0 commit comments

Comments
 (0)