Skip to content

Commit 70a2baf

Browse files
committed
docs(en): merging all conflicts
2 parents aad0688 + d96eedd commit 70a2baf

File tree

4 files changed

+27
-0
lines changed

4 files changed

+27
-0
lines changed

.vitepress/theme/custom.css

+11
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
--docsearch-primary-color: var(--c-brand) !important;
3030
}
3131

32+
<<<<<<< HEAD
3233
/* docs-cn specific */
3334
.cn-footnote {
3435
margin-top: 20px;
@@ -50,4 +51,14 @@
5051
background: var(--c-brand);
5152
color: white;
5253
border-radius: 10px;
54+
=======
55+
#play-vite-audio {
56+
padding: 0;
57+
margin-left: 5px;
58+
display: inline-flex;
59+
}
60+
61+
#play-vite-audio img {
62+
opacity: 0.8;
63+
>>>>>>> d96eedda424e990e80175317b34621b3599fd20e
5364
}

guide/index.md

+10
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
11
# 开始 {#getting-started}
22

3+
<<<<<<< HEAD
34
## 总览 {#overview}
45

56
Vite (法语意为 "快速的",发音 `/vit/`) 是一种新型前端构建工具,能够显著提升前端开发体验。它主要由两部分组成:
7+
=======
8+
<audio id="vite-audio">
9+
<source src="/vite.mp3" type="audio/mpeg">
10+
</audio>
11+
12+
## Overview
13+
14+
Vite (French word for "fast", pronounced `/vit/`<button id="play-vite-audio" onclick="document.getElementById('vite-audio').play();"><img src="/voice.svg" height="15"></button>) is a build tool that aims to provide a faster and leaner development experience for modern web projects. It consists of two major parts:
15+
>>>>>>> d96eedda424e990e80175317b34621b3599fd20e
616
717
- 一个开发服务器,它基于 [原生 ES 模块](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Modules) 提供了 [丰富的内建功能](./features),如速度快到惊人的 [模块热更新(HMR)](./features#hot-module-replacement)
818

public/vite.mp3

3 KB
Binary file not shown.

public/voice.svg

+6
Loading

0 commit comments

Comments
 (0)