Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
* develop:
  代码优化
  优化笔记页面代码
  优化代码
  • Loading branch information
gzydong committed Apr 18, 2021
2 parents 512b74e + 7507b03 commit 9cc67ec
Show file tree
Hide file tree
Showing 7 changed files with 639 additions and 658 deletions.
223 changes: 2 additions & 221 deletions src/assets/css/page/note-page.less
Original file line number Diff line number Diff line change
Expand Up @@ -118,22 +118,14 @@
text-align: center;
position: relative;

.lumen-icon-sousuo {
i {
position: absolute;
left: 16px;
top: 19px;
font-size: 20px;
color: #505050;
}

.lumen-icon-clear {
position: absolute;
right: 1px;
top: 17px;
font-size: 24px;
color: #505050;
}

input {
height: 30px;
width: 80%;
Expand All @@ -151,7 +143,7 @@
}
}

.el-aside-two .count-header {
.el-aside-two .title-header {
height: 40px;
line-height: 40px;
position: relative;
Expand Down Expand Up @@ -393,195 +385,6 @@
}
}

/* 文件管理弹出层 */
.note-files-manager {
width: 300px;
min-height: 50px;
max-height: 675px;
background-color: white;
overflow-y: auto;

.file-box {
min-height: 30px;
border-bottom: 1px solid rgb(239, 233, 233);
margin-bottom: 8px;
padding: 5px 0;

.no-file {
color: #969292;
font-size: 12px;
margin-top: 10px;
}

.file-item {
height: 50px;
margin-bottom: 5px;
margin-top: 10px;

.file-type {
width: 50px;
height: 100%;
background-color: #ffcc80;
border-radius: 3px;
float: left;
line-height: 50px;
text-align: center;
color: white;
}

.file-detail {
float: left;
width: 247px;
height: 100%;

.filename {
padding-left: 5px;
color: #172b4d;
font-size: 14px;
font-weight: 400;
line-height: 1.6;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}

.filetool {
color: #505f79;
font-size: 12px;
font-weight: 400;
line-height: 1.6;
padding-left: 5px;
margin-top: 9px;
position: relative;

span {
margin: 0 3px;
}
}

.filetool-help {
position: absolute;
top: -5px;
right: 5px;
width: 55px;
height: 24px;
text-align: right;
line-height: 28px;

i {
font-size: 16px;
cursor: pointer;
margin-right: 5px;
}

.el-icon-download {
color: #66b1ff;
}

.el-icon-delete {
color: red;
}
}
}
}
}

input {
display: none;
}

.files-manager-footer {
.upload-tips {
font-size: 12px;
color: #ccc;
text-align: left;
float: left;
padding-top: 10px;
}

button {
float: right;
}
}
}

/* 标签管理弹出层 */
.tag-manager {
.tag-manager-title {
height: 20px;
line-height: 20px;
font-size: 13px;
color: #ccc;
border-bottom: 1px solid #f0e9e9;
padding-bottom: 5px;
position: relative;
}

.tag-manager-box {
padding: 8px 8px 8px 0;
cursor: pointer;

.el-icon-plus {
margin-left: 0 !important;
}

.tag-item {
background-color: rgba(64, 158, 255, 0.1);
display: inline-block;
padding: 0 10px;
height: 25px;
line-height: 25px;
font-size: 12px;
color: #409eff;
box-sizing: border-box;
white-space: nowrap;
margin-bottom: 5px;
margin-right: 3px;

i {
cursor: pointer;
margin-left: 5px;

&:hover {
color: red;
}
}

&.tag-item-active {
color: #9a9191;
}
}
}

.inster-tag {
height: 33px;
width: 100%;
margin-top: 20px;
line-height: 9px;
border-radius: 3px;
}

.tag-manager-input {
margin-top: 20px;
min-height: 30px;
display: flex;
align-items: center;

input {
width: 200px;
height: 30px;
border: 1px solid #66b1ff;
padding: 0 5px;
border-radius: 3px;
margin-right: 5px;

&::-webkit-input-placeholder {
font-size: 13px;
color: #ccc;
}
}
}
}

/* 笔记详细模块 */
#note-header {
Expand Down Expand Up @@ -613,28 +416,6 @@
background: #fff;
height: 100%;

.subfield {
min-height: 60px;
background: #f7f7fc;
margin: 10px;
border-radius: 3px;
font-size: 13px;
display: flex;
flex-direction: column;
justify-content: center;
padding: 5px 20px;

p > span {
margin-right: 10px;
}

.larkc-tag {
background: #ffffff;
color: #2d2d2d;
font-size: 14px;
}
}

.markdown-body {
padding: 20px;
font-size: 16px;
Expand Down
48 changes: 48 additions & 0 deletions src/components/layout/WelcomeModule.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<template>
<div class="welcome-box">
<div class="famous-box">
<img src="~@/assets/image/chat.png" width="300" />
<p>
不是井里没有水,而是你挖的不够深<br />
不是成功来得慢,而是你努力的不够多<br />
加油吧! ......
</p>
</div>
</div>
</template>

<script>
export default {
components: {},
data() {
return {}
},
created() {},
methods: {},
}
</script>
<style lang="less" scoped>
.welcome-box {
height: 100%;
width: 100%;
.famous-box {
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
height: 100%;
font-size: 24px;
user-select: none;
p {
width: 100%;
font-weight: 300;
text-align: center;
font-size: 15px;
color: #b9b4b4;
margin-top: -30px;
}
}
}
</style>
Loading

0 comments on commit 9cc67ec

Please sign in to comment.