Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: windicss/docs-cn
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: windicss/docs-cn
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: sync-13d6adad
Choose a head ref
  • 1 commit
  • 86 files changed
  • 1 contributor

Commits on Jun 21, 2022

  1. Copy the full SHA
    0913a80 View commit details
Showing with 1,531 additions and 165 deletions.
  1. +103 −0 .vitepress/config/nav.ts
  2. +104 −0 .vitepress/config/sidebar.ts
  3. +4 −0 editors/webstorm.md
  4. +9 −0 features/analyzer.md
  5. +10 −2 features/attributify.md
  6. +10 −0 features/dark-mode.md
  7. +4 −0 features/directives.md
  8. +5 −1 features/responsive-design.md
  9. +4 −0 features/shortcuts.md
  10. +12 −0 features/value-auto-infer.md
  11. +1 −1 features/variant-groups.md
  12. +7 −0 guide/configuration.md
  13. +5 −0 guide/extractions.md
  14. +4 −0 guide/index.md
  15. +2 −2 guide/installation.md
  16. +6 −0 guide/migration.md
  17. +5 −1 index.md
  18. +32 −2 integrations/cli.md
  19. +11 −1 integrations/gridsome.md
  20. +29 −0 integrations/javascript.md
  21. +9 −1 integrations/nuxt.md
  22. +8 −0 integrations/rollup.md
  23. +16 −0 integrations/svelte.md
  24. +27 −3 integrations/vite.md
  25. +16 −0 integrations/vue-cli.md
  26. +28 −0 integrations/webpack.md
  27. +5 −0 plugins/community/animations.md
  28. +4 −0 plugins/community/heropatterns.md
  29. +0 −1 plugins/index.md
  30. +0 −1 plugins/official/aspect-ratio.md
  31. +30 −0 plugins/official/scroll-snap.md
  32. +10 −1 plugins/official/typography.md
  33. +1 −1 plugins/transform.md
  34. +0 −1 posts/api.md
  35. +111 −111 posts/attributify.md
  36. +17 −4 posts/language.md
  37. +1 −1 posts/plugin.md
  38. +21 −0 posts/story.md
  39. +27 −1 posts/v22.md
  40. +7 −3 posts/v24.md
  41. +3 −3 posts/v30-utilities.md
  42. +9 −9 posts/v30.md
  43. +91 −1 posts/v34.md
  44. +8 −0 utilities/accessibility/screen-readers.md
  45. +8 −0 utilities/animations/animation.md
  46. +4 −0 utilities/animations/transforms.md
  47. +4 −0 utilities/animations/transitions.md
  48. +4 −0 utilities/backgrounds/background-blend-mode.md
  49. +4 −0 utilities/backgrounds/background.md
  50. +16 −0 utilities/backgrounds/gradients.md
  51. +4 −0 utilities/behaviors/box-decoration-break.md
  52. +9 −0 utilities/behaviors/image-rendering.md
  53. +12 −0 utilities/behaviors/listings.md
  54. +4 −0 utilities/behaviors/overflow.md
  55. +14 −0 utilities/behaviors/overscroll-behavior.md
  56. +8 −0 utilities/behaviors/placeholder.md
  57. +5 −1 utilities/borders/border.md
  58. +23 −0 utilities/borders/divider.md
  59. +12 −0 utilities/borders/outline.md
  60. +20 −0 utilities/borders/ring.md
  61. +10 −0 utilities/effects/box-shadow.md
  62. +4 −0 utilities/effects/mix-blend-mode.md
  63. +4 −0 utilities/effects/opacity.md
  64. +12 −0 utilities/filters/backdrop-filter.md
  65. +40 −0 utilities/filters/filter.md
  66. +18 −0 utilities/general/colors.md
  67. +59 −0 utilities/general/typography.md
  68. +172 −0 utilities/general/variants.md
  69. +77 −0 utilities/index.md
  70. +5 −1 utilities/interactivity/accent-color.md
  71. +4 −0 utilities/interactivity/appearance.md
  72. +8 −0 utilities/interactivity/caret.md
  73. +4 −0 utilities/interactivity/cursor.md
  74. +4 −0 utilities/interactivity/pointer-events.md
  75. +6 −0 utilities/interactivity/resize.md
  76. +5 −1 utilities/interactivity/scroll-behavior.md
  77. +9 −1 utilities/interactivity/touch-action.md
  78. +5 −1 utilities/interactivity/user-select.md
  79. +5 −1 utilities/interactivity/will-change.md
  80. +8 −1 utilities/layout/aspect-ratio.md
  81. +4 −0 utilities/layout/columns.md
  82. +44 −1 utilities/layout/display.md
  83. +27 −0 utilities/layout/flexbox.md
  84. +0 −4 utilities/layout/grid.md
  85. +12 −0 utilities/layout/positioning.md
  86. +18 −1 utilities/layout/tables.md
103 changes: 103 additions & 0 deletions .vitepress/config/nav.ts
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@ import type { DefaultTheme } from '@/config'

export const nav: DefaultTheme.Config['nav'] = [
{
<<<<<<< HEAD
text: '指引',
items: [
{ text: '开始', link: '/guide/' },
@@ -25,6 +26,31 @@ export const nav: DefaultTheme.Config['nav'] = [
{ text: '可视化分析器', link: '/features/analyzer' },

{ text: '集成', link: 'separator' },
=======
text: 'Overview',
items: [
{ text: 'Getting Started', link: '/guide/' },
{ text: 'Installation', link: '/guide/installation' },
{ text: 'Configuration', link: '/guide/configuration' },
{ text: 'Extractions', link: '/guide/extractions' },
{ text: 'Migration', link: '/guide/migration' },

{ text: 'Features', link: 'separator' },

{ text: 'Overview', link: '/features/' },
{ text: 'Value Auto-infer', link: '/features/value-auto-infer' },
{ text: 'Variant Groups', link: '/features/variant-groups' },
{ text: 'Shortcuts', link: '/features/shortcuts' },
{ text: 'Responsive Design', link: '/features/responsive-design' },
{ text: 'Dark Mode', link: '/features/dark-mode' },
{ text: 'RTL', link: '/features/rtl' },
{ text: 'Important Prefix', link: '/features/important-prefix' },
{ text: 'Directives', link: '/features/directives' },
{ text: 'Attributify Mode', link: '/features/attributify' },
{ text: 'Visual Analyzer', link: '/features/analyzer' },

{ text: 'Integrations', link: 'separator' },
>>>>>>> 13d6adadd92e29a2e95912f8dec0214b82eba237

{ text: 'Vite', link: '/integrations/vite' },
{ text: 'Webpack', link: '/integrations/webpack' },
@@ -44,6 +70,7 @@ export const nav: DefaultTheme.Config['nav'] = [
text: '工具类',
items: [
// General
<<<<<<< HEAD
{ text: '颜色', link: '/utilities/general/colors' },
{ text: '排版', link: '/utilities/general/typography' },
{ text: 'SVG', link: '/utilities/general/svg' },
@@ -56,20 +83,42 @@ export const nav: DefaultTheme.Config['nav'] = [
{ text: '屏幕阅读器', link: '/utilities/accessibility/screen-readers' },

{ text: '动画', link: 'separator' },
=======
{ text: 'Colors', link: '/utilities/general/colors' },
{ text: 'Typography', link: '/utilities/general/typography' },
{ text: 'SVG', link: '/utilities/general/svg' },
{ text: 'Variants', link: '/utilities/general/variants' },
// { text: 'Variables', link: '/utilities/variables' },

{ text: 'Accessibility', link: 'separator' },

// Accessibility
{ text: 'Screen Readers', link: '/utilities/accessibility/screen-readers' },

{ text: 'Animations', link: 'separator' },
>>>>>>> 13d6adadd92e29a2e95912f8dec0214b82eba237

// Animations
{ text: 'Animation', link: '/utilities/animations/animation' },
{ text: 'Transforms', link: '/utilities/animations/transforms' },
{ text: 'Transitions', link: '/utilities/animations/transitions' },

<<<<<<< HEAD
{ text: '背景', link: 'separator' },
=======
{ text: 'Backgrounds', link: 'separator' },
>>>>>>> 13d6adadd92e29a2e95912f8dec0214b82eba237

// Backrounds
{ text: 'Background', link: '/utilities/backgrounds/background' },
{ text: 'Gradients', link: '/utilities/backgrounds/gradients' },
{ text: 'Background Blend Mode', link: '/utilities/backgrounds/background-blend-mode' },

<<<<<<< HEAD
{ text: '行为', link: 'separator' },
=======
{ text: 'Behaviors', link: 'separator' },
>>>>>>> 13d6adadd92e29a2e95912f8dec0214b82eba237

// Behaviors
{ text: 'Box Decoration Break', link: '/utilities/behaviors/box-decoration-break' },
@@ -79,6 +128,7 @@ export const nav: DefaultTheme.Config['nav'] = [
{ text: 'Overscroll Behavior', link: '/utilities/behaviors/overscroll-behavior' },
{ text: 'Placeholder', link: '/utilities/behaviors/placeholder' },

<<<<<<< HEAD
{ text: '边框', link: 'separator' },

// Borders
@@ -88,24 +138,44 @@ export const nav: DefaultTheme.Config['nav'] = [
{ text: '轮廓环', link: '/utilities/borders/ring' },

{ text: '特效', link: 'separator' },
=======
{ text: 'Borders', link: 'separator' },

// Borders
{ text: 'Border', link: '/utilities/borders/border' },
{ text: 'Divider', link: '/utilities/borders/divider' },
{ text: 'Outline', link: '/utilities/borders/outline' },
{ text: 'Ring', link: '/utilities/borders/ring' },

{ text: 'Effects', link: 'separator' },
>>>>>>> 13d6adadd92e29a2e95912f8dec0214b82eba237

// Effects
{ text: 'Box Shadow', link: '/utilities/effects/box-shadow' },
{ text: 'Opacity', link: '/utilities/effects/opacity' },
{ text: 'Mix Blend Mode', link: '/utilities/effects/mix-blend-mode' },

<<<<<<< HEAD
{ text: '过滤器', link: 'separator' },
=======
{ text: 'Filters', link: 'separator' },
>>>>>>> 13d6adadd92e29a2e95912f8dec0214b82eba237

// Filters
{ text: 'Filter', link: '/utilities/filters/filter' },
{ text: 'Backdrop Filter', link: '/utilities/filters/backdrop-filter' },

<<<<<<< HEAD
{ text: '互动', link: 'separator' },
=======
{ text: 'Interactivity', link: 'separator' },
>>>>>>> 13d6adadd92e29a2e95912f8dec0214b82eba237

// Interactivity
{ text: 'Accent Color', link: '/utilities/interactivity/accent-color' },
{ text: 'Appearance', link: '/utilities/interactivity/appearance' },
{ text: 'Cursor', link: '/utilities/interactivity/cursor' },
<<<<<<< HEAD
{ text: '插入符', link: '/utilities/interactivity/caret' },
{ text: '指针事件', link: '/utilities/interactivity/pointer-events' },
{ text: 'Resize', link: '/utilities/interactivity/resize' },
@@ -116,18 +186,40 @@ export const nav: DefaultTheme.Config['nav'] = [
{ text: 'Will Change', link: '/utilities/interactivity/will-change' },

{ text: '布局', link: 'separator' },
=======
{ text: 'Caret', link: '/utilities/interactivity/caret' },
{ text: 'Pointer Events', link: '/utilities/interactivity/pointer-events' },
{ text: 'Resize', link: '/utilities/interactivity/resize' },
{ text: 'Scroll Behavior', link: '/utilities/interactivity/scroll-behavior' },
// { text: 'Scroll Snap', link: '/utilities/interactivity/scroll-snap' },
{ text: 'Touch Action', link: '/utilities/interactivity/touch-action' },
{ text: 'User Select', link: '/utilities/interactivity/user-select' },
{ text: 'Will Change', link: '/utilities/interactivity/will-change' },

{ text: 'Layout', link: 'separator' },
>>>>>>> 13d6adadd92e29a2e95912f8dec0214b82eba237

// Layout
// { text: 'Aspect Ratio', link: '/utilities/layout/aspect-ratio' },
{ text: 'Columns', link: '/utilities/layout/columns' },
<<<<<<< HEAD
{ text: '容器', link: '/utilities/layout/container' },
=======
{ text: 'Container', link: '/utilities/layout/container' },
>>>>>>> 13d6adadd92e29a2e95912f8dec0214b82eba237
{ text: 'Display', link: '/utilities/layout/display' },
{ text: 'Flexbox', link: '/utilities/layout/flexbox' },
{ text: 'Grid', link: '/utilities/layout/grid' },
{ text: 'Positioning', link: '/utilities/layout/positioning' },
<<<<<<< HEAD
{ text: '尺寸', link: '/utilities/layout/sizing' },
{ text: '间隔', link: '/utilities/layout/spacing' },
{ text: '表格', link: '/utilities/layout/tables' },
=======
{ text: 'Sizing', link: '/utilities/layout/sizing' },
{ text: 'Spacing', link: '/utilities/layout/spacing' },
{ text: 'Tables', link: '/utilities/layout/tables' },
>>>>>>> 13d6adadd92e29a2e95912f8dec0214b82eba237
],
},
{
@@ -167,6 +259,7 @@ export const nav: DefaultTheme.Config['nav'] = [
text: '文章',
items: [
// { text: 'API', link: '/posts/api' },
<<<<<<< HEAD
{ text: 'WindiCSS 的故事', link: '/posts/story' },
{ text: 'WindiCSS v2.2 现已推出', link: '/posts/v22' },
{ text: '从 v2.2 到 v2.4', link: '/posts/v24' },
@@ -175,6 +268,16 @@ export const nav: DefaultTheme.Config['nav'] = [
{ text: '扩展中的新特性', link: '/posts/extension-updates' },
{ text: 'v3.1 带来的新功能', link: '/posts/v31' },
{ text: 'v3.4 带来的新功能', link: '/posts/v34' },
=======
{ text: 'The Story of WindiCSS', link: '/posts/story' },
{ text: 'WindiCSS v2.2 is here', link: '/posts/v22' },
{ text: 'From v2.2 to v2.4', link: '/posts/v24' },
{ text: 'WindiCSS v3.0 now in Beta', link: '/posts/v30' },
{ text: 'Recent changes (v30-v35)', link: '/posts/v30-5' },
{ text: 'What\'s new in extension?', link: '/posts/extension-updates' },
{ text: 'New Features In v3.1', link: '/posts/v31' },
{ text: 'New Features In v3.4', link: '/posts/v34' },
>>>>>>> 13d6adadd92e29a2e95912f8dec0214b82eba237

{ text: 'separator', link: 'separator' },

104 changes: 104 additions & 0 deletions .vitepress/config/sidebar.ts
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@ export const sidebar: DefaultTheme.Config['sidebar'] = {
{
text: '通用',
children: [
<<<<<<< HEAD
{ text: '颜色', link: '/utilities/general/colors' },
{ text: '排版', link: '/utilities/general/typography' },
{ text: 'SVG', link: '/utilities/general/svg' },
@@ -16,11 +17,92 @@ export const sidebar: DefaultTheme.Config['sidebar'] = {
text: '可访问性',
children: [
{ text: '屏幕阅读器', link: '/utilities/accessibility/screen-readers' },
=======
{ text: 'Colors', link: '/utilities/general/colors' },
{ text: 'Typography', link: '/utilities/general/typography' },
{ text: 'SVG', link: '/utilities/general/svg' },
{ text: 'Variants', link: '/utilities/general/variants' },
// { text: 'Variables', link: '/utilities/general/variables' },
],
},
{
text: 'Accessibility',
children: [
{ text: 'Screen Readers', link: '/utilities/accessibility/screen-readers' },
],
},
{
text: 'Animations',
children: [
{ text: 'Animation', link: '/utilities/animations/animation' },
{ text: 'Transforms', link: '/utilities/animations/transforms' },
{ text: 'Transitions', link: '/utilities/animations/transitions' },
],
},
{
text: 'Backgrounds',
children: [
{ text: 'Background', link: '/utilities/backgrounds/background' },
{ text: 'Gradients', link: '/utilities/backgrounds/gradients' },
{ text: 'Background Blend Mode', link: '/utilities/backgrounds/background-blend-mode' },
],
},
{
text: 'Behaviors',
children: [
{ text: 'Box Decoration Break', link: '/utilities/behaviors/box-decoration-break' },
{ text: 'Image Rendering', link: '/utilities/behaviors/image-rendering' },
{ text: 'Listings', link: '/utilities/behaviors/listings' },
{ text: 'Overflow', link: '/utilities/behaviors/overflow' },
{ text: 'Overscroll Behavior', link: '/utilities/behaviors/overscroll-behavior' },
{ text: 'Placeholder', link: '/utilities/behaviors/placeholder' },
],
},
{
text: 'Borders',
children: [
{ text: 'Border', link: '/utilities/borders/border' },
{ text: 'Divider', link: '/utilities/borders/divider' },
{ text: 'Outline', link: '/utilities/borders/outline' },
{ text: 'Ring', link: '/utilities/borders/ring' },
],
},
{
text: 'Effects',
children: [
{ text: 'Box Shadow', link: '/utilities/effects/box-shadow' },
{ text: 'Opacity', link: '/utilities/effects/opacity' },
{ text: 'Mix Blend Mode', link: '/utilities/effects/mix-blend-mode' },
],
},
{
text: 'Filters',
children: [
{ text: 'Filter', link: '/utilities/filters/filter' },
{ text: 'Backdrop Filter', link: '/utilities/filters/backdrop-filter' },
],
},
{
text: 'Interactivity',
children: [
{ text: 'Accent Color', link: '/utilities/interactivity/accent-color' },
{ text: 'Appearance', link: '/utilities/interactivity/appearance' },
{ text: 'Cursor', link: '/utilities/interactivity/cursor' },
{ text: 'Caret', link: '/utilities/interactivity/caret' },
{ text: 'Pointer Events', link: '/utilities/interactivity/pointer-events' },
{ text: 'Resize', link: '/utilities/interactivity/resize' },
{ text: 'Scroll Behavior', link: '/utilities/interactivity/scroll-behavior' },
// { text: 'Scroll Snap', link: '/utilities/interactivity/scroll-snap' },
{ text: 'Touch Action', link: '/utilities/interactivity/touch-action' },
{ text: 'User Select', link: '/utilities/interactivity/user-select' },
{ text: 'Will Change', link: '/utilities/interactivity/will-change' },
>>>>>>> 13d6adadd92e29a2e95912f8dec0214b82eba237
],
},
{
text: '动画',
children: [
<<<<<<< HEAD
{ text: 'Animation', link: '/utilities/animations/animation' },
{ text: 'Transforms', link: '/utilities/animations/transforms' },
{ text: 'Transitions', link: '/utilities/animations/transitions' },
@@ -91,13 +173,24 @@ export const sidebar: DefaultTheme.Config['sidebar'] = {
// { text: 'Aspect Ratio', link: '/utilities/layout/aspect-ratio' },
{ text: 'Columns', link: '/utilities/layout/columns' },
{ text: '容器', link: '/utilities/layout/container' },
=======
// { text: 'Aspect Ratio', link: '/utilities/layout/aspect-ratio' },
{ text: 'Columns', link: '/utilities/layout/columns' },
{ text: 'Container', link: '/utilities/layout/container' },
>>>>>>> 13d6adadd92e29a2e95912f8dec0214b82eba237
{ text: 'Display', link: '/utilities/layout/display' },
{ text: 'Flexbox', link: '/utilities/layout/flexbox' },
{ text: 'Grid', link: '/utilities/layout/grid' },
{ text: 'Positioning', link: '/utilities/layout/positioning' },
<<<<<<< HEAD
{ text: '尺寸', link: '/utilities/layout/sizing' },
{ text: '间隔', link: '/utilities/layout/spacing' },
{ text: '表格', link: '/utilities/layout/tables' },
=======
{ text: 'Sizing', link: '/utilities/layout/sizing' },
{ text: 'Spacing', link: '/utilities/layout/spacing' },
{ text: 'Tables', link: '/utilities/layout/tables' },
>>>>>>> 13d6adadd92e29a2e95912f8dec0214b82eba237
],
},
],
@@ -136,6 +229,7 @@ export const sidebar: DefaultTheme.Config['sidebar'] = {
text: '发布',
children: [
// { text: 'API', link: '/posts/api' },
<<<<<<< HEAD
{ text: 'WindiCSS 的故事', link: '/posts/story' },
{ text: 'WindiCSS v2.2 现已推出', link: '/posts/v22' },
{ text: '从 v2.2 到 v2.4', link: '/posts/v24' },
@@ -144,6 +238,16 @@ export const sidebar: DefaultTheme.Config['sidebar'] = {
{ text: '扩展中的新特性', link: '/posts/extension-updates' },
{ text: 'v3.1 带来的新功能', link: '/posts/v31' },
{ text: 'v3.4 带来的新功能', link: '/posts/v34' },
=======
{ text: 'The Story of WindiCSS', link: '/posts/story' },
{ text: 'Windi CSS v2.2 is here', link: '/posts/v22' },
{ text: 'From v2.2 to v2.4', link: '/posts/v24' },
{ text: 'WindiCSS v3 now in beta', link: '/posts/v30' },
{ text: 'Recent changes (v30-v35)', link: '/posts/v30-5' },
{ text: 'What\'s new in extension?', link: '/posts/extension-updates' },
{ text: 'New Features In v3.1', link: '/posts/v31' },
{ text: 'New Features In v3.4', link: '/posts/v34' },
>>>>>>> 13d6adadd92e29a2e95912f8dec0214b82eba237
],
},
{
4 changes: 4 additions & 0 deletions editors/webstorm.md
Original file line number Diff line number Diff line change
@@ -2,6 +2,10 @@

# WebStorm Intellisense {#webstorm-intellisense}

<<<<<<< HEAD
WebStorm 的支持已在我们的计划中,但我们目前没有足够的精力来实现它。
=======
The support for WebStorm is on our roadmap, but the we haven't get enough bandwidth to working on it yet.
>>>>>>> 13d6adadd92e29a2e95912f8dec0214b82eba237
通过 [点赞这条评论](https://github.com/windicss/windicss/discussions/136#discussioncomment-557097) 加入候补名单。谢啦~
9 changes: 9 additions & 0 deletions features/analyzer.md
Original file line number Diff line number Diff line change
@@ -14,7 +14,11 @@
npx windicss-analysis
```

<<<<<<< HEAD
分析报告将可在 `http://localhost:8113/` 获取
=======
The analysis report will be available at `http://localhost:8113/`
>>>>>>> 13d6adadd92e29a2e95912f8dec0214b82eba237
### NPM {#npm}

@@ -43,7 +47,12 @@ npm i -D windicss-analysis

### 在线预览 {#online-preview}

<<<<<<< HEAD
你可以在分析器里看到分析报告的预览
=======
You can preview the report of the analyser itself at
[analysis-demo.windicss.org](http://analysis-demo.windicss.org)
>>>>>>> 13d6adadd92e29a2e95912f8dec0214b82eba237
[分析报告示例](http://analysis-demo.windicss.org)

Loading