Merge branch 'develop' into v1

nystudio107 · Aug 21, 2019 · 9d566ac · 9d566ac
2 parents e2b0fee + 790ad5a
commit 9d566ac
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 
 A simple plugin for setting and getting cookies from within [Craft CMS](http://craftcms.com) templates.
 
-![Screenshot](docs/resources/img/plugin-logo.png)
+![Screenshot](./docs/docs/resources/img/plugin-logo.png)
 
 Related: [Cookies for Craft 2.x](https://github.com/nystudio107/cookies)
 

diff --git a/docs/.gitignore b/docs/.gitignore
@@ -0,0 +1,2 @@
+/vendor
+/node_modules
diff --git a/docs/.vuepress/config.js → docs/docs/.vuepress/config.js b/docs/.vuepress/config.js → docs/docs/.vuepress/config.js
@@ -2,7 +2,7 @@ module.exports = {
     title: 'Cookies Documentation',
     description: 'Documentation for the Cookies plugin',
     base: '/docs/cookies/',
-    dest: '../../../sites/nystudio107/web/docs/cookies',
+    dest: '../../../../sites/nystudio107/web/docs/cookies',
     themeConfig: {
         sidebar: [
             ['/', 'Cookies plugin for Craft CMS 3.x'],

diff --git a/docs/README.md → docs/docs/README.md b/docs/README.md → docs/docs/README.md
diff --git a/docs/resources/img/plugin-logo.png → docs/docs/resources/img/plugin-logo.png b/docs/resources/img/plugin-logo.png → docs/docs/resources/img/plugin-logo.png
diff --git a/package-lock.json → docs/package-lock.json b/package-lock.json → docs/package-lock.json
diff --git a/package.json → docs/package.json b/package.json → docs/package.json