Merge branch 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gva_workflow

 Conflicts:
	server/cmd/datas/init.go
This commit is contained in:
pixel
2020-11-17 17:41:12 +08:00
22 changed files with 532 additions and 123 deletions
+11
View File
@@ -605,6 +605,17 @@ li {
}
.is-active {
background-color: #1890ff;
// 关闭三级菜单二级菜单样式
ul{
border:none;
}
}
// 关闭三级菜单二级菜单样式
.is-active.is-opened{
background-color: #191a23;
ul{
border:none;
}
}
}
}