解决冲突

This commit is contained in:
sw 2015-03-27 09:33:56 +08:00
parent fcbcdffa44
commit 8c795edf9e
1 changed files with 3 additions and 0 deletions

View File

@ -342,6 +342,9 @@ a:hover.link_file{ background:url(../images/pic_file.png) 0 -25px no-repeat; col
blockquote {background: #eeeeee;padding: 10px;margin-bottom: 10px;}
.respond-form{display: none;margin: auto;clear: both;}
.reply_btn{ cursor:pointer; -moz-border-radius:3px; -webkit-border-radius:3px; border:1px solid #ccc; color:#999; border-radius:3px; padding:2px 10px; margin-bottom:10px;display: block;margin-left: 470px;}
.reply_btn:hover{ background:#999; color:#fff; }
#attachments_fields input.description {margin-left: 4px;width: 100px;}
#attachments_fields span.ispublic-label {display: inline-block;width: 30px;margin-left: 10px;}
a.remove-upload {background: url(../images/delete.png) no-repeat 1px 50%;width: 1px;display: inline-block;padding-left: 16px;}