diff --git a/media/css/seahub.css b/media/css/seahub.css index d1f451c573..a3e97c4cd6 100644 --- a/media/css/seahub.css +++ b/media/css/seahub.css @@ -2007,6 +2007,10 @@ textarea:-moz-placeholder {/* for FF */ width:640px; margin-top:10px; } +.msg-form .avatar, +.msg .avatar { + border-radius:1000px; +} #personal-msg-panel { margin-top:22px; } @@ -2015,11 +2019,10 @@ textarea:-moz-placeholder {/* for FF */ color:#333; } .msg-form { - padding:6px; - background:#f9f9f9; - border:1px solid #c4c4c4; - border-radius:5px; - margin-left:64px; + padding:10px; + background:#f2f2f2; + border-radius:3px; + margin:0 0 22px 64px; position:relative; } .msg-form .avatar { @@ -2027,8 +2030,26 @@ textarea:-moz-placeholder {/* for FF */ left:-64px; top:-1px; } +.msg-form .ops { + text-align:right; + margin-top:6px; +} +.msg-form .add-file { + margin:9px 10px 0 3px; +} +#selected-files .item { + text-align:left; + padding:2px 3px; +} +#selected-files .rm { + margin-right:3px; +} +#selected-files .rm, +.msg-form .add-file { + cursor:pointer; +} .msg-input { - width:550px; + width:544px; padding:3px 5px; height:25px; vertical-align:top; @@ -2179,7 +2200,10 @@ textarea:-moz-placeholder {/* for FF */ .reply-submit, .reply-cancel { margin-top:6px; - margin-right:2px; + background:#fff; +} +.msg-form .cancel { + margin-left:6px; } #msg-upward { position:fixed; diff --git a/media/img/clip.png b/media/img/clip.png new file mode 100644 index 0000000000..f03bbe0bea Binary files /dev/null and b/media/img/clip.png differ diff --git a/media/img/del.png b/media/img/del.png new file mode 100644 index 0000000000..0f9b99f403 Binary files /dev/null and b/media/img/del.png differ diff --git a/media/img/say.png b/media/img/say.png index 8f16848e4f..974534c461 100644 Binary files a/media/img/say.png and b/media/img/say.png differ diff --git a/media/img/say_white.png b/media/img/say_white.png index 8f85d8ef73..65cfc5f084 100644 Binary files a/media/img/say_white.png and b/media/img/say_white.png differ diff --git a/media/img/say_white_reverse.png b/media/img/say_white_reverse.png index 37c82e2ca2..62a6f1e933 100644 Binary files a/media/img/say_white_reverse.png and b/media/img/say_white_reverse.png differ diff --git a/seahub/group/templates/group/group_discuss.html b/seahub/group/templates/group/group_discuss.html index 4abeb658dc..e61174d7fb 100644 --- a/seahub/group/templates/group/group_discuss.html +++ b/seahub/group/templates/group/group_discuss.html @@ -2,21 +2,6 @@ {% load seahub_tags avatar_tags i18n %} -{% block extra_style %} - -{% endblock %} - {% block cur_discuss %}tab-cur{% endblock%} {% block right_panel %} @@ -24,14 +9,16 @@ {% if request.user.is_authenticated %}