Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

docs(en): merge docs-next/master into vue-docs-next/main @ 12071a76 #52

Open
wants to merge 33 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
47691ed
Update Introduction example to use `components` instead of `.componen…
LSViana Oct 26, 2021
210b792
SSR Guide: Remove app.js (#1297)
CyberAP Oct 26, 2021
965d330
Add an example on why singletones are bad (#1298)
CyberAP Oct 27, 2021
ae71533
Adding Components.studio and WebComponents.dev... (#1299)
georges-gomes Oct 29, 2021
7607848
Update debugging-in-vscode.md (#1270)
deepansh96 Oct 29, 2021
7a9ad06
Fixed possessive pronouns (#1303)
Oct 29, 2021
eef29e0
fixed missing commas (#1302)
Oct 29, 2021
d026fc2
Update introduction.md (#1306)
wxsms Oct 30, 2021
f4311ed
Update deprecated app.config.isCustomElement (#1307)
Miguel-Bento-Github Oct 31, 2021
5ddaf35
fix: use createSSRApp instead of createApp (#1311)
skirtles-code Nov 3, 2021
563ed27
docs: expand the explanation about using VNodes with <component> (#1310)
skirtles-code Nov 3, 2021
3d84cff
Fix typo (#1315)
dews Nov 5, 2021
0097065
chore: Update partners on myself (#1318)
rstoenescu Nov 7, 2021
4fae0d0
add vue school links to supplement component documentation with video…
danielkellyio Nov 10, 2021
3c97d52
Update description about .number modifier (#1285)
zxuqian Nov 10, 2021
45b9049
fix: Explain usage of custom directives with script-setup (#1319)
LinusBorg Nov 10, 2021
813c887
enclosed a word intended to clarify meaning of diff (#1304)
Nov 10, 2021
fc31792
A better example for v-html (#1314)
mehanalavimajd Nov 10, 2021
729d996
fix: bug in the rendering of the v-html example (#1326)
skirtles-code Nov 12, 2021
c90a0a2
Update application-api.md (#1327)
mehanalavimajd Nov 13, 2021
44b9095
Add Vue School Black Friday 21 banners (#1330)
nicodevs Nov 18, 2021
48a9e6e
Fix Black Friday banner close button (#1333)
nicodevs Nov 18, 2021
3125ee0
update component-props.md (#1336)
wxsms Nov 19, 2021
efeddd5
docs(installation): link to cli.vuejs.org and vitejs.dev (#1340)
simon04 Nov 21, 2021
bd47f2a
fix: fixed a broken link
NataliaTepluhina Nov 24, 2021
c64958c
Update sfc-script-setup.md (#1345)
wxsms Nov 24, 2021
9729c18
update component-provide-inject.md (#1343)
wxsms Nov 24, 2021
b596073
update component-slots.md (#1342)
wxsms Nov 24, 2021
131fcf0
Update Vue School banner for Cyber Monday (#1358)
nicodevs Nov 30, 2021
56eff34
docs: add indonesia translation url (#1357)
simon04 Nov 30, 2021
334ea37
update transitions-overview.md (#1352)
wxsms Nov 30, 2021
12071a7
use camelCase (#1338)
wxsms Dec 1, 2021
3624350
docs(en): merging all conflicts
docschina-bot Dec 2, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions src/.vuepress/components/community/team/partners.js
Original file line number Diff line number Diff line change
Expand Up @@ -211,15 +211,14 @@ export default shuffle([
github: 'rstoenescu',
twitter: 'quasarframework',
work: {
role: 'Developer',
role: 'Author',
org: 'Quasar Framework',
orgUrl: 'http://quasar-framework.org/'
orgUrl: 'http://quasar.dev/'
},
reposPersonal: [
'quasarframework/quasar',
'quasarframework/quasar-cli',
'quasarframework/quasar-play'
]
'quasarframework/quasar'
],
links: ['https://quasar.dev']
},
{
name: 'Jilson Thomas',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export const labels = {
export const repos = [
{ lang: 'en-us', owner: 'vuejs', repo: 'docs', branch: 'master', url: 'https://v3.vuejs.org/' },
{ lang: 'fr', owner: 'demahom18', repo: 'docs-next', branch: 'master', url: 'https://vue3-fr.netlify.app' },
{ lang: 'id', owner: 'vuejs-id', repo: 'docs-next', branch: 'indonesian' },
{ lang: 'id', owner: 'vuejs-id', repo: 'docs-next', branch: 'indonesian', url: 'https://v3-vuejsid-docs.netlify.app/' },
{ lang: 'ja', owner: 'vuejs-jp', repo: 'ja.vuejs.org', branch: 'lang-ja', url: 'https://v3.ja.vuejs.org/' },
{ lang: 'ko', owner: 'vuejs-kr', repo: 'docs-next', branch: 'rootKoKr', url: 'https://v3.ko.vuejs.org/' },
{ lang: 'pt-br', owner: 'vuejs-br', repo: 'docs-next', branch: 'master', url: 'https://vuejsbr-docs-next.netlify.app/' },
Expand Down
4 changes: 2 additions & 2 deletions src/.vuepress/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ module.exports = {
'link',
{
href:
'https://fonts.googleapis.com/css?family=Inter:300,400,500,600|Open+Sans:400,600;display=swap',
'https://fonts.googleapis.com/css?family=Inter:300,400,500,600|Archivo:400,600|Open+Sans:400,600;display=swap',
rel: 'stylesheet'
}
],
Expand Down Expand Up @@ -510,7 +510,7 @@ module.exports = {
custom: 'CKYD62QM',
placement: 'vuejsorg'
},
topBanner: false
topBanner: true
},
plugins: [
[
Expand Down
6 changes: 6 additions & 0 deletions src/.vuepress/public/images/vueschool/extended.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions src/.vuepress/public/images/vueschool/vueschool_close.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
131 changes: 131 additions & 0 deletions src/.vuepress/theme/components/BannerCoins.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
<template>
<div
class="vs-blackfriday-coins">
<img
v-for="coin in coins"
:key="coin.id"
:alt="coin.id"
:src="`/images/vueschool/tech-coin-${coin.id}.png`"
:class="[coin.id, coin.inverse ? inverseDirection : direction]"
:style="coin.style"
class="vs-blackfriday-coin">
</div>
</template>

<script>
const coins = [
{ id: 'js', inverse: true },
{ id: 'ts' },
{ id: 'vue', inverse: true },
{ id: 'vuex', inverse: true },
{ id: 'nuxt' }
]

export default {
data () {
return {
coins,
xPosition: 0,
direction: 'left',
inverseDirection: 'right',
isAnimated: false
}
},
mounted () {
if (window.innerWidth < 1024) return
this.isAnimated = true
this.animationTarget = document.getElementById('vs')
this.animationTarget.addEventListener('mousemove', this.animate)
},
beforeDestroy () {
if (!this.isAnimated) return
this.animationTarget.removeEventListener('mousemove', this.animate)
},
methods: {
animate (e) {
this.direction = e.pageX > this.xPosition ? 'right' : 'left'
this.inverseDirection = this.direction === 'left' ? 'right' : 'left'
this.xPosition = e.pageX
}
}
}
</script>

<style>
.vs-blackfriday-coins {
overflow: hidden;
position: absolute;
bottom: 0;
right: 0;
top: 0;
left: 0;
z-index: -1;
}

.vs-blackfriday-coin {
display: none;
}

@media (min-width: 768px) {
.vs-blackfriday-coins {
background-image: url(/images/vueschool/vueschool_blackfriday_background_tablet_2.svg);
background-position: center;
background-size: cover;
}
}

@media (min-width: 1024px) {
.vs-blackfriday-coins {
background: transparent;
}

#vs:hover .vs-blackfriday-coin.left {
transform: translateX(-600px);
transition: transform 30s linear;
}

#vs:hover .vs-blackfriday-coin.right {
transform: translateX(600px);
transition: transform 30s linear;
}

.vs-blackfriday-coin {
display: inline-block;
position: absolute;
transition: transform 1000ms linear;
transform: translateX(0);
}

.vs-blackfriday-coin.js {
width: 43px;
top: 32px;
left: calc(50% - 436px);
}

.vs-blackfriday-coin.ts {
top: 0;
left: 0;
width: 54px;
left: calc(50% + 457px);
}

.vs-blackfriday-coin.vue {
top: 18px;
width: 60px;
left: calc(50% + 586px);
}

.vs-blackfriday-coin.vuex {
top: 23px;
left: 0;
width: 56px;
left: calc(50% - 620px);
}

.vs-blackfriday-coin.nuxt {
top: 10px;
width: 48px;
left: calc(50% - 494px);
}
}
</style>
Loading