Skip to content

Commit 363bb07

Browse files
committed
fix merge conflicts with main
2 parents f94dcd3 + 0256a5f commit 363bb07

File tree

9 files changed

+577
-680
lines changed

9 files changed

+577
-680
lines changed

.changeset/rich-tools-cry.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+
Remove link button from the new button

docs/content/Button.mdx

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -83,29 +83,12 @@ It is recommended to use an octicon here.
8383
### Icon only button
8484

8585
A separate component called `IconButton` is used if the action shows only an icon with no text. This button will remain square in shape.
86+
Read more at [IconButton docs](/drafts/IconButton)
8687

8788
```jsx live drafts
8889
<IconButton icon={SearchIcon}>Search</IconButton>
8990
```
9091

91-
### Different sized icon buttons
92-
93-
`IconButton` also supports the three different sizes. `small`, `medium`, `large`.
94-
95-
```jsx live drafts
96-
<>
97-
<IconButton icon={SearchIcon} size="small">
98-
Search
99-
</IconButton>
100-
<IconButton sx={{ml: 2}} icon={SearchIcon}>
101-
Search
102-
</IconButton>
103-
<IconButton sx={{ml: 2}} icon={SearchIcon} size="large">
104-
Search
105-
</IconButton>
106-
</>
107-
```
108-
10992
### Counter component
11093

11194
A common use case for primer is a button with a counter component which shows the child count value.

docs/package-lock.json

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)