docs: fix merge

yushuailiu · Oct 25, 2018 · 032b72d · 032b72d
2 parents 05750e1 + 5b6868d
commit 032b72d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/_site/documents/release.html b/_site/documents/release.html
@@ -2,8 +2,7 @@
       <div class="icon">&#xf0fd;</div>
       <input type="text" class="input js-input" placeholder="搜索" />
       <div class="m-search-result js-search-result"></div>
-    </div></div><nav class="m-header-nav js-nav"><ul class="m-header-items"><li class="item active"><a class="href" href="index.html">文档</a></li><li class="item "><a class="href" href="../plugin/index.html">插件</a></li><li class="item "><a class="href" href="../theme/index.html">主题</a></li><li class="item "><a class="href" href="../examples/index.html">示例 Demo</a></li><li class="item "><span class="href">规范</span><ul class="m-header-subtitle"><li class="item"><a href="../standard/style-guide.html" class="link">设计规范</a></li><li class="item"><a href="../standard/index.html" class="link">文档规范</a></li></ul></li></ul></nav><div id="js-nav-btn" class="m-header-btn ui-font-ydoc"></div></header><div class="m-content" id="js-content"><div id="markdown-body" class="m-content-container markdown-body"><!-- ## 新 YDoc v4.0.0 版本发布啦！ 🎉🎉🎉 -->
-<h3 id="v4.1.0-2018.10.10">v4.1.0 (2018.10.10)</h3>
+    </div></div><nav class="m-header-nav js-nav"><ul class="m-header-items"><li class="item active"><a class="href" href="index.html">文档</a></li><li class="item "><a class="href" href="../plugin/index.html">插件</a></li><li class="item "><a class="href" href="../theme/index.html">主题</a></li><li class="item "><a class="href" href="../examples/index.html">示例 Demo</a></li><li class="item "><span class="href">规范</span><ul class="m-header-subtitle"><li class="item"><a href="../standard/style-guide.html" class="link">设计规范</a></li><li class="item"><a href="../standard/index.html" class="link">文档规范</a></li></ul></li></ul></nav><div id="js-nav-btn" class="m-header-btn ui-font-ydoc"></div></header><div class="m-content" id="js-content"><div id="markdown-body" class="m-content-container markdown-body"><h3 id="v4.1.0-2018.10.10">v4.1.0 (2018.10.10)</h3>
 <ul>
 <li>主题功能优化，定制更方便</li>
 <li>样式优化，优化 markdown 阅读体验</li>

diff --git a/docs/documents/release.md b/docs/documents/release.md
@@ -1,4 +1,3 @@
-<!-- ## 新 YDoc v4.0.0 版本发布啦！ 🎉🎉🎉 -->
 ### v4.1.0 (2018.10.10)
 - 主题功能优化，定制更方便
 - 样式优化，优化 markdown 阅读体验

diff --git a/src/init/index.jsx b/src/init/index.jsx
@@ -5,7 +5,7 @@ banner:
   btns: 
     - { name: '开 始', href: './documents/index.html', primary: true }
     - { name: 'Github >', href: 'https://github.com/YMFE/ydoc' }
-  caption: '当前版本: v4.1.0'
+  caption: '当前版本: v4.0.3'
 features: 
   - { name: '优雅', desc: '经过精雕细琢，我们带给大家一个精心设计的、拥有卓越的视觉与交互体验的文档构建工具' }
   - { name: '灵动', desc: '我们拥有非常灵活的 插件机制 与 主题定制 功能，正在努力构建活跃的插件社区。也许初次使用未见其惊艳，但当你灵活使用插件后便会发现她的强大' }