Skip to content

Commit

Permalink
Merge pull request #278 from vuejs-translations/upstream-sync
Browse files Browse the repository at this point in the history
Upstream sync
  • Loading branch information
maxdzin authored Dec 29, 2023
2 parents 5e3aac8 + 9a66173 commit 17f9fbe
Show file tree
Hide file tree
Showing 41 changed files with 2,130 additions and 634 deletions.
1 change: 1 addition & 0 deletions .vitepress/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ const nav: ThemeConfig['nav'] = [
items: [
{ text: 'Партнери', link: '/partners/' },
{ text: 'Теми', link: '/ecosystem/themes' },
{ text: 'UI компоненти', link: 'https://ui-libs.vercel.app/' },
{
text: 'Сертифікація',
link: 'https://certification.vuejs.org/?ref=vuejs-nav'
Expand Down
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__ = ''
// restore(`vue-docs-banner-${__VUE_BANNER_ID__}`, 'banner-dismissed')
window.__VUE_BANNER_ID__ = 'herodevs-vue2-nes'
restore(`vue-docs-banner-${__VUE_BANNER_ID__}`, 'banner-dismissed')
})()
369 changes: 336 additions & 33 deletions .vitepress/theme/components/Banner.vue

Large diffs are not rendered by default.

38 changes: 18 additions & 20 deletions .vitepress/theme/components/Home.vue
Original file line number Diff line number Diff line change
Expand Up @@ -41,28 +41,26 @@ onMounted(async () => {
</p>
</section>

<section id="special-sponsor">
<section v-if="data && data.special" id="special-sponsor">
<span class="lead">Спеціальний спонсор</span>
<template v-if="data && data.special">
<template v-for="{ url, img, name, description } of data.special">
<a :href="url" target="_blank" rel="sponsored noopener">
<picture v-if="img.endsWith('png')">
<source
type="image/avif"
:srcset="`${base}/images/${img.replace(/\.png$/, '.avif')}`"
/>
<img :src="`${base}/images/${img}`" :alt="name" />
</picture>
<img
width="168"
height="42"
v-else
:src="`${base}/images/${img}`"
:alt="name"
<template v-for="{ url, img, name, description } of data.special">
<a :href="url" target="_blank" rel="sponsored noopener">
<picture v-if="img.endsWith('png')">
<source
type="image/avif"
:srcset="`${base}/images/${img.replace(/\.png$/, '.avif')}`"
/>
</a>
<span>{{ description }}</span>
</template>
<img :src="`${base}/images/${img}`" :alt="name" />
</picture>
<img
width="168"
height="42"
v-else
:src="`${base}/images/${img}`"
:alt="name"
/>
</a>
<span>{{ description }}</span>
</template>
</section>

Expand Down
284 changes: 284 additions & 0 deletions .vitepress/theme/components/VueMasteryBanner.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,284 @@
<template>
<div class="vuemastery-banner-wrapper" role="banner" v-if="isVisible">
<div
:class="{ 'show-flash': showFlash }"
class="vuemastery-background-dim"
ref="vuemastery-banner-flash"
></div>
<a
id="vm-banner"
href="https://www.vuemastery.com/holiday"
target="_blank"
>
<img
id="vm-logo-full"
src="/vuemastery/vuemastery-white.svg"
alt="vuemastery"
/>
<img
id="vm-logo-small"
src="https://firebasestorage.googleapis.com/v0/b/vue-mastery.appspot.com/o/flamelink%2Fmedia%2Fvue-mastery-logo-small.png?alt=media&token=941fcc3a-2b6f-40e9-b4c8-56b3890da108"
alt="vuemastery"
/>
<div class="vm-banner-wrapper">
<div class="vm-banner-content">
<h1 class="vm-banner-title">
Вивчайте Vue з Еваном Ю
<!-- <span>Dec 18-29</span> -->
</h1>
<p class="vm-banner-sub">Отримайте знижку 60% на рік курсів Vue</p>
</div>
<button id="vm-banner-cta">Розблокуйте свою знижку</button>
</div>
<button id="vm-banner-close" @click.prevent="closeBanner">
<VTIconPlus class="close" />
</button>
</a>
</div>
</template>

<script setup lang="ts">
import { ref, onMounted } from 'vue'
import { VTIconPlus } from '@vue/theme'
const isVisible = ref<Boolean>(true)
const showFlash = ref<Boolean>(false)
const nameStorage = 'VUEMASTERY-BANNER-DECEMBER-2023'
const closeBanner = () => {
// Hide the banner
isVisible.value = false
// Save action in the local storage
localStorage.setItem(nameStorage, String(true))
document.documentElement.classList.remove('vuemastery-menu-fixed')
}
onMounted(() => {
isVisible.value = !localStorage.getItem(nameStorage)
if (isVisible.value) {
document.documentElement.classList.add('vuemastery-menu-fixed')
setTimeout(() => {
showFlash.value = true
}, 2000)
}
})
</script>
<style scoped>
.vuemastery-banner-wrapper {
position: fixed;
top: 0;
bottom: 0;
left: 0;
right: 0;
z-index: 61;
width: 100%;
height: 100%;
max-height: 70px;
background: linear-gradient(45deg, #0a2b4e, #835ec2);
background-size: 110%;
background-position: 50% 50%;
overflow: hidden;
padding: 12px;
margin: 0;
transition: background-size 0.25s cubic-bezier(0.39, 0.575, 0.565, 1);
}
.vuemastery-banner-wrapper:hover {
background-size: 100%;
}
.vuemastery-banner-wrapper:before {
content: '';
background: url(/vuemastery/background-bubbles-vuemastery.svg) left
center no-repeat;
background-size: cover;
position: absolute;
top: 0;
bottom: 0;
left: 0;
right: 0;
transition: all 0.3s ease-out 0.1s;
transform: scale(1.1);
width: 100%;
height: 100%;
}
.vuemastery-banner-wrapper:after {
content: '';
background: url(/vuemastery/lock-vuemastery.svg) right center no-repeat;
background-size: auto 100%;
position: absolute;
width: 100%;
height: 100%;
top: 0;
left: 0;
pointer-events: none;
}
.vuemastery-banner-wrapper:hover:after {
background-image: url(/vuemastery/unlock-vuemastery.svg);
}
#vm-banner {
position: relative;
width: 100%;
height: 100%;
text-decoration: none;
color: white;
display: flex;
justify-content: center;
align-items: center;
overflow: hidden;
}
#vm-logo-full {
position: absolute;
left: 15px;
width: 120px;
}
#vm-logo-small {
display: none;
}
.vm-banner-wrapper {
display: flex;
align-items: center;
}
.vm-banner-content {
display: flex;
}
.vm-banner-title {
margin: 0;
padding: 0;
font-weight: bold;
font-size: 24px;
text-align: center;
background: linear-gradient(145deg, #c3ffac, #86ec87, #38a56a);
background-clip: text;
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
}
.vm-banner-sub {
margin: 0 2em;
padding: 0;
font-size: 16px;
text-align: center;
color: #fff;
}
#vm-banner-cta {
position: relative;
margin-left: 10px;
padding: 10px 24px;
background: linear-gradient(to top right, #41b782, #86d169);
border: none;
border-radius: 30px;
color: #fff;
font-size: 12px;
font-weight: bold;
text-decoration: none;
text-transform: uppercase;
}
#vm-banner-cta:hover {
background: linear-gradient(to bottom right, #41b782, #86d169);
}
#vm-banner-close {
position: absolute;
right: 12px;
color: #fff;
font-size: 20px;
font-weight: bold;
display: flex;
align-items: center;
justify-content: center;
}
#vm-banner-close > .close {
width: 20px;
height: 20px;
fill: #fff;
transform: rotate(45deg);
}
@media (max-width: 1200px) {
#vm-banner-cta {
display: none;
}
.vm-banner-content {
flex-direction: column;
}
.vm-banner-sub {
margin: 0 1em;
}
}
@media (max-width: 850px) {
.vuemastery-banner-wrapper:after {
background: none;
}
}
@media (max-width: 767px) {
#vm-logo-full {
left: 10px;
width: 100px;
}
}
@media (max-width: 767px) {
#vm-logo-full {
display: none;
}
#vm-logo-small {
position: absolute;
display: block;
left: 10px;
width: 40px;
}
.vm-banner-title {
font-size: 14px;
}
.vm-banner-sub {
font-size: 12px;
margin: 0;
}
}
.vuemastery-background-dim {
position: absolute;
width: 100%;
height: 100%;
top: 0;
left: 0;
}
.vuemastery-background-dim:after {
content: '';
position: absolute;
top: 0;
left: -100%;
width: 100%;
height: 100%;
background: linear-gradient(
90deg,
transparent,
rgba(255, 255, 255, 0.4),
transparent
);
transition: 0.5s;
transition-delay: 0.5s;
}
.vuemastery-background-dim.show-flash:after {
left: 100%;
}
</style>

<style>
html.vuemastery-menu-fixed {
--vt-banner-height: 70px;
}
</style>
4 changes: 3 additions & 1 deletion .vitepress/theme/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,16 @@ 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 VueMasteryBanner from './components/VueMasteryBanner.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(VueMasteryBanner),
'sidebar-top': () => h(PreferenceSwitch),
'aside-mid': () => h(SponsorsAside)
})
Expand Down
11 changes: 3 additions & 8 deletions .vitepress/theme/styles/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,7 @@
@import "./utilities.css";
@import "./style-guide.css";

:root {
--vp-sidebar-width-small: 289px !important;
}

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

.vt-flyout-menu {
max-height: calc(100vh - var(--vt-nav-height) - var(--vt-banner-height, 0px)) !important;
/* vitepress rc.31 migrated to shijiki and need this to apply code styles */
.vp-code span {
color: var(--shiki-dark, inherit);
}
Loading

1 comment on commit 17f9fbe

@vercel
Copy link

@vercel vercel bot commented on 17f9fbe Dec 29, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

docs-uk – ./

ua.vuejs.org
docs-uk.vercel.app
docs-uk-vuejs.vercel.app
docs-uk-git-main-vuejs.vercel.app

Please sign in to comment.