Merge branch 'main' into refactor/theme

This commit is contained in:
xiaoxian521
2021-11-02 07:48:14 +08:00
34 changed files with 377 additions and 220 deletions

View File

@@ -65,11 +65,6 @@ ul {
}
}
// main-container global css
.app-container {
padding: 20px;
}
.login,
.register {
width: 100vw;

View File

@@ -27,13 +27,14 @@
transition: margin-left 0.28s;
margin-left: $sideBarWidth;
position: relative;
background: #f0f2f5;
@media screen and (min-width: 150px) and (max-width: 420px) {
.el-scrollbar__view {
.app-main .el-scrollbar__view:first-child {
overflow-y: hidden;
}
}
@media screen and (min-width: 420px) {
.el-scrollbar__view {
.app-main .el-scrollbar__view:first-child {
overflow: hidden;
}
}