Skip to content

Commit

Permalink
Merge pull request #66 from gaoyoubo/v1.3.1
Browse files Browse the repository at this point in the history
bugfix
  • Loading branch information
gaoyoubo authored Aug 12, 2019
2 parents dd5b8f4 + 1f6d984 commit ca9933c
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 11 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "hexo-client",
"version": "1.3.0",
"version": "1.3.1",
"private": true,
"description": "A cross-platform hexo client, build on electron.",
"author": {
Expand Down
17 changes: 8 additions & 9 deletions src/components/TreeNav.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
<div class="toggle" :class="{open: open, close: !open}" @click="toggle">
<i class="iconfont" :class="{'icon-arrow-left': open, 'icon-arrow-right': !open}" style="font-size:24px;"></i>
</div>
<div ref="collapse" class="collapse" :style="{width: open ? '200px' : '0px'}">
<!-- <div ref="collapse" class="collapse" :style="{width: open ? '200px' : '0px'}"> -->
<div ref="collapse" class="collapse" :class="{'active': open}">
<div class="tool-box" :style="{height: toolboxHeight}">
<el-button icon="el-icon-edit" type="info" size="small" @click="createPost" circle></el-button>
<el-button icon="el-icon-search" type="primary" size="small" @click="search" circle></el-button>
Expand Down Expand Up @@ -107,10 +108,7 @@
}
</script>

<style scoped>
.tag-tree {
}
<style lang="scss" scoped>
.toggle {
position: absolute;
z-index: 999;
Expand All @@ -133,11 +131,12 @@
}
.collapse {
display: none;
width: 200px;
-webkit-transition: width 0.3s;
-moz-transition: width 0.3s;
-o-transition: width 0.3s;
transition: width 0.3s;
&.active{
display: block;
}
}
.tool-box {
Expand Down
2 changes: 1 addition & 1 deletion src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import i18n from './plugins/i18n'

Vue.config.productionTip = false

window.appVersion = 'v1.2.9' // 当前版本号
window.appVersion = 'v1.3.1' // 当前版本号

new Vue({
router,
Expand Down

0 comments on commit ca9933c

Please sign in to comment.