1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-10-21 19:00:12 +00:00

Merge branch '6.3'

Conflicts:
	frontend/src/pages/wiki/side-panel.js
This commit is contained in:
zhengxie
2018-08-31 11:59:19 +08:00
56 changed files with 1436 additions and 456 deletions

View File

@@ -3895,6 +3895,24 @@ button.sf-dropdown-toggle:focus {
#download-link-operations dt {
margin: 0;
}
.shared-link-copy-icon {
padding: 3px;
font-size: 16px;
color: #999;
}
.shared-link-copy-icon:hover {
cursor: pointer;
color: #333;
}
.share-link-perm-msgs {
display: inline-block;
margin-left:10px;
}
.share-link-perm-msgs li {
line-height: 30px;
height: 30px;
}
/* shared upload link */
#upload-link-panel {
width:600px;