Skip to content

Commit 06dd067

Browse files
Merge remote-tracking branch 'upstream/dev' into feat/shadcn-input
2 parents d33b24a + 08a4bcb commit 06dd067

Some content is hidden

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

46 files changed

+921
-34
lines changed

.all-contributorsrc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12316,6 +12316,15 @@
1231612316
"contributions": [
1231712317
"maintenance"
1231812318
]
12319+
},
12320+
{
12321+
"login": "jncrabb",
12322+
"name": "jncrabb",
12323+
"avatar_url": "https://avatars.githubusercontent.com/u/27811684?v=4",
12324+
"profile": "https://github.com/jncrabb",
12325+
"contributions": [
12326+
"content"
12327+
]
1231912328
}
1232012329
],
1232112330
"contributorsPerLine": 7,

.github/workflows/chromatic.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ on:
1717
- "src/layouts/**/*"
1818
- "src/@chakra-ui/**/*"
1919
- ".storybook/**/*"
20+
- "tailwind.config.ts"
21+
- "src/styles/**/*"
2022

2123
# List of jobs
2224
jobs:

.storybook/preview.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ const preview: Preview = {
4242
],
4343
parameters: {
4444
i18n,
45-
actions: { argTypesRegex: "^on[A-Z].*" },
4645
controls: {
4746
matchers: {
4847
color: /(background|color)$/i,

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1882,6 +1882,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
18821882
<td align="center" valign="top" width="14.28%"><a href="https://github.com/codingmickey"><img src="https://avatars.githubusercontent.com/u/42518907?v=4?s=100" width="100px;" alt="Kartik Jolapara"/><br /><sub><b>Kartik Jolapara</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=codingmickey" title="Code">💻</a></td>
18831883
<td align="center" valign="top" width="14.28%"><a href="https://ekam-bitt.github.io"><img src="https://avatars.githubusercontent.com/u/74407205?v=4?s=100" width="100px;" alt="Ekam Bitt"/><br /><sub><b>Ekam Bitt</b></sub></a><br /><a href="#maintenance-Ekam-Bitt" title="Maintenance">🚧</a></td>
18841884
<td align="center" valign="top" width="14.28%"><a href="http://iankguimaraes.com"><img src="https://avatars.githubusercontent.com/u/29215044?v=4?s=100" width="100px;" alt="Ian K. Guimarães"/><br /><sub><b>Ian K. Guimarães</b></sub></a><br /><a href="#maintenance-iankressin" title="Maintenance">🚧</a></td>
1885+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/jncrabb"><img src="https://avatars.githubusercontent.com/u/27811684?v=4?s=100" width="100px;" alt="jncrabb"/><br /><sub><b>jncrabb</b></sub></a><br /><a href="#content-jncrabb" title="Content">🖋</a></td>
18851886
</tr>
18861887
</tbody>
18871888
</table>
Loading
Loading
Loading
Loading
Loading
Loading

0 commit comments

Comments
 (0)