chore(stack): resolve docs merge conflict

Author: codebender828

.all-contributorsrc

@@ -161,9 +161,28 @@
       "name": "Ken Love",
       "avatar_url": "https://avatars3.githubusercontent.com/u/15808?v=4",
       "profile": "https://github.com/freality",
+      "contributions": [
+        "code",
+        "test"
+      ]
+    },
+    {
+      "login": "gbschalch",
+      "name": "Guilherme Schalch",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/13435327?v=4",
+      "profile": "http://www.linkedin.com/in/schalch",
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "be-codified",
+      "name": "Žiga Vukčevič",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/10107183?v=4",
+      "profile": "http://www.be-codified.com",
+      "contributions": [
+        "doc"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.github/workflows/release.yml

@@ -57,5 +57,5 @@ jobs:
       - run: yarn build
       - run: yarn publish-ci
         env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+          NPM_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
 

.gitignore

@@ -34,5 +34,5 @@ packages/*/node_modules
 lerna-debug.log
 .now
 config/.env
-packages/nuxt-chakra/.github
+packages/chakra-ui-nuxt/.github
 packages/chakra-ui-docs/static/sw.js

.storybook/components/Canvas.vue

@@ -48,6 +48,7 @@ import {
   CBox,
   CIconButton,
   CColorModeProvider } from '../../packages/chakra-ui-core/src'
+
 export default {
   name: 'Canvas',
   components: {

.storybook/config.js

@@ -2,9 +2,8 @@ import { configure, addDecorator, addParameters } from '@storybook/vue';
 import Vue from 'vue'
 import VueLive from 'vue-live'
 import Lorem from 'vue-lorem-ipsum'
-import Chakra, { CThemeProvider, CColorModeProvider, CReset } from '../packages/chakra-ui-core/src'
+import Chakra from '../packages/chakra-ui-core/src'
 import Canvas from './components/Canvas.vue'
-import theme from '../packages/chakra-ui-core/src/lib/theme'
 import storyBookTheme from './theme'
 
 import {
@@ -75,16 +74,11 @@ addParameters({
 
 addDecorator(() => ({
   template: `
-    <Canvas :theme="theme">
+    <Canvas>
       <story/>
     </Canvas>
   `,
-  data() {
-    return {
-      theme,
-    }
-  },
-  components: { CThemeProvider, CColorModeProvider, CReset, Canvas }
+  components: { Canvas }
 }));
 
 // For playground

README.md

@@ -211,7 +211,9 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
   <tr>
     <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>
     <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>
-    <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></td>
+    <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>
+    <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>
+    <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>
   </tr>
 </table>
 

packages/chakra-ui-core/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Change Log
 
+## 0.6.5
+
+### Patch Changes
+
+- fix style props for @chakra-ui/vue
+
+## 0.6.4
+
+### Patch Changes
+
+- improvements to style props
+
+## 0.6.3
+
+### Patch Changes
+
+- fix: includes missing style props for border-radius and flex-grow style declarations"
+
 ## 0.6.2
 
 ### Patch Changes

packages/chakra-ui-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chakra-ui/vue",
-  "version": "0.6.2",
+  "version": "0.6.5",
   "description": "Build Accessible and Responsive Vue.js websites and applications with speed ⚡️",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",

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

@@ -22,3 +22,19 @@ storiesOf('UI | Flex', module)
       </CFlex>
     `
   }))
+  .add('Flex grow', () => ({
+    components: { CFlex, CBox, CText },
+    template: `
+      <CFlex w="600px" align="center">
+        <CBox flex-grow="2" w="10" mr="3" h="10" bg="blue.100">1</CBox>
+        <CBox rounded-top="lg" w="10" mr="3" h="10" bg="blue.100">1</CBox>
+        <CBox rounded-right="lg" w="10" mr="3" h="10" bg="blue.100">2</CBox>
+        <CBox rounded-bottom="lg" w="10" mr="3" h="10" bg="blue.100">3</CBox>
+        <CBox rounded-right="lg" w="10" mr="3" h="10" bg="blue.100">4</CBox>
+        <CBox border-top-right-radius="lg" w="10" mr="3" h="10" bg="blue.100">5</CBox>
+        <CBox border-top-left-radius="lg" w="10" mr="3" h="10" bg="blue.100">6</CBox>
+        <CBox border-bottom-right-radius="lg" w="10" mr="3" h="10" bg="blue.100">7</CBox>
+        <CBox border-bottom-left-radius="lg" w="10" h="10" bg="blue.100">8</CBox>
+      </CFlex>
+    `
+  }))

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

@@ -15,13 +15,15 @@ const defaultConfig = theme => ({
     color: theme.colors.gray[800],
     bg: undefined,
     borderColor: theme.colors.gray[200],
-    placeholderColor: theme.colors.gray[400]
+    placeholderColor: theme.colors.gray[400],
+    fontFamily: theme.fonts.body
   },
   dark: {
     color: theme.colors.whiteAlpha[900],
     bg: theme.colors.gray[800],
     borderColor: theme.colors.whiteAlpha[300],
-    placeholderColor: theme.colors.whiteAlpha[400]
+    placeholderColor: theme.colors.whiteAlpha[400],
+    fontFamily: theme.fonts.body
   }
 })
 
@@ -51,16 +53,22 @@ const CReset = {
     }
   },
   props: {
-    config: Function
+    config: {
+      type: Function,
+      validator (value) {
+        return typeof value === 'function'
+      }
+    }
   },
   created () {
-    const { color, bg, borderColor, placeholderColor } = this.styleConfig[this.colorMode]
+    const { color, bg, borderColor, placeholderColor, fontFamily } = this.styleConfig[this.colorMode]
     useTailwindPreflight(this.theme)
     injectGlobal({
       html: {
         lineHeight: 1.5,
         color,
-        backgroundColor: bg
+        backgroundColor: bg,
+        fontFamily
       },
 
       '*, *::before, *::after': {