Skip to content

Commit

Permalink
Merge branch 'dev' into next
Browse files Browse the repository at this point in the history
  • Loading branch information
KaelWD committed Jan 12, 2019
2 parents 5a57bf2 + d583858 commit d5b84eb
Show file tree
Hide file tree
Showing 1,323 changed files with 126 additions and 49 deletions.
2 changes: 1 addition & 1 deletion ecosystem-win.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module.exports = {
{
name: 'vuetify-docs',
script: 'server.js',
cwd: './packages/vuetifyjs.com/'
cwd: './packages/docs/'
}
]
}
2 changes: 1 addition & 1 deletion ecosystem.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ module.exports = {
{
name: 'vuetify-docs',
script: 'yarn.js',
cwd: './packages/vuetifyjs.com/',
cwd: './packages/docs/',
args: 'dev'
},
{
Expand Down
6 changes: 2 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,10 @@
}
},
"scripts": {
"build": "lerna run build --stream",
"dev": "node scripts/dev.js",
"build": "node scripts/build.js",
"start": "lerna run start --scope vuetifyjs.com --stream",
"lint": "lerna run lint --parallel",
"dev": "lerna run dev --scope vuetify --stream",
"kitchen": "lerna run serve --scope kitchen --stream",
"docs-dev": "lerna run dev --scope vuetifyjs.com --stream",
"version": "node scripts/confirm-npm-tag.js",
"postinstall": "node scripts/post-install.js",
"postversion": "node scripts/post-release-merge.js"
Expand Down
4 changes: 4 additions & 0 deletions packages/api-generator/src/map.js
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,10 @@ const VSelect = {
{
name: 'valueComparator',
default: '(a: any, b: any) => boolean'
},
{
name: 'menuProps',
default: '{"closeOnClick":false, "closeOnContentClick":false, "openOnClick":false, "maxHeight":300}'
}
],
slots: inputSlots.concat(['no-data', 'label', 'progress']),
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion packages/vuetifyjs.com/package.json β†’ packages/docs/package.json
100755 β†’ 100644
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "vuetifyjs.com",
"name": "docs",
"description": "A Vue.js project",
"private": true,
"author": "John Leider <[email protected]>",
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
async genList () {
const list = []
const items = document.querySelectorAll('#page [id]')
const items = document.querySelectorAll('.page [id]')
for (const item of items) {
if (
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@
},
contributionLanguageLink () {
const file = `${this.params.namespace}/${this.page}.json`
return `https://github.com/vuetifyjs/vuetify/tree/master/packages/vuetifyjs.com/src/lang/${this.params.lang}/${file}`
return `https://github.com/vuetifyjs/vuetify/tree/master/packages/docs/src/lang/${this.params.lang}/${file}`
},
contributionPageLink () {
const file = `${this.params.namespace}/${this.page}.json`
return `https://github.com/vuetifyjs/vuetify/tree/master/packages/vuetifyjs.com/src/data/pages/${file}`
return `https://github.com/vuetifyjs/vuetify/tree/master/packages/docs/src/data/pages/${file}`
}
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<v-icon>mdi-codepen</v-icon>
</v-btn>
<v-btn
:href="`https://github.com/vuetifyjs/vuetify/tree/${branch}/packages/vuetifyjs.com/src/examples/${file}.vue`"
:href="`https://github.com/vuetifyjs/vuetify/tree/${branch}/packages/docs/src/examples/${file}.vue`"
icon
target="_blank"
>
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
class="v-markup__edit"
>
<a
:href="`https://github.com/vuetifyjs/vuetify/tree/master/packages/vuetifyjs.com/src/snippets/${file}`"
:href="`https://github.com/vuetifyjs/vuetify/tree/master/packages/docs/src/snippets/${file}`"
target="_blank"
rel="noopener"
title="Edit code"
Expand Down Expand Up @@ -93,7 +93,7 @@
},
href () {
const branch = process.env.NODE_ENV === 'production' ? 'master' : 'dev'
const href = `https://github.com/vuetifyjs/vuetify/tree/${branch}/packages/vuetifyjs.com/src/snippets`
const href = `https://github.com/vuetifyjs/vuetify/tree/${branch}/packages/docs/src/snippets`
return `${href}/${this.file}`
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
ma-0
>
<a
:href="`https://github.com/vuetifyjs/vuetify/tree/master/packages/vuetifyjs.com/src${layout.href}.vue`"
:href="`https://github.com/vuetifyjs/vuetify/tree/master/packages/docs/src${layout.href}.vue`"
class="text-decoration-none mx-2"
target="_blank"
rel="noopener"
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
"order",
"directionAndAlign",
"rowColumnBreakpoint",
"growShrink",
"nestedGrid",
"uniqueLayouts",
"spacer",
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit d5b84eb

Please sign in to comment.