Skip to content
This repository was archived by the owner on Sep 20, 2024. It is now read-only.

Commit fbbaa14

Browse files
committed
Merge branch 'develop' of github.com:chakra-ui/chakra-ui-vue into fix/close-button-color
2 parents e5ad556 + c88b4e9 commit fbbaa14

File tree

4 files changed

+30
-5
lines changed

4 files changed

+30
-5
lines changed

.all-contributorsrc

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,16 @@
222222
"name": "JT Houk",
223223
"avatar_url": "https://avatars.githubusercontent.com/u/23695312?v=4",
224224
"profile": "https://jt.houk.space/",
225+
"contributions": [
226+
"doc",
227+
"platform"
228+
]
229+
},
230+
{
231+
"login": "vincentpalma",
232+
"name": "Vincent Palma",
233+
"avatar_url": "https://avatars.githubusercontent.com/u/10133632?v=4",
234+
"profile": "https://github.com/vincentpalma",
225235
"contributions": [
226236
"doc"
227237
]

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,9 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
218218
<td align="center"><a href="https://github.com/odanado"><img src="https://avatars.githubusercontent.com/u/6040962?v=4?s=50" width="50px;" alt=""/><br /><sub><b>odanado</b></sub></a><br /><a href="https://github.com/chakra-ui/chakra-ui-vue/commits?author=odanado" title="Code">💻</a> <a href="#tool-odanado" title="Tools">🔧</a></td>
219219
</tr>
220220
<tr>
221-
<td align="center"><a href="https://jt.houk.space/"><img src="https://avatars.githubusercontent.com/u/23695312?v=4?s=50" width="50px;" alt=""/><br /><sub><b>JT Houk</b></sub></a><br /><a href="https://github.com/chakra-ui/chakra-ui-vue/commits?author=HoukasaurusRex" title="Documentation">📖</a></td>
222221
<td align="center"><a href="https://github.com/IHIutch"><img src="https://avatars.githubusercontent.com/u/20825047?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Jonathan Hutchison</b></sub></a><br /><a href="https://github.com/chakra-ui/chakra-ui-vue/commits?author=IHIutch" title="Code">💻</a> <a href="https://github.com/chakra-ui/chakra-ui-vue/issues?q=author%3AIHIutch" title="Bug reports">🐛</a> <a href="#ideas-IHIutch" title="Ideas, Planning, & Feedback">🤔</a></td>
222+
<td align="center"><a href="https://jt.houk.space/"><img src="https://avatars.githubusercontent.com/u/23695312?v=4?s=50" width="50px;" alt=""/><br /><sub><b>JT Houk</b></sub></a><br /><a href="https://github.com/chakra-ui/chakra-ui-vue/commits?author=HoukasaurusRex" title="Documentation">📖</a> <a href="#platform-HoukasaurusRex" title="Packaging/porting to new platform">📦</a></td>
223+
<td align="center"><a href="https://github.com/vincentpalma"><img src="https://avatars.githubusercontent.com/u/10133632?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Vincent Palma</b></sub></a><br /><a href="https://github.com/chakra-ui/chakra-ui-vue/commits?author=vincentpalma" title="Documentation">📖</a></td>
223224
</tr>
224225
</table>
225226

website/pages/image.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ Below is the correct way to `require` relative assets for the `CImage` and `CAva
7878
<c-image src="@/assets/path-to-img.jpg" />
7979
8080
<!-- ✅ Correct -->
81-
<c-image :src="require('@/assets/path-to-img.jpg)" />
81+
<c-image :src="require('@/assets/path-to-img.jpg')" />
8282
```
8383

8484
## Fallback support

website/pages/with-vuepress.mdx

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ export default ({
7474
}
7575
}
7676
})
77-
})
77+
}
7878
```
7979

8080
Now you can wrap your main application inside the Chakra `CThemeProvider` component by creating a layout wrapper in `theme/layouts/Layout.vue`.
@@ -105,7 +105,11 @@ export default {
105105

106106
## Using Chakra components
107107

108-
_In your `App.vue` file._
108+
You can now use Chakra in your custom components for your theme in either your `theme/components` folder (available to other theme components),
109+
or your `theme/global-components` folder (available to your markdown pages as well as other components).
110+
Learn more about theme inheritance in the [Vuepress documentation](https://vuepress.vuejs.org/theme/inheritance.html#inheritance-strategy)
111+
112+
_In your `my-component.vue` file._
109113

110114
```vue
111115
<template>
@@ -120,11 +124,21 @@ _In your `App.vue` file._
120124
import { CBox, CButton } from '@chakra-ui/vue'
121125
122126
export default {
123-
name: 'App',
127+
name: 'MyComponent',
124128
components: {
125129
CBox,
126130
CButton
127131
}
128132
}
129133
</script>
130134
```
135+
136+
### Vuepress Codesandbox Starters
137+
138+
Here's a link to sample component starter with Nuxt.js
139+
140+
- [Vuepress Starter](https://codesandbox.io/s/chakra-ui-vuepress-starter-qx4up)
141+
142+
### Storybook Components
143+
144+
You can also view all developed components in [Storybook](https://chakra-ui-vue.netlify.com)!

0 commit comments

Comments
 (0)