Skip to content

Commit 017dd95

Browse files
mostafa-nematpourmostafa-nematpour
committed
Merge remote-tracking branch 'origin/upstream'
2 parents eb74326 + 901fa8e commit 017dd95

File tree

4 files changed

+137
-79
lines changed

4 files changed

+137
-79
lines changed

‎.vitepress/inlined-scripts/restorePreference.js

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

‎.vitepress/theme/components/Banner.vue

+13-75
Original file line numberDiff line numberDiff line change
@@ -22,31 +22,16 @@ function dismiss() {
2222

2323
<template>
2424
<div class="banner" v-if="open">
25-
<p class="vt-banner-text">
26-
<span class="vt-text-primary">VueConf Toronto</span>
27-
<span class="vt-tagline"> - Join the premier Vue.js conference</span>
28-
| 18-20 Nov 2024 <span class="vt-place"> - Toronto, Canada</span>
29-
<a
30-
target="_blank"
31-
class="vt-primary-action"
32-
href="https://vuetoronto.com/?utm_source=vuejs&utm_content=top_banner"
33-
>
34-
Register
35-
</a>
36-
</p>
25+
<a target="_blank"></a>
3726
<button @click="dismiss">
3827
<VTIconPlus class="close" />
3928
</button>
40-
<p class="vt-banner-text vt-coupon">
41-
<span class="vt-text-primary">Use code</span> VUEJS
42-
<span class="vt-text-primary">to get 15% off</span>
43-
</p>
4429
</div>
4530
</template>
4631

4732
<style>
4833
html:not(.banner-dismissed) {
49-
--vt-banner-height: 60px;
34+
--vt-banner-height: 30px;
5035
}
5136
</style>
5237

@@ -65,10 +50,12 @@ html:not(.banner-dismissed) {
6550
font-weight: 600;
6651
color: #fff;
6752
background-color: var(--vt-c-green);
68-
background: #11252b;
69-
display: flex;
70-
justify-content: center;
71-
align-items: center;
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+
);
7259
}
7360
7461
.banner-dismissed .banner {
@@ -83,7 +70,7 @@ button {
8370
position: absolute;
8471
right: 0;
8572
top: 0;
86-
padding: 20px 10px;
73+
padding: 5px;
8774
}
8875
8976
.close {
@@ -92,59 +79,10 @@ button {
9279
fill: #fff;
9380
transform: rotate(45deg);
9481
}
95-
96-
.vt-banner-text {
97-
color: #fff;
98-
font-size: 16px;
99-
}
100-
101-
.vt-text-primary {
102-
color: #75c05e;
103-
}
104-
105-
.vt-primary-action {
106-
background: #75c05e;
107-
color: #121c1a;
108-
padding: 8px 15px;
109-
border-radius: 5px;
110-
font-size: 14px;
111-
text-decoration: none;
112-
margin: 0 20px;
113-
font-weight: bold;
114-
}
115-
.vt-primary-action:hover {
116-
text-decoration: none;
117-
background: #5a9f45;
118-
}
119-
120-
@media (max-width: 1280px) {
121-
.banner .vt-banner-text {
122-
font-size: 14px;
123-
}
124-
.vt-tagline {
125-
display: none;
126-
}
127-
}
128-
129-
@media (max-width: 780px) {
130-
.vt-tagline {
131-
display: none;
132-
}
133-
.vt-coupon {
134-
display: none;
135-
}
136-
.vt-primary-action {
137-
margin: 0 10px;
138-
padding: 7px 10px;
139-
}
140-
.vt-time-now {
141-
display: none;
142-
}
143-
}
144-
145-
@media (max-width: 560px) {
146-
.vt-place {
82+
/*
83+
@media (max-width: 720px) {
84+
a > span {
14785
display: none;
14886
}
149-
}
87+
} */
15088
</style>

‎.vitepress/theme/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ import {
1010
} from './components/preferences'
1111
import SponsorsAside from './components/SponsorsAside.vue'
1212
import VueSchoolLink from './components/VueSchoolLink.vue'
13-
import Banner from './components/Banner.vue'
13+
// import Banner from './components/Banner.vue'
1414
// import TextAd from './components/TextAd.vue'
1515

1616
export default Object.assign({}, VPTheme, {
1717
Layout: () => {
1818
// @ts-ignore
1919
return h(VPTheme.Layout, null, {
20-
banner: () => h(Banner),
20+
// banner: () => h(Banner),
2121
'sidebar-top': () => h(PreferenceSwitch),
2222
'sidebar-bottom': () => h(SecurityUpdateBtn),
2323
'aside-mid': () => h(SponsorsAside)

‎src/public/funding.json

+120
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
{
2+
"version": "v1.0.0",
3+
4+
"entity": {
5+
"type": "organisation",
6+
"role": "owner",
7+
"name": "Vue Technology LLC",
8+
"email": "[email protected]",
9+
"phone": "",
10+
"description": "Vue Technology LLC is the legal entity representing Vue's business operations and fund distribution to team members",
11+
"webpageUrl": {
12+
"url": "https://vuejs.org",
13+
"wellKnown": ""
14+
}
15+
},
16+
17+
"projects": [
18+
{
19+
"guid": "vuejs",
20+
"name": "Vue.js",
21+
"description": "Vue.js is one of the most widely adopted frontend frameworks, with over 5.5 million weekly downloads and 2 million weekly active users. It is also the technology powering Zerodha's frontend.",
22+
"webpageUrl": {
23+
"url": "https://vuejs.org",
24+
"wellKnown": ""
25+
},
26+
"repositoryUrl": {
27+
"url": "https://github.com/vuejs/core",
28+
"wellKnown": "https://github.com/vuejs/core/blob/main/.well-known/funding-manifest-urls"
29+
},
30+
"licenses": ["spdx:MIT"],
31+
"tags": ["frontend", "javascript", "web-development", "ui"]
32+
}
33+
],
34+
35+
"funding": {
36+
"channels": [
37+
{
38+
"guid": "github-sponsors",
39+
"type": "other",
40+
"address": "https://github.com/sponsors/yyx990803",
41+
"description": "GitHub supports payment via credit card or invoice-based billing."
42+
},
43+
{
44+
"guid": "open-collective",
45+
"type": "other",
46+
"address": "https://opencollective.com/vuejs",
47+
"description": "OpenCollective supports payment via credit card, Google Pay, or US bank ACH transfer."
48+
},
49+
{
50+
"guid": "bank-of-america",
51+
"type": "bank",
52+
"address": "",
53+
"description": "For donations via bank transfers, please get in touch for bank details."
54+
}
55+
],
56+
57+
"plans": [
58+
{
59+
"guid": "special",
60+
"status": "active",
61+
"name": "Global Special Sponsor",
62+
"description": "Exclusive above-the-fold logo placement on vuejs.org home page / Most prominent logo placement in on the right sidebar of every content page on vuejs.org (3M+ page views per month / 500k+ unique MAU) / Most prominent logo placement in the README and BACKERS files of the vuejs/core repo.",
63+
"amount": 5000,
64+
"currency": "USD",
65+
"frequency": "monthly",
66+
"channels": [
67+
"github-sponsors",
68+
"open-collective",
69+
"bank-of-america"
70+
]
71+
},
72+
{
73+
"guid": "platinum",
74+
"status": "active",
75+
"name": "Platinum Sponsor",
76+
"description": "Logo on the right sidebar of every content page on vuejs.org (3M+ page views per month / 500k+ unique MAU) / Large logo placement on vuejs.org front page + sponsors page + in the README and BACKERS files of the vuejs/core repo.",
77+
"amount": 2000,
78+
"currency": "USD",
79+
"frequency": "monthly",
80+
"channels": [
81+
"github-sponsors",
82+
"open-collective",
83+
"bank-of-america"
84+
]
85+
},
86+
{
87+
"guid": "gold",
88+
"status": "active",
89+
"name": "Gold Sponsor",
90+
"description": "Medium logo placement on vuejs.org front page + sponsors page + in the README and BACKERS files of the vuejs/core repo.",
91+
"amount": 500,
92+
"currency": "USD",
93+
"frequency": "monthly",
94+
"channels": ["github-sponsors", "open-collective"]
95+
},
96+
{
97+
"guid": "silver",
98+
"status": "active",
99+
"name": "Silver Sponsor",
100+
"description": "Small logo placement on vuejs.org sponsors page + in the README and BACKERS files of the vuejs/core repo.",
101+
"amount": 250,
102+
"currency": "USD",
103+
"frequency": "monthly",
104+
"channels": ["github-sponsors", "open-collective"]
105+
},
106+
{
107+
"guid": "bronze",
108+
"status": "active",
109+
"name": "Bronze Sponsor",
110+
"description": "Small logo placement in the README and BACKERS files of the vuejs/core repo.",
111+
"amount": 100,
112+
"currency": "USD",
113+
"frequency": "monthly",
114+
"channels": ["github-sponsors", "open-collective"]
115+
}
116+
],
117+
118+
"history": []
119+
}
120+
}

0 commit comments

Comments
 (0)