Skip to content

Commit acb87de

Browse files
authored
Merge branch 'main' into bugfix/fix-textinput-icon-with-block-prop
2 parents 2c6b139 + f3c2330 commit acb87de

File tree

5 files changed

+4
-16
lines changed

5 files changed

+4
-16
lines changed

docs/src/@primer/gatsby-theme-doctocat/components/hero.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ export default function Hero() {
99
<ThemeProvider colorMode="night" nightScheme="dark_dimmed">
1010
<Box bg="canvas.default" py={6}>
1111
<Container>
12-
<Heading color="accent.fg" fontSize={7} lineHeight="condensed" pb={3} m={0}>
13-
Primer React
14-
</Heading>
12+
<Heading sx={{color: 'accent.fg', fontSize: 7, lineHeight: 'condensed', pb: 3, m: 0}}>Primer React</Heading>
1513
<Text as="p" fontFamily="mono" mt={0} mb={2} color="fg.default" fontSize={2}>
1614
v{version}
1715
</Text>

docs/src/@primer/gatsby-theme-doctocat/components/live-preview-wrapper.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ function ThemeSwitcher() {
88
return (
99
<DropdownMenu
1010
renderAnchor={({children, ...anchorProps}) => (
11-
<DropdownButton variant="small" {...anchorProps}>
11+
<DropdownButton {...anchorProps} sx={{variant: 'small'}}>
1212
{children}
1313
</DropdownButton>
1414
)}

migrating.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ There are two ways to change the theme of @primer/components components:
110110

111111
export default () => (
112112
<ThemeProvider theme={theme}>
113-
<Block color="bodytext" p={4}>
113+
<Block sx={{color: 'bodytext', p: 4}}>
114114
<Text fontSize={4}>Hello, world!</Text>
115115
</Block>
116116
</ThemeProvider>

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"start": "concurrently npm:start:*",
1616
"start:docs": "cd docs && npm run develop",
1717
"start:storybook": "start-storybook -p 6006",
18-
"lint": "eslint '**/*.{js,ts,tsx,md,mdx}'",
18+
"lint": "eslint '**/*.{js,ts,tsx,md,mdx}' --max-warnings=0",
1919
"lint:fix": "npm run lint -- --fix",
2020
"test": "jest",
2121
"test:update": "npm run test -- --updateSnapshot",

src/__tests__/TextInputWithTokens.test.tsx

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,6 @@ const LabelledTextInputWithTokens: React.FC<TextInputWithTokensProps> = ({onToke
2929
</>
3030
)
3131

32-
// describe('axe test', () => {
33-
// it('should have no axe violations', async () => {
34-
// const onRemoveMock = jest.fn()
35-
// const {container} = HTMLRender(<LabelledTextInputWithTokens tokens={mockTokens} onTokenRemove={onRemoveMock} />)
36-
// const results = await axe(container)
37-
// expect(results).toHaveNoViolations()
38-
// cleanup()
39-
// })
40-
// })
41-
4232
jest.useFakeTimers()
4333

4434
describe('TextInputWithTokens', () => {

0 commit comments

Comments
 (0)