Skip to content

Commit

Permalink
Merge remote-tracking branch 'source-doc/main'
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/api/application.md
#	src/api/sfc-css-features.md
#	src/guide/built-ins/transition-group.md
#	src/sponsor/index.md
  • Loading branch information
Ivan Bochkarev committed Nov 6, 2024
2 parents 7b0e606 + f7a57b8 commit c3df2c3
Show file tree
Hide file tree
Showing 11 changed files with 118 additions and 70 deletions.
7 changes: 7 additions & 0 deletions .vitepress/theme/components/Home.vue
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,13 @@ onMounted(load)
<span>{{ description }}</span>
</template>
</section>
<section v-else id="special-sponsor">
<span>
<a href="/sponsor/#tier-benefits">
Special Sponsor slot is now vacant - Inquire now
</a>
</span>
</section>

<section id="highlights" class="vt-box-container">
<div class="vt-box">
Expand Down
10 changes: 10 additions & 0 deletions .vitepress/theme/components/SponsorsGroup.vue
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,13 @@ function resolveList(data: SponsorData) {
@click="track(true)"
>Стать спонсором</a
>
<a
v-if="tier === 'special' && data && !data[tier]?.length"
href="mailto:[email protected]?subject=Vue.js%20special%20sponsor%20inquiry"
class="sponsor-item action"
@click="track(true)"
>Inquire about Special Sponsorship</a
>
</div>
</template>

Expand Down Expand Up @@ -130,6 +137,9 @@ function resolveList(data: SponsorData) {
font-size: 11px;
color: var(--vt-c-text-3);
}
.sponsor-container.page .sponsor-item.action {
font-size: 16px;
}
.sponsor-item img {
max-width: calc(var(--max-width) - 30px);
max-height: calc(var(--max-width) / 2 - 20px);
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"@vue/theme": "^2.3.0",
"dynamics.js": "^1.1.5",
"gsap": "^3.12.5",
"vitepress": "^1.4.0",
"vitepress": "^1.4.3",
"vue": "^3.5.12"
},
"devDependencies": {
Expand Down
118 changes: 59 additions & 59 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/about/team/members-core.json
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@
},
{
"name": "Natalia Tepluhina",
"title": "Staff Frontend Engineer",
"title": "Principal Engineer",
"company": "GitLab",
"companyLink": "https://gitlab.com/",
"projects": [
Expand Down
2 changes: 1 addition & 1 deletion src/api/application.md
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,7 @@ console.log(app.config)

## app.config.idPrefix <sup class="vt-badge" data-text="3.5+" /> {#app-config-idprefix}

Настройте префикс для всех идентификаторов, сгенерированных через [useId()](/api/general#useid) внутри этого приложения.
Настройте префикс для всех идентификаторов, сгенерированных через [useId()](/api/composition-api-helpers.html#useid) внутри этого приложения.

- **Тип:** `string`

Expand Down
20 changes: 20 additions & 0 deletions src/api/sfc-css-features.md
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,26 @@ useCssModule()
useCssModule('classes')
```

- **Example**

```vue
<script setup lang="ts">
import { useCssModule } from 'vue'
const classes = useCssModule()
</script>
<template>
<p :class="classes.red">red</p>
</template>
<style module>
.red {
color: red;
}
</style>
```

## `v-bind()` внутри CSS {#v-bind-in-css}

Однофайловые компоненты в секциях `<style>` поддерживают привязку значений CSS к динамическому состоянию компонента через CSS-функцию `v-bind`:
Expand Down
4 changes: 4 additions & 0 deletions src/guide/built-ins/transition-group.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,10 @@ import ListStagger from './transition-demos/ListStagger.vue'

[Полный пример](/examples/#list-transition)

### Custom TransitionGroup classes

You can also specify custom transition classes for the moving element by passing the `moveClass` prop to `<TransitionGroup>`, just like [custom transition classes on `<Transition>`](https://vuejs.org/guide/built-ins/transition.html#custom-transition-classes).

## Задержка переходов списка {#staggering-list-transitions}

Настраивая JavaScript-переходы через data-атрибуты, также можно настроить задержку для переходов в списке. Сначала мы отображаем индекс элемента как data-атрибут в DOM:
Expand Down
2 changes: 1 addition & 1 deletion src/guide/essentials/computed.md
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ const fullName = computed({

</div>

## Getting the previous value {#previous}
## Getting the Previous Value {#previous}

- Поддерживается только в версиях 3.4+

Expand Down
Loading

0 comments on commit c3df2c3

Please sign in to comment.