This commit is contained in:
zhangdingyu
2019-09-18 10:15:45 +08:00
61 changed files with 7778 additions and 24 deletions

View File

@@ -24,7 +24,11 @@ html {
#app{
height: 100%;
.sidebar-container{
<<<<<<< HEAD
background-color: #152c7c;
=======
background-color: #2e296a;
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
}
}
@@ -99,13 +103,18 @@ el-form-item__content{
.el-menu-item, .el-submenu__title{
line-height: 42px;
height: 42px;
<<<<<<< HEAD
//background-color: #2e296a!important;
=======
background-color: #2e296a!important;
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
}
.el-scrollbar{
height: 100%;
}
.el-submenu__title{
<<<<<<< HEAD
//background-color: #2e296a!important;
}
.el-card__body{
@@ -166,4 +175,7 @@ el-card{
background: #ff9759;
border-color: #ff9759;
}
=======
background-color: #2e296a!important;
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
}