1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-17 07:41:26 +00:00

Merge branch '8.0'

Conflicts:
	frontend/package.json
	frontend/src/components/dialog/manage-members-dialog.js
	frontend/src/css/manage-members-dialog.css
	frontend/src/utils/utils.js
This commit is contained in:
llj
2021-11-02 11:41:41 +08:00
16 changed files with 29096 additions and 324 deletions

View File

@@ -1,7 +1,7 @@
.manage-members {
max-height: 300px;
overflow-y: scroll;
margin: 1rem 0 2rem;
margin: 10px 0 2rem;
}
.manage-members-table th,
.manage-members-table td {
@@ -27,3 +27,19 @@
.group-error {
margin-top: 10px;
}
.group-manage-members-dialog .back-icon {
color: #999;
cursor: pointer;
}
.group-manage-members-dialog .search-group-members-btn {
font-size: 14px;
font-weight: normal;
background: #f1f1f1;
margin: 12px 0 0;
}
.group-manage-members-dialog .search-group-members-btn:hover {
background: #dbdbdb;
}