Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/upstream'
Browse files Browse the repository at this point in the history
  • Loading branch information
mostafa-nematpour committed Nov 19, 2024
2 parents eb74326 + 901fa8e commit 017dd95
Show file tree
Hide file tree
Showing 4 changed files with 137 additions and 79 deletions.
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__ = 'vt2024_1'
restore(`vue-docs-banner-${__VUE_BANNER_ID__}`, 'banner-dismissed')
// window.__VUE_BANNER_ID__ = ''
// restore(`vue-docs-banner-${__VUE_BANNER_ID__}`, 'banner-dismissed')
})()
88 changes: 13 additions & 75 deletions .vitepress/theme/components/Banner.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,31 +22,16 @@ function dismiss() {

<template>
<div class="banner" v-if="open">
<p class="vt-banner-text">
<span class="vt-text-primary">VueConf Toronto</span>
<span class="vt-tagline"> - Join the premier Vue.js conference</span>
| 18-20 Nov 2024 <span class="vt-place"> - Toronto, Canada</span>
<a
target="_blank"
class="vt-primary-action"
href="https://vuetoronto.com/?utm_source=vuejs&utm_content=top_banner"
>
Register
</a>
</p>
<a target="_blank"></a>
<button @click="dismiss">
<VTIconPlus class="close" />
</button>
<p class="vt-banner-text vt-coupon">
<span class="vt-text-primary">Use code</span> VUEJS
<span class="vt-text-primary">to get 15% off</span>
</p>
</div>
</template>

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

Expand All @@ -65,10 +50,12 @@ html:not(.banner-dismissed) {
font-weight: 600;
color: #fff;
background-color: var(--vt-c-green);
background: #11252b;
display: flex;
justify-content: center;
align-items: center;
background: linear-gradient(
90deg,
rgba(66, 184, 131, 1) 0%,
rgba(39, 179, 137, 1) 19%,
rgba(100, 126, 255, 1) 100%
);
}
.banner-dismissed .banner {
Expand All @@ -83,7 +70,7 @@ button {
position: absolute;
right: 0;
top: 0;
padding: 20px 10px;
padding: 5px;
}
.close {
Expand All @@ -92,59 +79,10 @@ button {
fill: #fff;
transform: rotate(45deg);
}
.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 {
/*
@media (max-width: 720px) {
a > span {
display: none;
}
}
} */
</style>
4 changes: 2 additions & 2 deletions .vitepress/theme/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ import {
} from './components/preferences'
import SponsorsAside from './components/SponsorsAside.vue'
import VueSchoolLink from './components/VueSchoolLink.vue'
import Banner from './components/Banner.vue'
// import Banner from './components/Banner.vue'
// import TextAd from './components/TextAd.vue'

export default Object.assign({}, VPTheme, {
Layout: () => {
// @ts-ignore
return h(VPTheme.Layout, null, {
banner: () => h(Banner),
// banner: () => h(Banner),
'sidebar-top': () => h(PreferenceSwitch),
'sidebar-bottom': () => h(SecurityUpdateBtn),
'aside-mid': () => h(SponsorsAside)
Expand Down
120 changes: 120 additions & 0 deletions src/public/funding.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
{
"version": "v1.0.0",

"entity": {
"type": "organisation",
"role": "owner",
"name": "Vue Technology LLC",
"email": "[email protected]",
"phone": "",
"description": "Vue Technology LLC is the legal entity representing Vue's business operations and fund distribution to team members",
"webpageUrl": {
"url": "https://vuejs.org",
"wellKnown": ""
}
},

"projects": [
{
"guid": "vuejs",
"name": "Vue.js",
"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.",
"webpageUrl": {
"url": "https://vuejs.org",
"wellKnown": ""
},
"repositoryUrl": {
"url": "https://github.com/vuejs/core",
"wellKnown": "https://github.com/vuejs/core/blob/main/.well-known/funding-manifest-urls"
},
"licenses": ["spdx:MIT"],
"tags": ["frontend", "javascript", "web-development", "ui"]
}
],

"funding": {
"channels": [
{
"guid": "github-sponsors",
"type": "other",
"address": "https://github.com/sponsors/yyx990803",
"description": "GitHub supports payment via credit card or invoice-based billing."
},
{
"guid": "open-collective",
"type": "other",
"address": "https://opencollective.com/vuejs",
"description": "OpenCollective supports payment via credit card, Google Pay, or US bank ACH transfer."
},
{
"guid": "bank-of-america",
"type": "bank",
"address": "",
"description": "For donations via bank transfers, please get in touch for bank details."
}
],

"plans": [
{
"guid": "special",
"status": "active",
"name": "Global Special Sponsor",
"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.",
"amount": 5000,
"currency": "USD",
"frequency": "monthly",
"channels": [
"github-sponsors",
"open-collective",
"bank-of-america"
]
},
{
"guid": "platinum",
"status": "active",
"name": "Platinum Sponsor",
"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.",
"amount": 2000,
"currency": "USD",
"frequency": "monthly",
"channels": [
"github-sponsors",
"open-collective",
"bank-of-america"
]
},
{
"guid": "gold",
"status": "active",
"name": "Gold Sponsor",
"description": "Medium logo placement on vuejs.org front page + sponsors page + in the README and BACKERS files of the vuejs/core repo.",
"amount": 500,
"currency": "USD",
"frequency": "monthly",
"channels": ["github-sponsors", "open-collective"]
},
{
"guid": "silver",
"status": "active",
"name": "Silver Sponsor",
"description": "Small logo placement on vuejs.org sponsors page + in the README and BACKERS files of the vuejs/core repo.",
"amount": 250,
"currency": "USD",
"frequency": "monthly",
"channels": ["github-sponsors", "open-collective"]
},
{
"guid": "bronze",
"status": "active",
"name": "Bronze Sponsor",
"description": "Small logo placement in the README and BACKERS files of the vuejs/core repo.",
"amount": 100,
"currency": "USD",
"frequency": "monthly",
"channels": ["github-sponsors", "open-collective"]
}
],

"history": []
}
}

0 comments on commit 017dd95

Please sign in to comment.