Skip to content

Commit 90be68b

Browse files
committed
resolve conflicts
2 parents 3968da0 + acb6233 commit 90be68b

File tree

74 files changed

+465
-673
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+465
-673
lines changed

.changeset/beige-plums-obey.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@primer/react": major
3+
---
4+
5+
Remove PointerBox from @primer-react

.changeset/chilly-dingos-build.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@primer/react": patch
3+
---
4+
5+
chore: fix ActionBar gap issue

.changeset/gentle-sheep-feel.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@primer/styled-react': patch
3+
---
4+
5+
Export TooltipProps, TextInputProps, TokenProps.

.changeset/giant-impalas-occur.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@primer/react": patch
3+
---
4+
5+
chore(FilteredActionList): fix className override

.changeset/hot-mirrors-feel.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@primer/react': major
3+
---
4+
5+
Update UnderlineNav component to no longer support sx and remove Box usage from it.

.changeset/mighty-lizards-lick.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@primer/react": major
3+
---
4+
5+
Update FilteredActionList and FilteredActionListLoaders components to no longer support sx

.changeset/pre.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,21 @@
1515
"big-oranges-marry",
1616
"bright-dolls-dance",
1717
"bright-parents-flow",
18+
"busy-bananas-smash",
1819
"chubby-colts-nail",
1920
"cold-teams-buy",
2021
"cruel-papers-film",
22+
"cuddly-ads-behave",
23+
"cuddly-cows-trade",
2124
"deprecate-textinputwithtokens",
2225
"dirty-chairs-invent",
26+
"eighty-queens-tap",
2327
"few-mails-sing",
2428
"five-squids-sin",
2529
"gentle-rockets-go",
30+
"gold-dingos-sneeze",
2631
"great-hats-serve",
32+
"hot-bears-cry",
2733
"hot-melons-jump",
2834
"icy-pianos-say",
2935
"lemon-jokes-camp",
@@ -42,15 +48,23 @@
4248
"salty-geese-own",
4349
"seven-coats-hang",
4450
"seven-forks-join",
51+
"silly-parks-give",
52+
"slick-months-cry",
4553
"soft-islands-warn",
54+
"spotty-colts-hear",
4655
"stale-wasps-smell",
4756
"strange-knives-study",
4857
"strange-peas-kiss",
4958
"strong-falcons-design",
59+
"strong-lions-tan",
5060
"thin-oranges-lick",
5161
"three-hounds-refuse",
5262
"tricky-eggs-cross",
63+
"twenty-baboons-pull",
64+
"unlucky-hotels-shake",
5365
"wet-crews-drum",
66+
"wet-terms-argue",
67+
"witty-chicken-leave",
5468
"young-dots-heal",
5569
"young-timers-accept"
5670
]
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@primer/react': major
3+
---
4+
5+
Update CounterLabel component to no longer support sx

.changeset/silent-wasps-warn.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@primer/styled-react": minor
3+
---
4+
5+
feat(styled-react): Add an automatic generation of a components.json file to be used in the `primer-react/use-styled-react-import` eslint plugin

.changeset/smooth-singers-thank.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@primer/react": patch
3+
---
4+
5+
Implement forced colors for progress bar

0 commit comments

Comments
 (0)