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

Commit 3196f6a

Browse files
Merge branch 'develop' into all-contributors/add-freality
2 parents cab963e + 0d808b3 commit 3196f6a

38 files changed

+1049
-32
lines changed

.all-contributorsrc

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,24 @@
165165
"code",
166166
"test"
167167
]
168+
},
169+
{
170+
"login": "gbschalch",
171+
"name": "Guilherme Schalch",
172+
"avatar_url": "https://avatars3.githubusercontent.com/u/13435327?v=4",
173+
"profile": "http://www.linkedin.com/in/schalch",
174+
"contributions": [
175+
"code"
176+
]
177+
},
178+
{
179+
"login": "be-codified",
180+
"name": "Žiga Vukčevič",
181+
"avatar_url": "https://avatars1.githubusercontent.com/u/10107183?v=4",
182+
"profile": "http://www.be-codified.com",
183+
"contributions": [
184+
"doc"
185+
]
168186
}
169187
],
170188
"contributorsPerLine": 7,

.github/semantic.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Always validate the PR title, and ignore the commits
2+
titleOnly: true
3+
4+
# Require at least one commit to be valid
5+
# this is only relevant when using commitsOnly: true or titleAndCommits: true,
6+
# which validate all commits by default
7+
anyCommit: true
8+
9+
# Allow use of Merge commits (eg on github: "Merge branch 'master' into feature/ride-unicorns")
10+
# this is only relevant when using commitsOnly: true (or titleAndCommits: true)
11+
allowMergeCommits: true
12+
13+
# Allow use of Revert commits (eg on github: "Revert "feat: ride unicorns"")
14+
# this is only relevant when using commitsOnly: true (or titleAndCommits: true)
15+
allowRevertCommits: true

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,5 @@ jobs:
5757
- run: yarn build
5858
- run: yarn publish-ci
5959
env:
60-
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
60+
NPM_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
6161

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@ packages/*/node_modules
3434
lerna-debug.log
3535
.now
3636
config/.env
37-
packages/nuxt-chakra/.github
37+
packages/chakra-ui-nuxt/.github
3838
packages/chakra-ui-docs/static/sw.js

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,8 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
212212
<td align="center"><a href="https://github.com/Anmol270900"><img src="https://avatars2.githubusercontent.com/u/43845658?v=4" width="50px;" alt=""/><br /><sub><b>Anmol</b></sub></a><br /><a href="https://github.com/chakra-ui/chakra-ui-vue/commits?author=Anmol270900" title="Documentation">📖</a></td>
213213
<td align="center"><a href="https://github.com/vishnumohanrk"><img src="https://avatars3.githubusercontent.com/u/51525368?v=4" width="50px;" alt=""/><br /><sub><b>Vishnumohan R K</b></sub></a><br /><a href="https://github.com/chakra-ui/chakra-ui-vue/commits?author=vishnumohanrk" title="Documentation">📖</a></td>
214214
<td align="center"><a href="https://github.com/freality"><img src="https://avatars3.githubusercontent.com/u/15808?v=4" width="50px;" alt=""/><br /><sub><b>Ken Love</b></sub></a><br /><a href="https://github.com/chakra-ui/chakra-ui-vue/commits?author=freality" title="Code">💻</a> <a href="https://github.com/chakra-ui/chakra-ui-vue/commits?author=freality" title="Tests">⚠️</a></td>
215+
<td align="center"><a href="http://www.linkedin.com/in/schalch"><img src="https://avatars3.githubusercontent.com/u/13435327?v=4" width="50px;" alt=""/><br /><sub><b>Guilherme Schalch</b></sub></a><br /><a href="https://github.com/chakra-ui/chakra-ui-vue/commits?author=gbschalch" title="Code">💻</a></td>
216+
<td align="center"><a href="http://www.be-codified.com"><img src="https://avatars1.githubusercontent.com/u/10107183?v=4" width="50px;" alt=""/><br /><sub><b>Žiga Vukčevič</b></sub></a><br /><a href="https://github.com/chakra-ui/chakra-ui-vue/commits?author=be-codified" title="Documentation">📖</a></td>
215217
</tr>
216218
</table>
217219

packages/chakra-ui-core/CHANGELOG.md

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,35 @@
11
# Change Log
22

3+
## 0.6.5
4+
5+
### Patch Changes
6+
7+
- fix style props for @chakra-ui/vue
8+
9+
## 0.6.4
10+
11+
### Patch Changes
12+
13+
- improvements to style props
14+
15+
## 0.6.3
16+
17+
### Patch Changes
18+
19+
- fix: includes missing style props for border-radius and flex-grow style declarations"
20+
21+
## 0.6.2
22+
23+
### Patch Changes
24+
25+
- 3533e00: Fix: CSwitch component v-model + @change event handler.
26+
27+
## 0.6.2-next.0
28+
29+
### Patch Changes
30+
31+
- Fix: CSwitch component v-model + @change event handler.
32+
333
## 0.6.1
434

535
### Patch Changes

packages/chakra-ui-core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@chakra-ui/vue",
3-
"version": "0.6.1",
3+
"version": "0.6.5",
44
"description": "Build Accessible and Responsive Vue.js websites and applications with speed ⚡️",
55
"main": "dist/cjs/index.js",
66
"module": "dist/esm/index.js",

packages/chakra-ui-core/src/CFlex/CFlex.stories.js

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,19 @@ storiesOf('UI | Flex', module)
2222
</CFlex>
2323
`
2424
}))
25+
.add('Flex grow', () => ({
26+
components: { CFlex, CBox, CText },
27+
template: `
28+
<CFlex w="600px" align="center">
29+
<CBox flex-grow="2" w="10" mr="3" h="10" bg="blue.100">1</CBox>
30+
<CBox rounded-top="lg" w="10" mr="3" h="10" bg="blue.100">1</CBox>
31+
<CBox rounded-right="lg" w="10" mr="3" h="10" bg="blue.100">2</CBox>
32+
<CBox rounded-bottom="lg" w="10" mr="3" h="10" bg="blue.100">3</CBox>
33+
<CBox rounded-right="lg" w="10" mr="3" h="10" bg="blue.100">4</CBox>
34+
<CBox border-top-right-radius="lg" w="10" mr="3" h="10" bg="blue.100">5</CBox>
35+
<CBox border-top-left-radius="lg" w="10" mr="3" h="10" bg="blue.100">6</CBox>
36+
<CBox border-bottom-right-radius="lg" w="10" mr="3" h="10" bg="blue.100">7</CBox>
37+
<CBox border-bottom-left-radius="lg" w="10" h="10" bg="blue.100">8</CBox>
38+
</CFlex>
39+
`
40+
}))

packages/chakra-ui-core/src/CRadio/CRadio.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ const CRadio = {
3232
props: {
3333
id: String,
3434
name: String,
35-
value: String,
35+
value: [String, Number],
3636
ariaLabel: String,
3737
ariaLabelledBy: String,
3838
variantColor: {

packages/chakra-ui-core/src/CReset/CReset.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,12 @@ const CReset = {
5151
}
5252
},
5353
props: {
54-
config: Function
54+
config: {
55+
type: Function,
56+
validator (value) {
57+
return typeof value === 'function'
58+
}
59+
}
5560
},
5661
created () {
5762
const { color, bg, borderColor, placeholderColor } = this.styleConfig[this.colorMode]

0 commit comments

Comments
 (0)