Commit 2dfbdcf1 authored by Jeff's avatar Jeff

更新规则

parent 57dce2db
...@@ -21,3 +21,6 @@ insert_final_newline = true ...@@ -21,3 +21,6 @@ insert_final_newline = true
# 是否删除行尾的空格 可选择true和false # 是否删除行尾的空格 可选择true和false
trim_trailing_whitespace = true trim_trailing_whitespace = true
[*.scss]
indent_size = 2
...@@ -6,7 +6,7 @@ module.exports = { ...@@ -6,7 +6,7 @@ module.exports = {
// 换行长度 // 换行长度
printWidth: 150, printWidth: 150,
// tab缩进大小,默认为2 // tab缩进大小,默认为2
tabWidth: 4, tabWidth: 2,
// 使用tab缩进,默认false // 使用tab缩进,默认false
useTabs: false, useTabs: false,
// 是否使用分号, 默认true // 是否使用分号, 默认true
......
...@@ -137,134 +137,134 @@ export default { ...@@ -137,134 +137,134 @@ export default {
<style scoped lang="scss"> <style scoped lang="scss">
.videoConverter { .videoConverter {
width: 100%;
height: 800px;
background-color: #fff;
border: 0px solid black;
margin: 0px;
padding: 0 20px;
display: flex;
flex-direction: column;
align-items: center;
cursor: pointer;
overflow: hidden;
> ul {
width: 100%; width: 100%;
height: 800px; height: 100%;
background-color: #fff; border: 1px solid black;
border: 0px solid black; flex-grow: 1;
margin: 0px; overflow-y: auto;
padding: 0 20px; > li {
display: flex; padding: 5px 0;
flex-direction: column; height: 60px;
align-items: center;
cursor: pointer;
overflow: hidden;
> ul { display: flex;
width: 100%; justify-content: space-between;
height: 100%; align-items: center;
border: 1px solid black; }
flex-grow: 1; > li:nth-of-type(odd) {
overflow-y: auto; background-color: gainsboro;
> li { }
padding: 5px 0; .info {
height: 60px; display: flex;
align-items: center;
.cove {
width: 100px;
height: 40px;
background-color: #ccc;
line-height: 40px;
margin-right: 10px;
}
}
display: flex; .operationPanel {
justify-content: space-between; width: 300px;
align-items: center; height: 100%;
.wait {
height: 100%;
display: flex;
align-items: center;
.selectionFormat {
height: 30px;
width: 100px;
line-height: 30px;
border: 1px solid black;
margin-left: 20px;
} }
> li:nth-of-type(odd) { .delete {
background-color: gainsboro; width: 60px;
height: 30px;
line-height: 30px;
background-color: black;
color: #fff;
margin-left: 20px;
} }
.info { }
display: flex; .active {
align-items: center; height: 100%;
.cove { width: 300px;
width: 100px; display: flex;
height: 40px; align-items: center;
background-color: #ccc; .progress {
line-height: 40px;
margin-right: 10px;
}
} }
.operationPanel { .slide {
width: 300px; width: 200px;
height: 5px;
background: gray;
> div {
width: 120px;
height: 100%; height: 100%;
.wait { background-color: black;
height: 100%; }
display: flex;
align-items: center;
.selectionFormat {
height: 30px;
width: 100px;
line-height: 30px;
border: 1px solid black;
margin-left: 20px;
}
.delete {
width: 60px;
height: 30px;
line-height: 30px;
background-color: black;
color: #fff;
margin-left: 20px;
}
}
.active {
height: 100%;
width: 300px;
display: flex;
align-items: center;
.progress {
}
.slide {
width: 200px;
height: 5px;
background: gray;
> div {
width: 120px;
height: 100%;
background-color: black;
}
}
.stop {
width: 60px;
height: 30px;
line-height: 30px;
background-color: black;
color: #fff;
margin-left: 20px;
}
}
} }
.stop {
width: 60px;
height: 30px;
line-height: 30px;
background-color: black;
color: #fff;
margin-left: 20px;
}
}
} }
}
.editBar { .editBar {
position: relative; position: relative;
height: 30px; height: 30px;
width: 100%; width: 100%;
margin: 20px 0; margin: 20px 0;
.addVideo { .addVideo {
position: absolute; position: absolute;
left: 0; left: 0;
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
border: 1px solid black; border: 1px solid black;
}
.clearList {
position: absolute;
left: 100px;
height: 30px;
line-height: 30px;
border: 1px solid black;
}
.clearWatermark {
position: absolute;
right: 0;
height: 30px;
line-height: 30px;
border: 1px solid black;
}
} }
.startAll { .clearList {
height: 30px; position: absolute;
width: 100px; left: 100px;
background-color: black; height: 30px;
color: #fff; line-height: 30px;
line-height: 30px; border: 1px solid black;
}
.clearWatermark {
position: absolute;
right: 0;
height: 30px;
line-height: 30px;
border: 1px solid black;
} }
}
.startAll {
height: 30px;
width: 100px;
background-color: black;
color: #fff;
line-height: 30px;
}
} }
</style> </style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment