Skip to content

Commit

Permalink
merge with latest docs/main(17041a2)
Browse files Browse the repository at this point in the history
  • Loading branch information
mahmudunnabikajal committed Oct 15, 2024
2 parents 5ea5921 + 17041a2 commit b398707
Show file tree
Hide file tree
Showing 37 changed files with 873 additions and 770 deletions.
6 changes: 3 additions & 3 deletions .vitepress/inlined-scripts/restorePreference.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
; (() => {
;(() => {
const restore = (key, cls, def = false) => {
const saved = localStorage.getItem(key)
if (saved ? saved !== 'false' : def) {
Expand All @@ -8,6 +8,6 @@
restore('vue-docs-prefer-composition', 'prefer-composition', true)
restore('vue-docs-prefer-sfc', 'prefer-sfc', true)

window.__VUE_BANNER_ID__ = 'vuejsdeconf2024-promo-september'
restore(`vue-docs-banner-${__VUE_BANNER_ID__}`, 'banner-dismissed')
// window.__VUE_BANNER_ID__ = ''
// restore(`vue-docs-banner-${__VUE_BANNER_ID__}`, 'banner-dismissed')
})()
55 changes: 12 additions & 43 deletions .vitepress/theme/components/Banner.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,31 +21,17 @@ function dismiss() {
</script>

<template>
<div class="banner banner-vuejsconf" v-if="open">
<a href="https://conf.vuejs.de/tickets/?voucher=VUEJS_SPECIAL_OFFER&utm_source=vuejs&utm_medium=referral&utm_campaign=banner-placement&utm_content=banner"
target="_blank">
<picture>
<source media="(min-width:1260px)"
srcset="/vuejsde-conf/vuejsdeconf_banner_large.png, /vuejsde-conf/vuejsdeconf_banner_large_2x.png 2x" />
<source media="(min-width:970px)"
srcset="/vuejsde-conf/vuejsdeconf_banner_medium.png, /vuejsde-conf/vuejsdeconf_banner_medium_2x.png 2x" />
<source media="(min-width:576px)"
srcset="/vuejsde-conf/vuejsdeconf_banner_small.png, /vuejsde-conf/vuejsdeconf_banner_small_2x.png 2x" />
<source media="(min-width:320px)"
srcset="/vuejsde-conf/vuejsdeconf_banner_smallest.png, /vuejsde-conf/vuejsdeconf_banner_smallest_2x.png 2x"
alt="" />
<img src="/vuejsde-conf/vuejsdeconf_banner_smallest_2x.png" alt="" />
</picture>
</a>
<div class="close-btn" @click.stop.prevent="dismiss">
<div class="banner" v-if="open">
<a target="_blank"></a>
<button @click="dismiss">
<VTIconPlus class="close" />
</div>
</button>
</div>
</template>

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

Expand All @@ -64,10 +50,12 @@ 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: 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 @@ -88,28 +76,9 @@ button {
.close {
width: 20px;
height: 20px;
fill: #000;
fill: #fff;
transform: rotate(45deg);
}
.banner-vuejsconf {
background: linear-gradient(90deg, #fff 50%, #6f97c4 50%);
}
.banner-vuejsconf a {
display: inline-block;
margin: 0 auto;
}
.banner-vuejsconf .close-btn {
top: 0px;
left: 0px;
z-index: 99;
position: absolute;
border-radius: 50%;
cursor: pointer;
}
/*
@media (max-width: 720px) {
a > span {
Expand Down
72 changes: 1 addition & 71 deletions .vitepress/theme/components/SponsorsAside.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,6 @@ const { frontmatter } = useData()
</script>

<template>
<a
class="viteconf-cta-aside"
href="https://viteconf.org/?utm=vue-sidebar"
target="_blank"
>
<img width="22" height="22" src="/viteconf.svg" />
<span>
<p class="extra-info">Building Together</p>
<p class="heading">ViteConf 24 - Oct 3</p>
<p class="extra-info">Get your free ticket!</p>
</span>
</a>
<div v-if="frontmatter.sponsors !== false">
<a class="sponsors-aside-text" href="/sponsor/">Sponsors</a>
<SponsorsGroup tier="special" />
Expand All @@ -28,68 +16,10 @@ const { frontmatter } = useData()
a.sponsors-aside-text {
color: var(--vt-c-text-3);
display: block;
margin: 1em 0 1em;
margin: 3em 0 1em;
font-weight: 700;
font-size: 11px;
text-transform: uppercase;
letter-spacing: 0.4px;
}
.viteconf-cta-aside {
margin-top: 1rem;
margin-bottom: 1rem;
border-radius: 4px;
padding-top: 0.4rem;
padding-bottom: 0.4rem;
position: relative;
font-size: 0.9rem;
font-weight: 700;
line-height: 1.1rem;
display: flex;
align-items: center;
justify-content: center;
width: 100%;
gap: 1rem;
background-color: var(--vt-c-bg-soft);
border: 2px solid var(--vt-c-bg-soft);
transition: border-color 0.5s;
filter: grayscale(1);
}
.viteconf-cta-aside:hover {
border: 2px solid #9499ff;
filter: none;
}
.viteconf-cta-aside img {
transition: transform 0.5s;
transform: scale(1.25);
}
.viteconf-cta-aside:hover img {
transform: scale(1.75);
}
.viteconf-cta-aside .heading {
color: var(--vt-c-text-1);
}
.viteconf-cta-aside:hover .heading {
background-image: linear-gradient(
120deg,
#b047ff 16%,
#9499ff,
#9499ff
);
background-clip: text;
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
}
.viteconf-cta-aside .extra-info {
color: var(--vt-c-text-1);
opacity: 0;
font-size: 0.7rem;
padding-left: 0.1rem;
transition: opacity 0.5s;
}
.viteconf-cta-aside:hover .extra-info {
opacity: 0.9;
}
</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
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@
"type": "vue-tsc --noEmit"
},
"dependencies": {
"@vue/repl": "^4.3.1",
"@vue/repl": "^4.4.2",
"@vue/theme": "^2.3.0",
"dynamics.js": "^1.1.5",
"gsap": "^3.12.5",
"vitepress": "^1.3.2",
"vue": "^3.5.0"
"vitepress": "^1.4.0",
"vue": "^3.5.12"
},
"devDependencies": {
"@types/body-scroll-lock": "^3.1.2",
"@types/markdown-it": "^14.1.1",
"@types/node": "^20.14.1",
"typescript": "^5.4.5",
"vue-tsc": "^2.0.29"
"@types/markdown-it": "^14.1.2",
"@types/node": "^22.7.5",
"typescript": "^5.6.3",
"vue-tsc": "^2.1.6"
},
"packageManager": "pnpm@9.10.0"
"packageManager": "pnpm@9.12.1"
}
Loading

0 comments on commit b398707

Please sign in to comment.