mirror of
https://github.com/haiwen/seahub.git
synced 2025-10-20 18:32:41 +00:00
Merge branch '5.1'
Conflicts: seahub/base/accounts.py seahub/share/views.py seahub/views/sysadmin.py tests/seahub/base/test_accounts.py tests/seahub/share/views/test_ajax_get_download_link.py tests/seahub/share/views/test_ajax_get_upload_link.py
This commit is contained in:
@@ -92,6 +92,7 @@
|
||||
.icon-eye:before { content: "\f06e"; }
|
||||
.icon-eye-slash:before { content: "\f070"; }
|
||||
.icon-plus-square:before { content: "\f0fe"; }
|
||||
.icon-envelope:before { content: "\f0e0"; }
|
||||
.fa-1x {
|
||||
font-size: 1.3em;
|
||||
}
|
||||
@@ -3275,18 +3276,18 @@ button.sf-dropdown-toggle:focus {
|
||||
#user-profile .avatar {
|
||||
border-radius: 0;
|
||||
}
|
||||
#user-profile p {
|
||||
.user-profile-nickname {
|
||||
padding: 8px 15px;
|
||||
margin: 0;
|
||||
}
|
||||
#user-profile .nickname {
|
||||
font-size: 18px;
|
||||
}
|
||||
#user-profile .info {
|
||||
.user-profile-info {
|
||||
padding: 8px 15px;
|
||||
border-top: 1px solid #eee;
|
||||
}
|
||||
#user-profile .info-detail {
|
||||
padding-left: 6px;
|
||||
.user-profile-info-icon {
|
||||
display:inline-block;
|
||||
width:1.4em;
|
||||
}
|
||||
/* shared file view */
|
||||
#shared-file-view-hd .cur-path,
|
||||
|
Reference in New Issue
Block a user