Skip to content

Commit 1ea7fcf

Browse files
authored
Merge pull request #160 from phachon/feature/v0.1.8
Feature/v0.1.8
2 parents 2f67bfb + 95ad0fd commit 1ea7fcf

File tree

4 files changed

+35
-7
lines changed

4 files changed

+35
-7
lines changed

CHANGELOG.md

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,34 @@
11
# 更新日志:
22

3+
## v0.1.8(2020-04)
4+
5+
### Fix Bug & Add Feature
6+
#### 修复bug
7+
1. 修复版本号问题
8+
2. 首页和登录页面自适应
9+
10+
#### 新增功能
11+
1. 增加在线部署网站
12+
2. 增加文档移动排序支持
13+
3. 增加目录大纲显示
14+
4. 首页最近文档过滤掉无权限的空间文档
15+
5. 一些样式调整
16+
6. 增加 docker 支持
17+
18+
### 升级(Upgrade)
19+
1. 下载新版本到部署该项目的根目录
20+
2. 覆盖解压 (tar -zxvf mm-wiki-v0.1.8-linux-amd64.tar.gz)
21+
3. 执行升级命令
22+
```
23+
./mm-wiki --conf conf/mm-wiki.conf --upgrade
24+
```
25+
3. 重新启动
26+
```
27+
./mm-wiki --conf conf/mm-wiki.conf
28+
```
29+
### 感谢
30+
特别感谢 [@eahomliu](https://github.com/eahomliu) [@cifaz](https://github.com/cifaz) [@cxgreat2014](https://github.com/cxgreat2014) 几位贡献 PR
31+
332
## v0.1.7(2020-02)
433

534
### Fix Bug & Add Feature

static/css/common.css

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,9 @@ mark {
534534
}
535535

536536
.dir-preview-btn:hover {
537-
background: red;
537+
/*background: red;*/
538+
background: #337ab7;
539+
border-color: #2e6da4;
538540
cursor: pointer;
539541
color: #FFFFFF;
540542
font-weight: bold;

views/author/login.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<div class="copyright">
6565
© {{.copyright}}
6666
&nbsp;<i class="glyphicon glyphicon-hand-right"></i>
67-
<a style="color: #d8d8d8;" target="_blank" href="https://github.com/phachon/MM-Wiki">MM-Wiki Version {{.version}}</a>
67+
<a style="color: gray;" target="_blank" href="https://github.com/phachon/MM-Wiki">MM-Wiki Version {{.version}}</a>
6868
</div>
6969
</div>
7070

views/layouts/header.html

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,15 @@
2121
</ul>
2222
<form class="navbar-form navbar-left visible-md visible-lg" action="#" method="post">
2323
<div class="form-group has-feedback">
24-
{{/*<i class="glyphicon glyphicon-search form-control-feedback" style="line-height: 32px;"></i>*/}}
25-
<div class="input-group input-group-sm">
24+
<div class="input-group input-group-sm" style="width: 320px">
2625
<input class="form-control input-sm" name="keyword" type="text" onkeydown="KeyDown('#search_btn')" placeholder="请输入关键字搜索...">
27-
<span class="input-group-btn">
26+
<span class="input-group-btn" style="width: 30px">
2827
<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>
2928
</span>
3029
</div>
31-
{{/*<input class="form-control input-sm" type="text" placeholder="输入文档名搜索..." style="padding-right: 28px;width: 280px">*/}}
3230
</div>
3331
&nbsp;
3432
<div class="btn-group btn-group-sm" role="group">
35-
{{/*<button type="button" class="btn btn-primary"><i class="glyphicon glyphicon-fullscreen"></i></button>*/}}
3633
<button type="button" onclick="layoutToggle()" class="btn btn-primary"><i class="fa fa-columns"></i></button>
3734
</div>
3835
</form>

0 commit comments

Comments
 (0)