Merge pull request #160 from phachon/feature/v0.1.8

Feature/v0.1.8
phachon · Apr 12, 2020 · 1ea7fcf · 1ea7fcf
2 parents 2f67bfb + 95ad0fd
commit 1ea7fcf
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,34 @@
 # 更新日志：
 
+## v0.1.8（2020-04）
+
+### Fix Bug & Add Feature
+#### 修复bug
+1. 修复版本号问题
+2. 首页和登录页面自适应
+
+#### 新增功能
+1. 增加在线部署网站
+2. 增加文档移动排序支持
+3. 增加目录大纲显示
+4. 首页最近文档过滤掉无权限的空间文档
+5. 一些样式调整
+6. 增加 docker 支持
+
+### 升级（Upgrade）
+1. 下载新版本到部署该项目的根目录
+2. 覆盖解压 (tar -zxvf mm-wiki-v0.1.8-linux-amd64.tar.gz)
+3. 执行升级命令
+```
+./mm-wiki --conf conf/mm-wiki.conf --upgrade
+```
+3. 重新启动
+```
+./mm-wiki --conf conf/mm-wiki.conf
+```
+### 感谢
+特别感谢 [@eahomliu](https://github.com/eahomliu) [@cifaz](https://github.com/cifaz) [@cxgreat2014](https://github.com/cxgreat2014) 几位贡献 PR
+
 ## v0.1.7（2020-02）
 
 ### Fix Bug & Add Feature

diff --git a/static/css/common.css b/static/css/common.css
@@ -534,7 +534,9 @@ mark {
 }
 
 .dir-preview-btn:hover {
-    background: red;
+    /*background: red;*/
+    background: #337ab7;
+    border-color: #2e6da4;
     cursor: pointer;
     color: #FFFFFF;
     font-weight: bold;

diff --git a/views/author/login.html b/views/author/login.html
@@ -64,7 +64,7 @@
     <div class="copyright">
         © {{.copyright}}
         &nbsp;<i class="glyphicon glyphicon-hand-right"></i>
-        <a style="color: #d8d8d8;" target="_blank" href="https://github.com/phachon/MM-Wiki">MM-Wiki Version {{.version}}</a>
+        <a style="color: gray;" target="_blank" href="https://github.com/phachon/MM-Wiki">MM-Wiki Version {{.version}}</a>
     </div>
 </div>
 

diff --git a/views/layouts/header.html b/views/layouts/header.html
@@ -21,18 +21,15 @@
                 </ul>
                 <form class="navbar-form navbar-left visible-md visible-lg" action="#" method="post">
                     <div class="form-group has-feedback">
-                        {{/*<i class="glyphicon glyphicon-search form-control-feedback" style="line-height: 32px;"></i>*/}}
-                        <div class="input-group input-group-sm">
+                        <div class="input-group input-group-sm" style="width: 320px">
                             <input class="form-control input-sm" name="keyword" type="text" onkeydown="KeyDown('#search_btn')" placeholder="请输入关键字搜索...">
-                            <span class="input-group-btn">
+                            <span class="input-group-btn" style="width: 30px">
                                 <button class="btn btn-primary" type="button" name="search" id="search_btn" onclick="mainSearch(this.form, '/main/search')"><i class="fa fa-search"></i></button>
                             </span>
                         </div>
-                        {{/*<input class="form-control input-sm" type="text" placeholder="输入文档名搜索..." style="padding-right: 28px;width: 280px">*/}}
                     </div>
                     &nbsp;
                     <div class="btn-group btn-group-sm" role="group">
-                        {{/*<button type="button" class="btn btn-primary"><i class="glyphicon glyphicon-fullscreen"></i></button>*/}}
                         <button type="button" onclick="layoutToggle()" class="btn btn-primary"><i class="fa fa-columns"></i></button>
                     </div>
                 </form>