Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
yanyizhou
2021-12-13 17:49:18 +08:00
+9 -9
View File
@@ -16,7 +16,7 @@
<el-menu <el-menu
unique-opened unique-opened
:default-active="defaultActive" :default-active="defaultActive"
background-color="#4788c0" background-color="#8fb0cc"
text-color="#fff" text-color="#fff"
active-text-color="#000" active-text-color="#000"
router router
@@ -518,11 +518,11 @@
} }
.el-menu--collapse { .el-menu--collapse {
.is-active { .is-active {
background-color: #697178 !important; background-color: rgb(49, 112, 167) !important;
.shangqi-icon { .shangqi-icon {
color: #fff !important; color: #fff !important;
} }
color: #697178 !important; color: rgb(49, 112, 167) !important;
} }
} }
.nav-menu { .nav-menu {
@@ -532,7 +532,7 @@
user-select: none; user-select: none;
box-sizing: border-box; box-sizing: border-box;
position: absolute; position: absolute;
background: #697178; background: rgb(49, 112, 167);
background-size: 100% 100%; background-size: 100% 100%;
/deep/.el-tooltip { /deep/.el-tooltip {
padding: 0px 16px !important; padding: 0px 16px !important;
@@ -542,7 +542,7 @@
} }
&:not(.is-collapse) { &:not(.is-collapse) {
width: 200px; width: 200px;
background: #697178; background: rgb(49, 112, 167);
background-size: 100% 100%; background-size: 100% 100%;
.logo { .logo {
padding: 10px; padding: 10px;
@@ -581,7 +581,7 @@
/*background:url("../../assets/images/shangqi/home/logo3.png");*/ /*background:url("../../assets/images/shangqi/home/logo3.png");*/
} }
/deep/:not(.is-collapse) .el-menu-item.is-active{ /deep/:not(.is-collapse) .el-menu-item.is-active{
background: #4788c0 !important; background: #8fb0cc !important;
color: #fff !important; color: #fff !important;
} }
} }
@@ -614,7 +614,7 @@
color: #fff; color: #fff;
} }
.nav-menu{ .nav-menu{
background-color: #697178; background-color: rgb(49, 112, 167);
scrollbar-width: none; scrollbar-width: none;
-ms-overflow-style: none; /* IE 10+ */ -ms-overflow-style: none; /* IE 10+ */
} }
@@ -626,11 +626,11 @@
} }
.nav-menu-popper .el-menu .el-menu-item.is-active { .nav-menu-popper .el-menu .el-menu-item.is-active {
background-color: #fff !important; background-color: #fff !important;
color: #4788c0 !important; color: #8fb0cc !important;
font-weight: bold; font-weight: bold;
} }
.nav-menu-popper .el-menu .el-menu-item:hover { .nav-menu-popper .el-menu .el-menu-item:hover {
background-color: #697178 !important; background-color: rgb(49, 112, 167) !important;
color: #fff !important; color: #fff !important;
font-weight: bold; font-weight: bold;
} }