Skip to content
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

Sync #11a07afc #948

Merged
merged 19 commits into from
Jun 30, 2024
Merged

Sync #11a07afc #948

merged 19 commits into from
Jun 30, 2024

Conversation

wxsms
Copy link
Member

@wxsms wxsms commented May 23, 2024

Description of Problem

vuejs/docs@35e8da8...11a07af

i5dr0id and others added 17 commits May 14, 2024 01:15
* feat: add vuemastery free-weekend banner

* feat: update link

* fix: text size on mobile
…… (#2853)

* docs: improve scoped slots explanation of mixing default and named scoped slots

* Update src/guide/components/slots.md

---------

Co-authored-by: Natalia Tepluhina <[email protected]>
Bumps [vue](https://github.com/vuejs/core) from 3.4.26 to 3.4.27.
- [Release notes](https://github.com/vuejs/core/releases)
- [Changelog](https://github.com/vuejs/core/blob/main/CHANGELOG.md)
- [Commits](vuejs/core@v3.4.26...v3.4.27)

---
updated-dependencies:
- dependency-name: vue
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Domain csstriggers.com was dropped (2022 Aug 27). Need to remove.
Add style attribute in Dynamically Binding Multiple Attributes
Fix comma splice. This sentence should be two.
…2865)

* docs: Correct browser language for Playwright and Cypress

I was going through the testing section in preparation for teaching my Vitest workshop @ VueConf and noticed outdated information about browser support WRT Playwright + Cypress.

* typo
Update testing.md

1. Remove dead playwright read more link - https://playwright.dev/docs/why-playwright
2. Added info text from https://playwright.dev/docs/intro#introduction

Co-authored-by: Natalia Tepluhina <[email protected]>
* feat(playground): update codesandbox link

* fix(playground): update component.studio link

* fix(playground): revert component.studio link
# Conflicts:
#	README.md
#	package.json
#	pnpm-lock.yaml
#	src/api/sfc-spec.md
#	src/guide/built-ins/transition.md
#	src/guide/components/slots.md
#	src/guide/reusability/custom-directives.md
#	src/guide/scaling-up/testing.md
#	src/translations/index.md
@wxsms wxsms added 从英文版同步 请使用 merge commit 合并 从 upstream 同步的 PR 需保留 git 历史记录 labels May 23, 2024
Copy link

vercel bot commented May 23, 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 Jun 3, 2024 9:09am

package.json Show resolved Hide resolved
@Jinjiang Jinjiang marked this pull request as draft May 23, 2024 02:31
@Jinjiang Jinjiang marked this pull request as ready for review June 3, 2024 02:48
@Justineo Justineo merged commit df855ac into main Jun 30, 2024
7 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.