Skip to content

Sync #a10d1cc3 #1056

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Mar 1, 2025
Merged

Sync #a10d1cc3 #1056

merged 18 commits into from
Mar 1, 2025

Conversation

wxsms
Copy link
Member

@wxsms wxsms commented Dec 31, 2024

Description of Problem

vuejs/docs@f9c82f4...a10d1cc

yyx990803 and others added 13 commits December 6, 2024 10:16
…ages (#3119)

* docs: hide all the style-guide links until it's ready

* docs: add outdated warnings on style guide pages

* docs: adjust v-for with v-if warnings

* docs: add outdated warning to style-guide index
…097)

* docs: template-refs defineExpose before await

* Update src/guide/essentials/template-refs.md

---------

Co-authored-by: Natalia Tepluhina <[email protected]>
… components/registration.md file. (#3103)

edited src/guide/components/registration.md file. More verbose for new learners.
…r (#3125)

* Add files via upload

tesst

* Delete test.txt

* Fixed issue #3094

It was stated that Lifecycle hooks should be at the end of the essentials tab because it fits the narrative better. vuejs/docs#3094
* docs(guide/components/slots): clarify slot presence phrasing

The original phrasing "whether or not a slot is present" was potentially misleading, as it suggested checking the existence of the slot itself rather than whether content was passed to it. Updated the explanation to clarify this distinction for better readability and accuracy.

* docs(guide/components/slots): clarify slot presence phrasing (2)

The phrase "When the header/footer/default is present..." could be interpreted as referring to the slot's definition, rather than whether content is provided for the slot
1. Removed the implication that teleport is focussed on displaying the element _outside the Vue application_. The real focus is on displaying outside the original component. 

2. Improved grammar generally and reduced unnecessary words.
# Conflicts:
#	.vitepress/config.ts
#	src/api/general.md
#	src/guide/built-ins/teleport.md
#	src/guide/components/registration.md
#	src/guide/components/slots.md
#	src/guide/essentials/conditional.md
#	src/guide/essentials/list.md
#	src/guide/essentials/reactivity-fundamentals.md
#	src/guide/essentials/template-refs.md
#	src/guide/extras/web-components.md
@wxsms wxsms added 从英文版同步 请使用 merge commit 合并 从 upstream 同步的 PR 需保留 git 历史记录 labels Dec 31, 2024
Copy link

vercel bot commented Dec 31, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
docs-zh-cn ✅ Ready (Inspect) Visit Preview 💬 Add feedback Mar 1, 2025 4:57pm

Copy link

cloudflare-workers-and-pages bot commented Dec 31, 2024

Deploying docs-zh-cn with  Cloudflare Pages  Cloudflare Pages

Latest commit: bdb1048
Status: ✅  Deploy successful!
Preview URL: https://a33c47d2.docs-zh-cn.pages.dev
Branch Preview URL: https://sync.docs-zh-cn.pages.dev

View logs

@veaba
Copy link
Member

veaba commented Mar 1, 2025

稍后再合并,原文存在格式问题,无法通过 zhlint 检查,仍然等待下面两个 PR:

> [!Note]
> 这种方法是实现该功能的一种可能方式
> 但具体实现可能因创建自定义元素所用的框架而异。
:::tip 注意
Copy link
Member

Choose a reason for hiding this comment

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

如果这里改成了 custom container,建议加相同的改动到英文版,同时这里留个链接备忘一下,下同

Copy link
Member

Choose a reason for hiding this comment

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

已被上游 英文仓库 merge:vuejs/docs#3185

@Jinjiang Jinjiang merged commit ed07b83 into main Mar 1, 2025
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
从英文版同步 请使用 merge commit 合并 从 upstream 同步的 PR 需保留 git 历史记录
Projects
None yet
Development

Successfully merging this pull request may close these issues.