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

Sync #a8cf7bf4 #888

Merged
merged 31 commits into from
Apr 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
0ff32be
docs: remove reduntdent space in options-lifecycle.md (#2715)
wxsms Feb 27, 2024
dd0b29c
chore(deps): bump vue from 3.4.19 to 3.4.20 (#2714)
dependabot[bot] Feb 27, 2024
e72e53e
docs: add missing comments to the Options API in the transition page …
Aaron-zon Mar 1, 2024
c7fd561
docs: missing lang="ts" in code snippet (#2727)
AloisSeckar Mar 4, 2024
719e350
docs: update volar name and remove takeover mode related docs (#2726)
MooseSaeed Mar 4, 2024
ca46758
docs: remove takeover mode related docs (#2728)
liuwilliamBUPT Mar 4, 2024
8323f25
fix(docs): typo in docs (#2730)
rvdriest Mar 4, 2024
06949d6
docs: typo "Typescript" (#2731)
FlyingCaiChong Mar 5, 2024
51223f0
Fix outdated Immer import in "Immutable Data" (#2719)
ashc0 Mar 5, 2024
aabcb95
chore(deps): bump vue from 3.4.20 to 3.4.21 (#2718)
dependabot[bot] Mar 5, 2024
58ba3c8
docs(extras): move Tauri (#2717)
Shyam-Chen Mar 5, 2024
aabfc23
refactor: upgrade @vue/repl (#2693)
sxzz Mar 5, 2024
21d4c17
Fix "Hydration" typo (#2732)
salomoneb Mar 5, 2024
ed704ca
chore(deps): bump @vue/repl from 4.0.1 to 4.1.1 (#2733)
dependabot[bot] Mar 5, 2024
3149f1a
docs: update Volar to Vue - Official (#2734)
AloisSeckar Mar 5, 2024
90c7929
remove inactive newsletter
yyx990803 Mar 6, 2024
8efb4cf
use direct discord invite link
yyx990803 Mar 6, 2024
31d6411
update discord link in nav
yyx990803 Mar 6, 2024
4171256
limit themes to 6 each vendor
yyx990803 Mar 9, 2024
0910c20
add vueconf.us banner (#2736)
prpatel Mar 11, 2024
30e16e5
docs: GreenSock => GSAP (#2738)
AloisSeckar Mar 11, 2024
6db6990
Added Wrappixel Templates (#2737)
wrappixel Mar 11, 2024
c38056c
docs: link API reference for Suspense (#2739)
AloisSeckar Mar 11, 2024
f560789
Added CodedThemes Items (#2741)
phoenixcoded20 Mar 12, 2024
9173a1d
docs: internal link to compile time flags (#2744)
AloisSeckar Mar 12, 2024
1aca9b3
Update themes.json (#2745)
wrappixel Mar 13, 2024
a8cf7bf
docs: fix typo - prevNode should be prevVnode (#2747)
yangchaoNJ Mar 13, 2024
83ee55c
Merge remote-tracking branch 'origin/upstream' into sync
wxsms Mar 14, 2024
11df139
update lockfile
wxsms Mar 14, 2024
4a271d9
translate content
wxsms Mar 14, 2024
296a108
Merge remote-tracking branch 'origin/main' into sync
wxsms Apr 2, 2024
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent
.idea

# Directories potentially created on remote AFP share
.AppleDB
Expand Down
8 changes: 8 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions .idea/aws.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

67 changes: 67 additions & 0 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions .idea/codeStyles/codeStyleConfig.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .idea/docs.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .vitepress/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -760,7 +760,7 @@ export default defineConfigWithTheme<ThemeConfig>({
socialLinks: [
{ icon: 'github', link: 'https://github.com/vuejs/' },
{ icon: 'twitter', link: 'https://twitter.com/vuejs' },
{ icon: 'discord', link: 'https://discord.com/invite/HBherRA' }
{ icon: 'discord', link: 'https://discord.com/invite/vue' }
],

editLink: {
Expand Down
4 changes: 2 additions & 2 deletions .vitepress/inlined-scripts/restorePreference.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
restore('vue-docs-prefer-composition', 'prefer-composition', true)
restore('vue-docs-prefer-sfc', 'prefer-sfc', true)

// window.__VUE_BANNER_ID__ = ''
// restore(`vue-docs-banner-${__VUE_BANNER_ID__}`, 'banner-dismissed')
window.__VUE_BANNER_ID__ = 'vueconfus2024'
restore(`vue-docs-banner-${__VUE_BANNER_ID__}`, 'banner-dismissed')
})()
87 changes: 74 additions & 13 deletions .vitepress/theme/components/Banner.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,30 @@ function dismiss() {

<template>
<div class="banner" v-if="open">
<a target="_blank"></a>
<p class="vt-banner-text">
<span class="vt-text-primary">VueConf US</span>
<span class="vt-tagline"> - Join the official Vue.js conference</span>
| May 15-17, 2024 <span class="vt-place"> - New Orleans, USA</span>
<a
target="_blank"
class="vt-primary-action"
href="https://vueconf.us?utm_source=vuejs&utm_content=top_banner"
>Register <span class="vt-time-now">Now</span></a
>
</p>
<button @click="dismiss">
<VTIconPlus class="close" />
</button>
<p class="vt-banner-text vt-coupon">
<span class="vt-text-primary">Use code</span> VUEJSDOCS
<span class="vt-text-primary">to get $100 off!</span>
</p>
</div>
</template>

<style>
html:not(.banner-dismissed) {
--vt-banner-height: 30px;
--vt-banner-height: 60px;
}
</style>

Expand All @@ -50,12 +64,10 @@ html:not(.banner-dismissed) {
font-weight: 600;
color: #fff;
background-color: var(--vt-c-green);
background: linear-gradient(
90deg,
rgba(66, 184, 131, 1) 0%,
rgba(39, 179, 137, 1) 19%,
rgba(100, 126, 255, 1) 100%
);
background: #11252b;
display: flex;
justify-content: center;
align-items: center;
}

.banner-dismissed .banner {
Expand All @@ -70,7 +82,7 @@ button {
position: absolute;
right: 0;
top: 0;
padding: 5px;
padding: 20px 10px;
}

.close {
Expand All @@ -79,10 +91,59 @@ button {
fill: #fff;
transform: rotate(45deg);
}
/*
@media (max-width: 720px) {
a > span {

.vt-banner-text {
color: #fff;
font-size: 16px;
}

.vt-text-primary {
color: #75c05e;
}

.vt-primary-action {
background: #75c05e;
color: #121c1a;
padding: 8px 15px;
border-radius: 5px;
font-size: 14px;
text-decoration: none;
margin: 0 20px;
font-weight: bold;
}
.vt-primary-action:hover {
text-decoration: none;
background: #5a9f45;
}

@media (max-width: 1280px) {
.banner .vt-banner-text {
font-size: 14px;
}
.vt-tagline {
display: none;
}
}

@media (max-width: 780px) {
.vt-tagline {
display: none;
}
.vt-coupon {
display: none;
}
.vt-primary-action {
margin: 0 10px;
padding: 7px 10px;
}
.vt-time-now {
display: none;
}
}

@media (max-width: 560px) {
.vt-place {
display: none;
}
} */
}
</style>
4 changes: 2 additions & 2 deletions .vitepress/theme/components/NewsLetter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ import { VTLink } from '@vue/theme'
class="link"
href="https://news.vuejs.org/"
no-icon
>news.vuejs.org</VTLink> 阅读之前的期刊并收听我们的播客。你也可以在
>news.vuejs.org</VTLink> 阅读之前的期刊并收听我们的播客。你也可以在
<VTLink class="link" href="https://twitter.com/vuejs" no-icon>Twitter</VTLink> 关注我们,或加入我们的
<VTLink class="link" href="https://chat.vuejs.org/" no-icon>Discord</VTLink> 家园。
<VTLink class="link" href="https://discord.com/invite/vue" no-icon>Discord</VTLink> 家园。
</p>
</div>
</section>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"preinstall": "npx only-allow pnpm"
},
"dependencies": {
"@vue/repl": "^3.0.0",
"@vue/repl": "^4.0.1",
"@vue/theme": "^2.2.5",
"dynamics.js": "^1.1.5",
"gsap": "^3.9.0",
Expand Down
Loading
Loading