Skip to content

Commit a8e703c

Browse files
authored
Merge pull request #1113 from vuejs-translations/sync
Sync #31b4521a
2 parents ff8bed7 + d06d6a2 commit a8e703c

38 files changed

+561
-4151
lines changed

.vitepress/config.ts

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
11
import fs from 'fs'
22
import path from 'path'
3-
import { defineConfigWithTheme, type HeadConfig, type Plugin } from 'vitepress'
3+
import {
4+
defineConfigWithTheme,
5+
type HeadConfig,
6+
type Plugin
7+
} from 'vitepress'
48
import type { Config as ThemeConfig } from '@vue/theme'
59
import llmstxt from 'vitepress-plugin-llms'
610
import baseConfig from '@vue/theme/config'
711
import { headerPlugin } from './headerMdPlugin'
812
// import { textAdPlugin } from './textAdMdPlugin'
9-
import { groupIconMdPlugin,groupIconVitePlugin } from 'vitepress-plugin-group-icons'
13+
import {
14+
groupIconMdPlugin,
15+
groupIconVitePlugin
16+
} from 'vitepress-plugin-group-icons'
1017

1118
const nav: ThemeConfig['nav'] = [
1219
{
@@ -47,9 +54,12 @@ const nav: ThemeConfig['nav'] = [
4754
text: '资源',
4855
items: [
4956
{ text: '合作伙伴', link: '/partners/' },
50-
{ text: '开发者', link: '/developers/' },
5157
{ text: '主题', link: '/ecosystem/themes' },
5258
{ text: 'UI 组件', link: 'https://ui-libs.vercel.app/' },
59+
{
60+
text: '插件合集',
61+
link: 'https://www.vue-plugins.org/'
62+
},
5363
{
5464
text: '证书',
5565
link: 'https://certificates.dev/vuejs/?ref=vuejs-nav'
@@ -97,7 +107,7 @@ const nav: ThemeConfig['nav'] = [
97107
text: '动态',
98108
items: [
99109
{ text: '博客', link: 'https://blog.vuejs.org/' },
100-
{ text: 'Twitter', link: 'https://twitter.com/vuejs' },
110+
{ text: 'Twitter', link: 'https://x.com/vuejs' },
101111
{ text: '活动', link: 'https://events.vuejs.org/' },
102112
{ text: '新闻简报', link: '/ecosystem/newsletters' }
103113
]
@@ -128,13 +138,9 @@ const nav: ThemeConfig['nav'] = [
128138
link: '/sponsor/'
129139
},
130140
{
131-
text: '专家',
132-
badge: { text: '新' },
133-
activeMatch: `^/(partners|developers)/`,
134-
items: [
135-
{ text: '合作伙伴', link: '/partners/' },
136-
{ text: '开发者', link: '/developers/', badge: { text: '新' } }
137-
]
141+
text: '合作伙伴',
142+
activeMatch: `^/partners/`,
143+
link: '/partners/'
138144
}
139145
]
140146

@@ -497,7 +503,7 @@ export const sidebar: ThemeConfig['sidebar'] = {
497503
{
498504
text: '带过渡动效的列表',
499505
link: '/examples/#list-transition'
500-
},
506+
}
501507
]
502508
},
503509
{
@@ -664,11 +670,10 @@ export default defineConfigWithTheme<ThemeConfig>({
664670
[
665671
'script',
666672
{
667-
src: 'https://vueschool.io/banner.js?affiliate=vuejs&type=top',
673+
src: 'https://media.bitterbrains.com/main.js?from=vuejs&type=top',
668674
async: 'true'
669675
}
670-
],
671-
inlineScript('perfops.js')
676+
]
672677
],
673678

674679
themeConfig: {
@@ -740,7 +745,7 @@ export default defineConfigWithTheme<ThemeConfig>({
740745
{
741746
link: 'https://pl.vuejs.org',
742747
text: 'Polski',
743-
repo: 'https://github.com/vuejs-translations/docs-pl',
748+
repo: 'https://github.com/vuejs-translations/docs-pl'
744749
},
745750
{
746751
link: '/translations/',
@@ -803,7 +808,7 @@ export default defineConfigWithTheme<ThemeConfig>({
803808

804809
socialLinks: [
805810
{ icon: 'github', link: 'https://github.com/vuejs/' },
806-
{ icon: 'twitter', link: 'https://twitter.com/vuejs' },
811+
{ icon: 'twitter', link: 'https://x.com/vuejs' },
807812
{ icon: 'discord', link: 'https://discord.com/invite/vue' }
808813
],
809814

@@ -825,8 +830,7 @@ export default defineConfigWithTheme<ThemeConfig>({
825830
markdown: {
826831
theme: 'github-dark',
827832
config(md) {
828-
md.use(headerPlugin)
829-
.use(groupIconMdPlugin)
833+
md.use(headerPlugin).use(groupIconMdPlugin)
830834
// .use(textAdPlugin)
831835
}
832836
},

.vitepress/inlined-scripts/perfops.js

Lines changed: 0 additions & 9 deletions
This file was deleted.

.vitepress/inlined-scripts/restorePreference.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
restore('vue-docs-prefer-composition', 'prefer-composition', true)
99
restore('vue-docs-prefer-sfc', 'prefer-sfc', true)
1010

11-
// window.__VUE_BANNER_ID__ = 'viteconf2025'
11+
// window.__VUE_BANNER_ID__ = ''
1212
// restore(`vue-docs-banner-${__VUE_BANNER_ID__}`, 'banner-dismissed')
1313
})()

.vitepress/theme/components/Banner.vue

Lines changed: 19 additions & 160 deletions
Original file line numberDiff line numberDiff line change
@@ -20,48 +20,12 @@ function dismiss() {
2020
}
2121
</script>
2222

23-
2423
<template>
2524
<div class="banner" v-if="open">
26-
<svg style="margin-right: 0.5rem" width="20" height="20" viewBox="0 0 30 30" fill="none"
27-
xmlns="http://www.w3.org/2000/svg">
28-
<g>
29-
<path
30-
d="M20.3653 1.01733L11.1779 2.87249C11.0895 2.87249 11.0012 2.96082 11.0012 2.96082C10.9128 3.04916 10.9128 3.13751 10.9128 3.13751L10.3828 13.2083C10.3828 13.2967 10.3828 13.2967 10.3828 13.3851C10.3828 13.4734 10.4711 13.4734 10.4711 13.4734C10.4711 13.4734 10.5595 13.5618 10.6478 13.5618C10.7361 13.5618 10.7361 13.5618 10.8245 13.5618L13.3864 12.9433C13.6514 12.855 13.8281 13.12 13.8281 13.3851L13.033 17.3603C12.9447 17.6254 13.2097 17.8905 13.4748 17.8021L15.0648 17.272C15.3299 17.1837 15.5066 17.4487 15.5066 17.7137L14.2697 23.8976C14.1815 24.251 14.7115 24.5159 14.8882 24.1626L15.0648 23.8976L22.5738 8.08458C22.5738 7.90789 22.3088 7.55453 22.0438 7.64287L19.3935 8.17292C19.1286 8.26125 18.9519 7.99624 19.0402 7.73122L20.7187 1.45903C20.807 1.19401 20.6304 0.928988 20.3653 1.01733Z"
31-
fill="url(#paint0_linear_648_13)" />
32-
<path
33-
d="M29.6424 3.75619C29.2891 3.22614 28.5824 2.96112 27.964 3.04945L20.985 4.37457L20.72 5.43465L28.2289 4.10955C28.494 4.02121 28.7591 4.19788 28.9357 4.37457C29.1124 4.63959 29.1124 4.90462 28.9357 5.16964L15.773 28.5799C15.6846 28.845 15.4196 28.9332 15.1545 28.9332C14.8896 28.9332 14.6245 28.7566 14.5361 28.5799L1.10836 5.08129C0.931674 4.90462 0.931674 4.55125 1.10836 4.37457C1.28504 4.19788 1.46172 4.10955 1.72674 4.10955C1.72674 4.10955 1.81508 4.10955 1.90342 4.10955L9.85411 5.523L9.94246 4.55125L1.99176 3.04945C1.28504 2.96112 0.666654 3.22614 0.313291 3.75619C-0.0400717 4.28623 -0.128412 4.99295 0.22495 5.61134L13.6528 29.1099C13.9178 29.64 14.5361 29.9933 15.1545 29.9933C15.773 29.9933 16.303 29.64 16.6563 29.1099L29.8191 5.61134C30.0842 4.99295 30.0842 4.28623 29.6424 3.75619Z"
34-
fill="url(#paint1_linear_648_13)" />
35-
</g>
36-
<defs>
37-
<linearGradient id="paint0_linear_648_13" x1="10.5947" y1="3.97762" x2="20.9471" y2="17.0584"
38-
gradientUnits="userSpaceOnUse">
39-
<stop stop-color="#B047FF" />
40-
<stop offset="0.75" stop-color="#FFD0D0" />
41-
<stop offset="0.9167" stop-color="#FFF3E6" />
42-
</linearGradient>
43-
<linearGradient id="paint1_linear_648_13" x1="8.078" y1="1.32911" x2="23.118" y2="18.0977"
44-
gradientUnits="userSpaceOnUse">
45-
<stop stop-color="#57CCFF" />
46-
<stop offset="1" stop-color="#AF48FF" />
47-
</linearGradient>
48-
</defs>
49-
</svg>
50-
<p class="vt-banner-text">
51-
<span class="vt-main">ViteConf 2025</span>
52-
<span class="vt-tagline"> · First time <span style="font-weight: 900;">in-person</span></span>
53-
<span class="vt-place"> · Amsterdam</span>
54-
<span class="vt-date"> · Oct 09-10</span>
55-
<a target="_blank" class="vt-primary-action"
56-
href="https://viteconf.amsterdam/?utm_source=vuejs&utm_content=top_banner">
57-
Register
58-
</a>
59-
</p>
25+
<a target="_blank"></a>
6026
<button @click="dismiss">
6127
<VTIconPlus class="close" />
6228
</button>
63-
<div class="glow glow--purple"></div>
64-
<div class="glow glow--blue"></div>
6529
</div>
6630
</template>
6731

@@ -82,80 +46,31 @@ html:not(.banner-dismissed) {
8246
height: var(--vt-banner-height);
8347
line-height: var(--vt-banner-height);
8448
text-align: center;
85-
font-size: 12px;
86-
color: white;
87-
background: #262626;
88-
display: flex;
89-
justify-content: center;
90-
align-items: center;
91-
overflow: hidden;
92-
}
93-
94-
.glow.glow--purple {
95-
position: absolute;
96-
bottom: -15%;
97-
left: -75%;
98-
width: 80%;
99-
aspect-ratio: 1.5;
100-
pointer-events: none;
101-
border-radius: 100%;
102-
background: linear-gradient(270deg, #7a23a1, #715ebde6 60% 80%, #bd34fe00);
103-
filter: blur(15vw);
104-
transform: none;
105-
opacity: .6
106-
}
107-
108-
.glow.glow--blue {
109-
position: absolute;
110-
bottom: -15%;
111-
right: -40%;
112-
width: 80%;
113-
aspect-ratio: 1.5;
114-
pointer-events: none;
115-
border-radius: 100%;
116-
background: linear-gradient(180deg, #61d9ff, #0000);
117-
filter: blur(15vw);
118-
transform: none;
119-
opacity: .3
120-
}
121-
122-
@media (min-width: 768px) {
123-
.glow.glow--blue {
124-
top: -15%;
125-
right: -40%;
126-
width: 80%;
127-
}
128-
129-
.glow.glow--purple {
130-
bottom: -15%;
131-
left: -40%;
132-
width: 80%;
133-
}
134-
}
135-
136-
@media (min-width: 1025px) {
137-
.glow.glow--blue {
138-
top: -15%;
139-
right: -40%;
140-
width: 80%;
141-
}
142-
143-
.glow.glow--purple {
144-
bottom: -15%;
145-
left: -40%;
146-
width: 80%;
147-
}
49+
font-size: 13px;
50+
font-weight: 600;
51+
color: #fff;
52+
background-color: var(--vt-c-green);
53+
background: linear-gradient(
54+
90deg,
55+
rgba(66, 184, 131, 1) 0%,
56+
rgba(39, 179, 137, 1) 19%,
57+
rgba(100, 126, 255, 1) 100%
58+
);
14859
}
14960
15061
.banner-dismissed .banner {
15162
display: none;
15263
}
15364
65+
a:hover {
66+
text-decoration: underline;
67+
}
68+
15469
button {
15570
position: absolute;
15671
right: 0;
15772
top: 0;
158-
padding: 5px 5px;
73+
padding: 5px;
15974
}
16075
16176
.close {
@@ -164,65 +79,9 @@ button {
16479
fill: #fff;
16580
transform: rotate(45deg);
16681
}
167-
168-
.vt-banner-text {
169-
color: #fff;
170-
font-size: 12px;
171-
}
172-
173-
.vt-main {
174-
color: transparent;
175-
background-image: linear-gradient(120deg, #b047ff 16%, #9499ff, #9499ff);
176-
background-clip: text;
177-
}
178-
179-
.vt-primary-action {
180-
background: radial-gradient(141.42% 141.42% at 100% 0%, #ffffff80, #fff0), radial-gradient(140.35% 140.35% at 100% 94.74%, #bd34fe, #bd34fe00), radial-gradient(89.94% 89.94% at 18.42% 15.79%, #41d1ff, #41d1ff00);
181-
color: #fff;
182-
padding: 4px 8px;
183-
border-radius: 5px;
184-
font-size: 10px;
185-
text-decoration: none;
186-
margin: 0 10px;
187-
transition: all .2s ease-in-out;
188-
189-
&:hover {
190-
box-shadow: 0 1px #fffc inset;
191-
}
192-
}
193-
194-
195-
@media (max-width: 1280px) {
196-
.banner .vt-banner-text {
197-
font-size: 14px;
198-
}
199-
200-
.vt-tagline {
201-
display: none;
202-
}
203-
}
204-
205-
@media (max-width: 780px) {
206-
.vt-tagline {
207-
display: none;
208-
}
209-
210-
.vt-coupon {
211-
display: none;
212-
}
213-
214-
.vt-primary-action {
215-
margin: 0 10px;
216-
padding: 4px 8px;
217-
}
218-
219-
.vt-time-now {
220-
display: none;
221-
}
222-
}
223-
224-
@media (max-width: 560px) {
225-
.vt-place {
82+
/*
83+
@media (max-width: 720px) {
84+
a > span {
22685
display: none;
22786
}
22887
} */

.vitepress/theme/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import SponsorsAside from './components/SponsorsAside.vue'
1212
// import VueSchoolLink from './components/VueSchoolLink.vue'
1313
import ScrimbaLink from './components/ScrimbaLink.vue'
1414
import WwAds from './components/WwAds.vue'
15-
import Banner from './components/Banner.vue'
15+
// import Banner from './components/Banner.vue'
1616
// import TextAd from './components/TextAd.vue'
1717

1818
import 'vitepress/dist/client/theme-default/styles/components/vp-code-group.css'

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"@vue/theme": "^2.3.0",
2121
"dynamics.js": "^1.1.5",
2222
"gsap": "^3.12.5",
23-
"vitepress": "^1.4.3",
23+
"vitepress": "^1.6.4",
2424
"vue": "^3.5.12"
2525
},
2626
"devDependencies": {

0 commit comments

Comments
 (0)