-
Notifications
You must be signed in to change notification settings - Fork 17
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
docs(en): merge docs/main into docs-cn/main @ 3f17e707 #96
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
@@ -133,9 +133,16 @@ export const sidebar: DefaultTheme.Config['sidebar'] = { | |||
{ text: '响应式设计', link: '/features/responsive-design' }, | |||
{ text: '暗色模式', link: '/features/dark-mode' }, | |||
{ text: 'RTL', link: '/features/rtl' }, | |||
<<<<<<< HEAD |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🚫 [eslint] reported by reviewdog 🐶
Parsing error: Merge conflict marker encountered.
HerbertHe
pushed a commit
to HerbertHe/docs-cn
that referenced
this pull request
Oct 30, 2021
* refactor: next version * feat: rwd support * WIP: adapt playground to new site * refactor: migrate playground * chore: fix vue import * feat: add not found page * fix: page layout in not full height * fix: not found layout in mobile * chore: ignore readme * chore: apply linter * chore: add transition * fix: table style * chore: update component type * fix: dropdown menu in ssr mode * chore: adjest inline code text size * chore: unifi colors * chore: ignore components.d.ts * chore: delete components.d.ts * fix: sidebar toggle in ssr mode * fix: next and prev links layout in mobile size * chore: padding of tree links in sidebar * chore: set to max width * chore: add prose a hover underline * fix: remap title level * chore: title author font-size * chore: apply new linter rules * feat: rander code block filename * chore: add box-shadow to code block * chore: move dropdown class to navlink * chore: change toc height * chore: code block filename * chore: code block filename text color * fix: double underline * chore: remap title level * chore: animate dropdown icon * chore: update deps * chore: remap title level * fix: windows build * fix: windows build * fix: next and prev link flex flow * fix: remove prose img margin * chore: change menu to font-normal * chore: remove space * chore: reset search box top * feat: use web component in playground preview 😎 * chore: upgrade to new version of mitt * chore: cleanup * fix: scrolling issue * chore: use css vars in background * refactor: upgrade to vue 3.1.4, update deps * fix: playground viewport & replace group variant, close windicss#100 * fix: remove space in code block filename * refactor: remove vue global helper functions, update deps * fix: move to code block filename * refactor: move filename to filename block * fix: parser error in svelte docs code block * fix: replace deplicate key * chore: code block filename * chore: update deps * fix: playground url share not works * fix: playground action button toggle * chore: update deps * fix: lock vite version * feat: apply new eslint rules
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
此 PR 自动生成。
合并 windicss/docs 的修改至本仓库(@ 3f17e70)
以下文件存在冲突,可能需要重新翻译:
请解决所有冲突后提交到此 pull request,可直接在 Github 修改、切换到 sync-3f17e707 分支进行修改或者使用 Github Desktop 拉取此 pr 修改并提交。
禁止使用 Squash Merge 来合并此 Pull Request!
使用该操作会导致上游仓库的内容丢失,并致使下一次合并产生冲突。