Merge branch 'master' of /home/gonggeng/git-repo/seahub into master2

group/templates/group/group_info.html

@@ -8,14 +8,14 @@
 <h3>管理员</h3>
 <ul>
 {% for member in managers %}
-<li><img src="{{MEDIA_URL}}img/default-person.png" alt="{{ member.short_username }}的图标" class="group-member-icon" width="20" /><span class="group-member-name">{{ member.short_username }}</span></li>
+<li><img src="{{MEDIA_URL}}img/default-person-20.png" alt="{{ member.short_username }}的图标" class="group-member-icon" /><span class="group-member-name">{{ member.short_username }}</span></li>
 {% endfor %}
 
 <h3>成员</h3>
 {% if common_members %}
 <ul>
     {% for member in common_members %}
-	<li><img src="{{MEDIA_URL}}img/default-person.png" alt="{{ member.short_username }}的图标" class="group-member-icon" width="20" /><span class="group-member-name">{{ member.short_username }}</span></li>
+	<li><img src="{{MEDIA_URL}}img/default-person-20.png" alt="{{ member.short_username }}的图标" class="group-member-icon" /><span class="group-member-name">{{ member.short_username }}</span></li>
     {% endfor %}
 </ul>
 {% else %}

media/css/seahub.css

@@ -28,7 +28,6 @@ ul > li { list-style:none; }
 }
 a { color:#ee8833; text-decoration:none; font-weight:bold; }
 a:hover { color: #ff9933; text-decoration: underline; }
-a.table-op { color: #080; font-weight:normal; }
 img { border:none; }
 h2 { font-size:18px; color:#808; margin-bottom:8px; }
 h3 { font-size:15px; color:#808; font-weight:normal; margin:10px 0 6px; }
@@ -184,11 +183,15 @@ label { display: inline-block; margin:2px 0px; }
 #repo-page .main {
     width:680px;
 }
+#repo-page .op,
 #repo-page .more {
     font-weight:normal;
     font-size:12px;
     color:#080;
 }
+#repo-page .op {
+    font-size:13px;
+}
 .latest-commit {
     word-wrap:break-word;
 }
@@ -231,7 +234,7 @@ label { display: inline-block; margin:2px 0px; }
 .group-member-icon {
 	border-radius: 4px;
 	-moz-border-radius: 4px;
-	margin: 3px 3px 0 0;
+	margin-right: 5px;
 }
 .group-member-icon,
 .group-member-name {

templates/repo.html

@@ -66,8 +66,8 @@
                     <td><img src="{{ MEDIA_URL }}/img/{{ dirent.obj_name|file_icon_filter }}" /></td>
                     <td>{{ dirent.props.obj_name }}</td>
                     <td>
-                        <a class="table-op" href="{{ SITE_ROOT }}repo/view/{{ repo.props.id }}/{{ dirent.props.obj_id }}/?file_name={{ dirent.props.obj_name }}">查看</a>
+                        <a class="op" href="{{ SITE_ROOT }}repo/view/{{ repo.props.id }}/{{ dirent.props.obj_id }}/?file_name={{ dirent.props.obj_name }}">查看</a>
-                        <a class="table-op" href="{{ SITE_ROOT }}repo/download/{{ repo.props.id }}/{{ dirent.props.obj_id }}/?file_name={{ dirent.props.obj_name }}">下载</a>
+                        <a class="op" href="{{ SITE_ROOT }}repo/download/{{ repo.props.id }}/{{ dirent.props.obj_id }}/?file_name={{ dirent.props.obj_name }}">下载</a>
                     </td>
                     {% endif %}
                 </tr>