odjbin/tunnel-cloud-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
Hcat1314
2023-12-13 00:17:36 +08:00
parent 454ebd3d72 d919252bc3
commit 45ac8aadf2
42 changed files with 1383 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/assets/styles/index.scss
View File

@@ -16,7 +16,16 @@ a {
html, body, #app, .el-container, .el-aside, .el-main {
height: 100%;
}
.tunnel-title {
width: 2330px;
height: 156px;
z-index: 2;
position: absolute;
top: 0;
left: 50%;
margin-left: -1165px;
background-image: url('../images/topAndDown/sp_tb.png');
}
.box-top {
.manage-btn {
display: flex;
@@ -49,17 +58,6 @@ html, body, #app, .el-container, .el-aside, .el-main {
}
}
.tunnel-title {
width: 2330px;
height: 156px;
z-index: 2;
position: absolute;
top: 0;
left: 50%;
margin-left: -1165px;
background-image: url('../images/topAndDown/sp_tb.png');
}
.top-right {
z-index: 2;
position: absolute;
@@ -113,6 +111,7 @@ html, body, #app, .el-container, .el-aside, .el-main {
.el-drawer {
width: 900px !important;
background-color: transparent;
box-shadow: none;
}
}