Skip to content

Commit 4041cfc

Browse files
Merge remote-tracking branch 'origin/upstream'
2 parents 01be801 + 549b330 commit 4041cfc

31 files changed

+605
-329
lines changed

.vitepress/config.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import type { Config as ThemeConfig } from '@vue/theme'
55
import baseConfig from '@vue/theme/config'
66
import { headerPlugin } from './headerMdPlugin'
77
// import { textAdPlugin } from './textAdMdPlugin'
8+
import { groupIconMdPlugin,groupIconVitePlugin } from 'vitepress-plugin-group-icons'
89

910
const nav: ThemeConfig['nav'] = [
1011
{
@@ -786,6 +787,7 @@ export default defineConfigWithTheme<ThemeConfig>({
786787
theme: 'github-dark',
787788
config(md) {
788789
md.use(headerPlugin)
790+
.use(groupIconMdPlugin)
789791
// .use(textAdPlugin)
790792
}
791793
},

.vitepress/inlined-scripts/restorePreference.js

Lines changed: 2 additions & 2 deletions
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__ = ''
12-
// restore(`vue-docs-banner-${__VUE_BANNER_ID__}`, 'banner-dismissed')
11+
window.__VUE_BANNER_ID__ = 'viteconf2025'
12+
restore(`vue-docs-banner-${__VUE_BANNER_ID__}`, 'banner-dismissed')
1313
})()

.vitepress/theme/components/Banner.vue

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

23+
2324
<template>
2425
<div class="banner" v-if="open">
25-
<a target="_blank"></a>
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>
2660
<button @click="dismiss">
2761
<VTIconPlus class="close" />
2862
</button>
63+
<div class="glow glow--purple"></div>
64+
<div class="glow glow--blue"></div>
2965
</div>
3066
</template>
3167

@@ -46,31 +82,80 @@ html:not(.banner-dismissed) {
4682
height: var(--vt-banner-height);
4783
line-height: var(--vt-banner-height);
4884
text-align: center;
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-
);
85+
font-size: 12px;
86+
color: white;
87+
background: #262626;
88+
display: flex;
89+
justify-content: center;
90+
align-items: center;
91+
overflow: hidden;
5992
}
6093
61-
.banner-dismissed .banner {
62-
display: none;
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+
}
63134
}
64135
65-
a:hover {
66-
text-decoration: underline;
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+
}
148+
}
149+
150+
.banner-dismissed .banner {
151+
display: none;
67152
}
68153
69154
button {
70155
position: absolute;
71156
right: 0;
72157
top: 0;
73-
padding: 5px;
158+
padding: 5px 5px;
74159
}
75160
76161
.close {
@@ -79,10 +164,66 @@ button {
79164
fill: #fff;
80165
transform: rotate(45deg);
81166
}
82-
/*
83-
@media (max-width: 720px) {
84-
a > span {
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 {
85201
display: none;
86202
}
87-
} */
88-
</style>
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 {
226+
display: none;
227+
}
228+
}
229+
</style>

.vitepress/theme/index.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,17 @@ import {
1111
import SponsorsAside from './components/SponsorsAside.vue'
1212
import VueSchoolLink from './components/VueSchoolLink.vue'
1313
import ScrimbaLink from './components/ScrimbaLink.vue'
14-
// import Banner from './components/Banner.vue'
14+
import Banner from './components/Banner.vue'
1515
// import TextAd from './components/TextAd.vue'
1616

17+
import 'vitepress/dist/client/theme-default/styles/components/vp-code-group.css'
18+
// import 'virtual:group-icons.css'
19+
1720
export default Object.assign({}, VPTheme, {
1821
Layout: () => {
1922
// @ts-ignore
2023
return h(VPTheme.Layout, null, {
21-
// banner: () => h(Banner),
24+
banner: () => h(Banner),
2225
'sidebar-top': () => h(PreferenceSwitch),
2326
'sidebar-bottom': () => h(SecurityUpdateBtn),
2427
'aside-mid': () => h(SponsorsAside)

.vitepress/theme/styles/index.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
@import './inline-demo.css';
55
@import './utilities.css';
66
@import './style-guide.css';
7+
@import './vars.css';
78
@import './overrides.css';
89

910
/* bugfix: https://github.com/vuejs/theme/pull/95 */

.vitepress/theme/styles/vars.css

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
:root {
2+
--vp-code-tab-active-bar-color: var(--vt-c-green);
3+
--vp-code-tab-active-text-color: var(--vt-c-text-inverse-1);
4+
--vp-code-tab-text-color: var(--vt-c-text-inverse-2);
5+
--vp-code-tab-hover-text-color: var(--vt-c-text-inverse-1);
6+
--vp-code-tab-bg: #292d3ef0;
7+
--vp-code-block-bg: #292d3ef0;
8+
}
9+
10+
.dark {
11+
--vp-code-tab-text-color: var(--vt-c-text-2);
12+
--vp-code-tab-hover-text-color: var(--vt-c-text-1);
13+
--vp-code-tab-active-text-color: var(--vt-c-text-1);
14+
--vp-code-tab-bg: var(--vt-c-black-mute);
15+
--vp-code-block-bg: var(--vt-c-black-mute);
16+
}

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
"@types/markdown-it": "^14.1.2",
2424
"@types/node": "^22.7.5",
2525
"typescript": "^5.6.3",
26+
"vitepress-plugin-group-icons": "^1.5.4",
2627
"vue-tsc": "^2.1.6"
2728
},
2829
"packageManager": "[email protected]"

0 commit comments

Comments
 (0)