Merge branch 'master' into develop

This commit is contained in:
purocean
2019-02-17 18:04:36 +08:00
+7 -2
View File
@@ -7,8 +7,8 @@
</header>
<div style="display: flex; justify-content: space-between;" :class="{'show-view': showView}">
<Tree ref="tree" class="tree" v-model="file"></Tree>
<div style="display: flex;flex-direction: column; height: 95vh">
<div style="display: flex;height: 100%">
<div class="content" style="flex-direction: column;">
<div class="content">
<Editor
ref="editor"
class="editor"
@@ -289,6 +289,11 @@ export default {
box-sizing: border-box;
display: none;
}
.content {
display: flex;
height: 95vh;
}
}
@media (max-width: 767px) {