jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-24 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

Browse Source 
 Conflicts:
	ruoyi-admin/src/main/resources/application-prod.yml
	ruoyi-generator/src/main/resources/vm/java/controller.java.vm
	ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/assets/styles/sidebar.scss
	ruoyi-ui/src/layout/components/Navbar.vue
	ruoyi-ui/src/layout/components/Settings/index.vue
	ruoyi-ui/src/layout/components/TagsView/index.vue
	ruoyi-ui/src/settings.js
	ruoyi-ui/src/store/getters.js
	ruoyi-ui/src/store/modules/permission.js
	ruoyi-ui/src/store/modules/settings.js
	ruoyi-ui/src/store/modules/tagsView.js
	ruoyi-ui/src/views/monitor/druid/index.vue
This commit is contained in:
疯狂的狮子li
2021-04-14 13:22:31 +08:00
parent adeaa77864 cc50224d90
commit f093da99ec
16 changed files with 412 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-ui/src/assets/styles/ruoyi.scss
View File

@ -176,6 +176,12 @@
color: #FFFFFF;
}
/* submenu item */
.el-menu--horizontal > .el-submenu .el-submenu__title {
height: 50px !important;
line-height: 50px !important;
}
/* text color */
.text-navy {
color: #1ab394;

3
ruoyi-ui/src/assets/styles/sidebar.scss
View File

@ -135,9 +135,6 @@
margin-left: 20px;
}
.el-submenu__icon-arrow {
display: none;
}
}
}