haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-10-20 02:09:11 +00:00
Code Issues Releases Wiki Activity

Merge branch '5.1'

Browse Source 
Conflicts:
	seahub/templates/registration/password_change_form.html
	seahub/templates/sysadmin/base.html
	seahub/templates/sysadmin/sysadmin_backbone.html
This commit is contained in:
Daniel Pan
2016-06-13 18:25:20 +08:00
parent dd89b0d6d5 1e66dca52e
commit b567379c2c
57 changed files with 1376 additions and 371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
media/css/seahub.css
View File

@@ -1012,11 +1012,6 @@ textarea:-moz-placeholder {/* for FF */
font-size:14px;
margin:5px 0 20px;
}
.new-narrow-panel .notice {
text-align: center;
margin-top:20px;
color:#666;
}
/**** wide panel ****/ /* e.g. repo decrypt page */
.wide-panel {
width: 928px;
@@ -1139,10 +1134,6 @@ textarea:-moz-placeholder {/* for FF */
.op-confirm button {
margin-right:8px;
}
/**** forms ****/
.field-feedback {
color:#666;
}
/**** simplemodal ****/
#basic-modal-content {
display:none;