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

Browse Source 
 Conflicts:
	ruoyi-ui/package.json
	ruoyi-ui/src/api/login.js
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/layout/components/Navbar.vue
	ruoyi-ui/src/utils/ruoyi.js
	ruoyi-ui/src/views/tool/build/index.vue
	ruoyi-ui/src/views/tool/gen/editTable.vue
	ruoyi-ui/src/views/tool/gen/index.vue
	ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysLogininfor.java
	ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysOperLog.java
	ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
	ruoyi/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java
	ruoyi/src/main/resources/mybatis/tool/GenTableMapper.xml
This commit is contained in:
疯狂的狮子li
2020-04-03 10:16:28 +08:00
parent 39d8723159 ec65b1f7ec
commit 31a2713012
14 changed files with 118 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -138,7 +138,7 @@
padding-left: 15px;
margin-bottom: 10px;
}
/* text color */
.text-navy {
color: #1ab394;
@ -187,4 +187,12 @@
border-radius: 50%;
box-shadow: 0 0 4px #ccc;
overflow: hidden;
}
}
/* 拖拽列样式 */
.sortable-ghost{
opacity: .8;
color: #fff!important;
background: #42b983!important;
}